From 97aedb05b271e9486f51eac1aee64fce92da64ca Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 26 Oct 2008 16:15:53 +0000 Subject: Imported Upstream version 4.3.99+cvs20060121.dfsg.1 --- ChangeLog | 769 ++- Makefile.in | 3 + NEWS | 262 +- README | 154 +- aclocal.m4 | 701 +- config.h.in | 8 + configure | 4811 ++++++-------- configure.ac | 26 +- debian/README.Debian | 23 - debian/README.building | 78 - debian/changelog | 670 -- debian/compat | 1 - debian/control | 327 - debian/control.gfdl | 23 - debian/control.in | 327 - debian/copyright | 21 - debian/cupsys-driver-gutenprint.docs | 2 - debian/cupsys-driver-gutenprint.install | 12 - debian/cupsys-driver-gutenprint.postinst | 47 - debian/cupsys-driver-gutenprint.postrm | 36 - debian/escputil.docs | 1 - debian/escputil.install | 2 - debian/foomatic-db-gutenprint.install | 2 - debian/gimp-print.docs | 3 - debian/gimp-print.install | 2 - debian/gimp-print.postrm | 39 - debian/gimp-print.preinst | 39 - debian/gutenprint-doc.doc-base | 14 - debian/gutenprint-doc.install | 2 - debian/gutenprint-locales.install | 1 - debian/ijsgutenprint.install | 2 - debian/libgutenprint-dev.docs | 2 - debian/libgutenprint-dev.install | 3 - debian/libgutenprint-doc.doc-base.developer | 15 - debian/libgutenprint-doc.doc-base.reference | 14 - debian/libgutenprint-doc.install | 2 - debian/libgutenprint2.install.in | 3 - debian/libgutenprintui1-1.install | 1 - debian/libgutenprintui1-dev.install | 3 - debian/libgutenprintui2-1.install | 1 - debian/libgutenprintui2-dev.install | 3 - debian/patches/00list | 1 - .../patches/05_genppdconfig_remove_perlmenu.dpatch | 257 - debian/rules | 150 - doc/Makefile.am | 13 +- doc/Makefile.in | 24 +- doc/README.maintaining | 4 +- doc/developer/Makefile.in | 3 + doc/developer/gutenprint.pdf | Bin 536480 -> 548821 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 | 50 +- doc/developer/reference-html/c194.html | 15 +- doc/developer/reference-html/c1968.html | 45 +- doc/developer/reference-html/c200.html | 50 +- doc/developer/reference-html/c39.html | 17 +- doc/developer/reference-html/c464.html | 143 +- doc/developer/reference-html/c48.html | 59 +- doc/developer/reference-html/docbook.css | 12 + doc/developer/reference-html/f14.html | 25 +- 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 | 56 +- doc/developer/reference-html/x1734.html | 526 +- doc/developer/reference-html/x2153.html | 616 -- doc/developer/reference-html/x271.html | 92 +- doc/developer/reference-html/x67.html | 26 +- doc/developer/reference-html/x79.html | 92 +- doc/developer/reference-html/x955.html | 132 +- doc/gutenprint-options | 935 +++ doc/gutenprint/gutenprint.tag | 2618 ++++---- doc/gutenprint/html/annotated.html | 23 +- doc/gutenprint/html/array_8h.html | 72 +- doc/gutenprint/html/bit-ops_8h.html | 52 +- doc/gutenprint/html/channel_8h.html | 176 +- doc/gutenprint/html/classes.html | 23 +- doc/gutenprint/html/color_8h.html | 60 +- doc/gutenprint/html/curve-cache_8h.html | 82 +- doc/gutenprint/html/curve_8h.html | 236 +- doc/gutenprint/html/deprecated.html | 37 +- doc/gutenprint/html/dir_000000.html | 20 + doc/gutenprint/html/dir_000001.html | 143 + ..._2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html | 29 - ..._2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html | 152 - doc/gutenprint/html/dirs.html | 21 +- doc/gutenprint/html/dither_8h.html | 240 +- doc/gutenprint/html/doxygen.css | 27 +- doc/gutenprint/html/files.html | 22 +- doc/gutenprint/html/functions.html | 285 +- doc/gutenprint/html/functions_type.html | 54 - doc/gutenprint/html/functions_vars.html | 282 +- doc/gutenprint/html/globals.html | 50 +- doc/gutenprint/html/globals_0x62.html | 50 +- doc/gutenprint/html/globals_0x63.html | 56 +- doc/gutenprint/html/globals_0x64.html | 52 +- doc/gutenprint/html/globals_0x67.html | 50 +- doc/gutenprint/html/globals_0x6e.html | 50 +- doc/gutenprint/html/globals_0x70.html | 62 +- doc/gutenprint/html/globals_0x73.html | 1300 ++-- doc/gutenprint/html/globals_0x74.html | 50 +- doc/gutenprint/html/globals_defs.html | 171 +- doc/gutenprint/html/globals_enum.html | 64 +- doc/gutenprint/html/globals_eval.html | 165 +- doc/gutenprint/html/globals_func.html | 954 ++- doc/gutenprint/html/globals_type.html | 123 +- doc/gutenprint/html/globals_vars.html | 60 +- doc/gutenprint/html/group__array.html | 151 +- doc/gutenprint/html/group__color.html | 101 +- doc/gutenprint/html/group__curve.html | 575 +- doc/gutenprint/html/group__image.html | 73 +- doc/gutenprint/html/group__intl.html | 47 +- doc/gutenprint/html/group__intl__internal.html | 47 +- doc/gutenprint/html/group__list.html | 379 +- doc/gutenprint/html/group__papersize.html | 77 +- doc/gutenprint/html/group__printer.html | 247 +- doc/gutenprint/html/group__sequence.html | 317 +- doc/gutenprint/html/group__util.html | 287 +- doc/gutenprint/html/group__vars.html | 1543 +++-- doc/gutenprint/html/group__version.html | 115 +- .../html/gutenprint-intl-internal_8h.html | 38 +- doc/gutenprint/html/gutenprint-intl_8h.html | 38 +- doc/gutenprint/html/gutenprint-module_8h.html | 30 +- doc/gutenprint/html/gutenprint-version_8h.html | 66 +- doc/gutenprint/html/gutenprint_8h.html | 24 +- doc/gutenprint/html/image_8h.html | 50 +- doc/gutenprint/html/index.html | 17 +- doc/gutenprint/html/list_8h.html | 152 +- doc/gutenprint/html/module_8h.html | 88 +- doc/gutenprint/html/modules.html | 17 +- doc/gutenprint/html/mxml_8h.html | 208 +- doc/gutenprint/html/pages.html | 17 +- doc/gutenprint/html/paper_8h.html | 52 +- doc/gutenprint/html/path_8h.html | 38 +- doc/gutenprint/html/printers_8h.html | 110 +- doc/gutenprint/html/sequence_8h.html | 140 +- doc/gutenprint/html/string-list_8h.html | 94 +- .../html/structdither__matrix__impl.html | 113 +- .../html/structstp__cached__curve__t.html | 47 +- doc/gutenprint/html/structstp__color.html | 41 +- doc/gutenprint/html/structstp__colorfuncs__t.html | 47 +- .../html/structstp__curve__point__t.html | 39 +- .../html/structstp__dither__matrix__generic.html | 53 +- .../html/structstp__dither__matrix__normal.html | 53 +- .../html/structstp__dither__matrix__short.html | 53 +- doc/gutenprint/html/structstp__dotsize.html | 35 +- .../html/structstp__double__bound__t.html | 39 +- doc/gutenprint/html/structstp__family.html | 35 +- doc/gutenprint/html/structstp__image.html | 107 +- doc/gutenprint/html/structstp__int__bound__t.html | 39 +- doc/gutenprint/html/structstp__lineactive__t.html | 35 +- doc/gutenprint/html/structstp__linebounds__t.html | 41 +- doc/gutenprint/html/structstp__linebufs__t.html | 35 +- doc/gutenprint/html/structstp__linecount__t.html | 35 +- doc/gutenprint/html/structstp__lineoff__t.html | 35 +- doc/gutenprint/html/structstp__module.html | 71 +- .../html/structstp__module__version.html | 35 +- doc/gutenprint/html/structstp__mxml__attr__s.html | 35 +- doc/gutenprint/html/structstp__mxml__node__s.html | 65 +- doc/gutenprint/html/structstp__mxml__text__s.html | 35 +- doc/gutenprint/html/structstp__mxml__value__s.html | 41 +- doc/gutenprint/html/structstp__papersize__t.html | 103 +- .../html/structstp__param__string__t.html | 37 +- doc/gutenprint/html/structstp__parameter__t.html | 245 +- doc/gutenprint/html/structstp__pass__t.html | 59 +- doc/gutenprint/html/structstp__printfuncs__t.html | 89 +- doc/gutenprint/html/structstp__raw__t.html | 39 +- doc/gutenprint/html/structstp__shade.html | 41 +- doc/gutenprint/html/structstp__weave__t.html | 65 +- doc/gutenprint/html/tab_b.gif | Bin 35 -> 0 bytes doc/gutenprint/html/tab_l.gif | Bin 706 -> 0 bytes doc/gutenprint/html/tab_r.gif | Bin 2585 -> 0 bytes doc/gutenprint/html/tabs.css | 102 - doc/gutenprint/html/unionstp__mxml__value__u.html | 53 +- doc/gutenprint/html/util_8h.html | 142 +- doc/gutenprint/html/vars_8h.html | 600 +- doc/gutenprint/html/weave_8h.html | 182 +- doc/gutenprint/html/xml_8h.html | 128 +- doc/gutenprintui2/gutenprintui2.tag | 324 +- doc/gutenprintui2/html/annotated.html | 21 +- doc/gutenprintui2/html/classes.html | 29 +- doc/gutenprintui2/html/curve_8h.html | 104 +- doc/gutenprintui2/html/dir_000000.html | 20 + doc/gutenprintui2/html/dir_000001.html | 26 + ..._2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html | 27 - ...debian_2Ddist_2Finclude_2Fgutenprintui2_2F.html | 33 - doc/gutenprintui2/html/dirs.html | 19 +- doc/gutenprintui2/html/doxygen.css | 27 +- doc/gutenprintui2/html/files.html | 20 +- doc/gutenprintui2/html/functions.html | 150 +- doc/gutenprintui2/html/functions_vars.html | 152 +- doc/gutenprintui2/html/gammacurve_8h.html | 62 +- doc/gutenprintui2/html/globals.html | 240 +- doc/gutenprintui2/html/globals_defs.html | 63 +- doc/gutenprintui2/html/globals_enum.html | 39 +- doc/gutenprintui2/html/globals_eval.html | 55 +- doc/gutenprintui2/html/globals_func.html | 171 +- doc/gutenprintui2/html/globals_type.html | 45 +- doc/gutenprintui2/html/gutenprintui_8h.html | 290 +- doc/gutenprintui2/html/index.html | 15 +- doc/gutenprintui2/html/struct__StpuiCurve.html | 111 +- .../html/struct__StpuiCurveClass.html | 57 +- .../html/struct__StpuiGammaCurve.html | 63 +- .../html/struct__StpuiGammaCurveClass.html | 51 +- doc/gutenprintui2/html/structstpui__image.html | 69 +- doc/gutenprintui2/html/structstpui__plist__t.html | 99 +- doc/gutenprintui2/html/tab_b.gif | Bin 35 -> 0 bytes doc/gutenprintui2/html/tab_l.gif | Bin 706 -> 0 bytes doc/gutenprintui2/html/tab_r.gif | Bin 2585 -> 0 bytes doc/gutenprintui2/html/tabs.css | 102 - doc/gutenprintui2/html/typebuiltins_8h.html | 46 +- include/Makefile.in | 3 + include/gutenprint/Makefile.in | 3 + include/gutenprintui/Makefile.in | 3 + include/gutenprintui2/Makefile.in | 3 + m4/stp_release.m4 | 2 +- m4extra/gettext.m4 | 788 ++- m4extra/gtk.m4 | 194 + m4extra/lcmessage.m4 | 45 +- m4extra/libtool.m4 | 6675 +++++++++++++++++++- m4extra/progtest.m4 | 97 +- man/Makefile.in | 3 + po/cs.gmo | Bin 34442 -> 34442 bytes po/cs.po | 1278 ++-- po/da.gmo | Bin 91818 -> 91559 bytes po/da.po | 1309 ++-- po/de.gmo | Bin 32956 -> 32956 bytes po/de.po | 1269 ++-- po/el.gmo | Bin 4362 -> 4362 bytes po/el.po | 1278 ++-- po/en_GB.gmo | Bin 69180 -> 69180 bytes po/en_GB.po | 1300 ++-- po/es.gmo | Bin 32382 -> 32382 bytes po/es.po | 1278 ++-- po/fr.gmo | Bin 35150 -> 35150 bytes po/fr.po | 1278 ++-- po/gutenprint.pot | 1263 ++-- po/ja.gmo | Bin 32224 -> 32224 bytes po/ja.po | 1278 ++-- po/nb.gmo | Bin 14021 -> 14021 bytes po/nb.po | 1278 ++-- po/nl.gmo | Bin 26820 -> 26820 bytes po/nl.po | 1278 ++-- po/pl.gmo | Bin 7345 -> 7345 bytes po/pl.po | 1278 ++-- po/pt.gmo | Bin 34469 -> 34469 bytes po/pt.po | 1278 ++-- po/sk.gmo | Bin 32850 -> 32850 bytes po/sk.po | 1278 ++-- po/sv.gmo | Bin 34143 -> 34143 bytes po/sv.po | 1278 ++-- po/zh_TW.gmo | Bin 44472 -> 44404 bytes po/zh_TW.po | 1306 ++-- samples/Makefile.in | 3 + scripts/Makefile.in | 5 +- scripts/depcomp | 529 ++ scripts/ltmain.sh | 575 +- src/Makefile.in | 3 + src/cups/Makefile.in | 3 + src/cups/cups-genppdupdate.in | 9 +- src/cups/genppd.c | 184 +- src/cups/rastertoprinter.c | 17 +- src/escputil/Makefile.in | 3 + src/escputil/d4lib.c | 16 +- src/escputil/escputil.c | 216 +- src/foomatic/Makefile.in | 3 + src/foomatic/foomatic-generator.in | 2 + src/foomatic/foomatic-printermap | 25 +- src/ghost/Makefile.in | 3 + src/gimp/Makefile.in | 3 + src/gimp2/Makefile.in | 3 + src/gutenprintui/Makefile.in | 3 + src/gutenprintui/gutenprintui.pc.in | 3 +- src/gutenprintui/panel.c | 35 +- src/gutenprintui/printrcl.c | 1326 ++-- src/gutenprintui/printrcy.c | 770 +-- src/gutenprintui/printrcy.h | 9 +- src/gutenprintui2/Makefile.in | 3 + src/gutenprintui2/gutenprintui2.pc.in | 3 +- src/gutenprintui2/panel.c | 34 +- src/gutenprintui2/printrcl.c | 1326 ++-- src/gutenprintui2/printrcy.c | 770 +-- src/gutenprintui2/printrcy.h | 9 +- src/main/Makefile.in | 3 + src/main/dither-main.c | 83 +- src/main/escp2-channels.c | 164 +- src/main/escp2-driver.c | 6 +- src/main/escp2-inks.c | 27 +- src/main/escp2-papers.c | 118 +- src/main/escp2-resolutions.c | 33 +- src/main/gutenprint.pc.in | 3 +- src/main/papers.xml | 4 +- src/main/print-color.c | 17 +- src/main/print-escp2-data.c | 170 +- src/main/print-escp2.c | 278 +- src/main/print-escp2.h | 10 +- src/main/printers.xml | 84 +- src/main/util.h | 10 +- src/testpattern/Makefile.in | 3 + src/testpattern/run-testpattern | 3 +- src/testpattern/run-testpattern-1 | 7 +- src/testpattern/testpattern.c | 16 +- src/testpattern/testpatternl.c | 1323 ++-- src/testpattern/testpatterny.c | 846 +-- src/testpattern/testpatterny.h | 9 +- test/Makefile.in | 3 + 320 files changed, 37729 insertions(+), 32224 deletions(-) delete mode 100644 debian/README.Debian delete mode 100644 debian/README.building delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/control.gfdl delete mode 100644 debian/control.in delete mode 100644 debian/copyright delete mode 100644 debian/cupsys-driver-gutenprint.docs delete mode 100644 debian/cupsys-driver-gutenprint.install delete mode 100644 debian/cupsys-driver-gutenprint.postinst delete mode 100644 debian/cupsys-driver-gutenprint.postrm delete mode 100644 debian/escputil.docs delete mode 100644 debian/escputil.install delete mode 100644 debian/foomatic-db-gutenprint.install delete mode 100644 debian/gimp-print.docs delete mode 100644 debian/gimp-print.install delete mode 100644 debian/gimp-print.postrm delete mode 100644 debian/gimp-print.preinst delete mode 100644 debian/gutenprint-doc.doc-base delete mode 100644 debian/gutenprint-doc.install delete mode 100644 debian/gutenprint-locales.install delete mode 100644 debian/ijsgutenprint.install delete mode 100644 debian/libgutenprint-dev.docs delete mode 100644 debian/libgutenprint-dev.install delete mode 100644 debian/libgutenprint-doc.doc-base.developer delete mode 100644 debian/libgutenprint-doc.doc-base.reference delete mode 100644 debian/libgutenprint-doc.install delete mode 100644 debian/libgutenprint2.install.in delete mode 100644 debian/libgutenprintui1-1.install delete mode 100644 debian/libgutenprintui1-dev.install delete mode 100644 debian/libgutenprintui2-1.install delete mode 100644 debian/libgutenprintui2-dev.install delete mode 100644 debian/patches/00list delete mode 100755 debian/patches/05_genppdconfig_remove_perlmenu.dpatch delete mode 100755 debian/rules 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-options create mode 100644 doc/gutenprint/html/dir_000000.html create mode 100644 doc/gutenprint/html/dir_000001.html delete mode 100644 doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html delete mode 100644 doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html delete mode 100644 doc/gutenprint/html/functions_type.html delete mode 100644 doc/gutenprint/html/tab_b.gif delete mode 100644 doc/gutenprint/html/tab_l.gif delete mode 100644 doc/gutenprint/html/tab_r.gif delete mode 100644 doc/gutenprint/html/tabs.css create mode 100644 doc/gutenprintui2/html/dir_000000.html create mode 100644 doc/gutenprintui2/html/dir_000001.html delete mode 100644 doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html delete mode 100644 doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html delete mode 100644 doc/gutenprintui2/html/tab_b.gif delete mode 100644 doc/gutenprintui2/html/tab_l.gif delete mode 100644 doc/gutenprintui2/html/tab_r.gif delete mode 100644 doc/gutenprintui2/html/tabs.css create mode 100644 m4extra/gtk.m4 create mode 100755 scripts/depcomp diff --git a/ChangeLog b/ChangeLog index c1e23c9..d8c3348 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,378 @@ +2006-01-16 + + Files: NEWS (1.266) (+9 -0) + + Add list of bugs fixed. + +2006-01-16 + + Files: doc/gutenprint-options (1.2) (+731 -729) + + Update description of Laminate Pattern. + +2006-01-16 + + Files: src/testpattern/run-testpattern-1 (1.6) (+4 -3) + + Update this script also. + +2006-01-15 + + Files: src/testpattern/run-testpattern (1.20) (+2 -1) + src/testpattern/testpattern.c (1.43) (+11 -5) + + Return error status correctly, and do not error out unnecessarily + +2006-01-14 + + Files: NEWS (1.265) (+32 -23) + doc/Makefile.am (1.43) (+7 -2) + doc/gutenprint-options (1.1) ( ) + + Add gutenprint-options documentation + +2006-01-13 + + Files: configure.ac (1.133) (+21 -2) + src/main/util.h (1.33) (+2 -8) + + Add a feature test for GCC __attribute__ syntax. + +2006-01-10 + + Files: NEWS (1.264) (+8 -4) + src/foomatic/foomatic-printermap (1.109) (+2 -0) + src/main/print-escp2-data.c (1.190) (+41 -9) + src/main/print-escp2.h (1.100) (+3 -2) + src/main/printers.xml (1.140) (+9 -1) + + Change quality settings for some newer printers that need higher + resolutions (1.5 pl and PictureMate). + + Add higher resolutions for RX700 (up to 5760x2880). + + Add Japanese equivalents of RX700 and R2400. + +2006-01-09 + + Files: src/main/print-escp2.c (1.347) (+1 -14) + + Remove unused MultiChannelLimit option + +2006-01-09 + + Files: m4extra/gettext.m4 (1.2) (+510 -276) + m4extra/gtk.m4 (1.1) ( ) + m4extra/lcmessage.m4 (1.2) (+28 -17) + m4extra/libtool.m4 (1.2) (+6333 -338) + m4extra/progtest.m4 (1.2) (+71 -26) + + Add GTK-1.2 m4 macro to m4extra. + Update existing m4extra m4 macros. + +2006-01-08 + + Files: src/main/escp2-papers.c (1.91) (+4 -4) + + More tweaks for R800. + +2006-01-08 + + Files: NEWS (1.263) (+9 -2) + + Improve R800 tuning. + +2006-01-08 + + Files: src/main/escp2-papers.c (1.90) (+46 -46) + + Improve tuning of R800. + +2006-01-08 + + Files: src/main/escp2-papers.c (1.89) (+4 -4) + + More improvement for the R300. + +2006-01-07 + + Files: NEWS (1.262) (+10 -9) + README (1.156) (+64 -66) + + Increase the prominence of CUPS + +2006-01-07 + + Files: NEWS (1.261) (+4 -5) + + Upgrade status of Epson PictureMate + +2006-01-07 + + Files: src/main/print-escp2-data.c (1.189) (+2 -2) + + Went a bit too far last time... + +2006-01-07 + + Files: src/main/escp2-papers.c (1.88) (+3 -3) + src/main/print-escp2-data.c (1.188) (+2 -2) + + Improve the PictureMate some more + +2006-01-07 + + Files: src/main/escp2-inks.c (1.46) (+7 -7) + src/main/escp2-papers.c (1.87) (+3 -3) + src/main/escp2-resolutions.c (1.31) (+7 -1) + src/main/print-escp2-data.c (1.187) (+5 -5) + + Further improvements for PictureMate + +2006-01-07 + + Files: src/foomatic/foomatic-generator.in (1.57) (+2 -0) + + Add a few more suffixes used by Epson printers. + +2006-01-06 + + Files: NEWS (1.260) (+2 -1) + src/main/escp2-channels.c (1.60) (+2 -2) + src/main/escp2-driver.c (1.27) (+2 -2) + src/main/escp2-inks.c (1.45) (+4 -4) + src/main/escp2-resolutions.c (1.30) (+26 -1) + src/main/print-escp2-data.c (1.186) (+5 -5) + src/main/print-escp2.h (1.99) (+3 -2) + + Initial cut at PictureMate tuning. + +2006-01-06 + + Files: NEWS (1.259) (+3 -3) + + Update RX700 status + +2006-01-05 + + Files: src/main/print-escp2-data.c (1.185) (+4 -4) + + Fixes for RX700 from Chuck McCrobie. + +2006-01-01 + + Files: NEWS (1.258) (+53 -46) + + Minor tweaks + +2005-12-31 + + Files: NEWS (1.257) (+6 -4) + src/foomatic/foomatic-printermap (1.108) (+1 -0) + src/main/printers.xml (1.139) (+8 -1) + + Add Epson Stylus CX4500 + +2005-12-31 + + Files: src/cups/genppd.c (1.113) (+2 -51) + + Don't create UI constraints for color options in black and white mode, + since there aren't actually any conflicts. + +2005-12-31 + + Files: src/escputil/escputil.c (1.79) (+4 -1) + + Warn if printer is not known + +2005-12-31 + + Files: src/foomatic/foomatic-printermap (1.107) (+1 -0) + src/main/printers.xml (1.138) (+5 -1) + + Add Epson PictureMake Deluxe + +2005-12-31 + + Files: src/escputil/escputil.c (1.78) (+154 -57) + + Respond more reasonably to unknown printer: + + 1) If identify is requested, always print the printer name whether we + know about it or not. + + 2) If ink level is requested and the ink cartridge ID is 0x40, use an + auxiliary set of color names. + + 3) If extended ink level is requested, first get ink color names and + then attempt to use those to read ink names. + +2005-12-31 + + Files: NEWS (1.256) (+12 -6) + src/foomatic/foomatic-printermap (1.106) (+2 -0) + src/main/escp2-channels.c (1.59) (+163 -1) + src/main/escp2-inks.c (1.44) (+22 -1) + src/main/escp2-papers.c (1.86) (+21 -1) + src/main/print-escp2-data.c (1.184) (+37 -2) + src/main/print-escp2.h (1.98) (+6 -2) + src/main/printers.xml (1.137) (+9 -1) + + Preliminary support for the Epson E-100/PictureMate. + +2005-12-31 + + Files: src/cups/genppd.c (1.112) (+2 -116) + + Don't generate UI constraints for the quality and image type + parameters, since they don't disable anything any more. + +2005-12-31 + + Files: NEWS (1.255) (+12 -3) + + Update printer list + +2005-12-31 + + Files: src/foomatic/foomatic-printermap (1.105) (+8 -8) + + Add a few more printers. + +2005-12-31 + + Files: src/main/papers.xml (1.19) (+2 -2) + + 4x6 photo paper has become very common. + +2005-12-31 + + Files: NEWS (1.254) (+11 -5) + src/foomatic/foomatic-printermap (1.104) (+5 -0) + src/main/print-escp2-data.c (1.183) (+52 -3) + src/main/printers.xml (1.136) (+49 -8) + + Add a few more Epson multi-function printers. + + Fix up escputil -e output on multi-function printers. + +2005-12-31 + + Files: README (1.155) (+1 -1) + + Minor wording change + +2005-12-31 + + Files: src/escputil/d4lib.c (1.5) (+8 -8) + src/escputil/escputil.c (1.77) (+2 -2) + + Improve performance + +2005-12-30 + + Files: src/gutenprintui/panel.c (1.7) (+12 -10) + src/gutenprintui2/panel.c (1.9) (+12 -10) + + Minor fix to option group separators + +2005-12-30 + + Files: src/main/print-color.c (1.134) (+2 -2) + + Move GCR curve to advanced 4, since other GCR parameters are in advanced4. + +2005-12-30 + + Files: README (1.154) (+3 -3) + + Minor wording change. + +2005-12-30 + + Files: NEWS (1.253) (+8 -7) + README (1.153) (+9 -9) + + Bump version + +2005-12-30 + + Files: NEWS (1.252) (+6 -4) + src/gutenprintui/panel.c (1.6) (+14 -5) + src/gutenprintui2/panel.c (1.8) (+14 -4) + + Eliminate spurious horizontal lines drawn through some options in + the GIMP plugin in some cases. + +2005-12-30 + + Files: src/main/escp2-papers.c (1.85) (+4 -4) + + Improve tuning of premium papers. + +2005-12-29 + + Files: src/main/escp2-inks.c (1.43) (+3 -3) + + Correct names of a few sets of drop sizes. + +2005-12-29 + + Files: NEWS (1.251) (+29 -14) + + Note latest round of updates. + +2005-12-29 + + Files: src/cups/genppd.c (1.111) (+4 -7) + src/main/dither-main.c (1.51) (+32 -51) + src/main/escp2-driver.c (1.26) (+3 -1) + src/main/print-color.c (1.133) (+4 -11) + src/main/print-escp2-data.c (1.182) (+15 -15) + src/main/print-escp2.c (1.346) (+151 -112) + + Allow specification of all options along with Quality and Image Type. + This improves the user interface by making it more apparent that the + other options are available. + +2005-12-29 + + Files: configure.ac (1.132) (+5 -2) + doc/README.maintaining (1.21) (+2 -2) + src/gutenprintui/gutenprintui.pc.in (1.2) (+2 -1) + src/gutenprintui2/gutenprintui2.pc.in (1.2) (+2 -1) + src/main/gutenprint.pc.in (1.2) (+2 -1) + + Use the pkg-config Libs.private feature to separate out inter-library + dependencies which are only required when linking statically. This + simplifies the dependencies for dynamic linking and package management. + For packages depending upon the .pc files, pkg-config 0.18 or above is + required to use this feature (but not for building gutenprint). + +2005-12-24 + + Files: src/cups/genppd.c (1.110) (+16 -6) + src/cups/rastertoprinter.c (1.97) (+12 -5) + + 1389787 CUPS driver does not set Quality correctly + +2005-12-24 + + Files: src/cups/cups-genppdupdate.in (1.22) (+4 -5) + + 1389785 cups-genppdupdate sets PPD file owners incorrectly + +2005-11-22 + + Files: doc/.cvsignore (1.11) (+3 -0) + + Ignore generated gutenprintui2 files. + 2005-11-22 Files: doc/developer/Makefile.am (1.18) (+2 -2) + doc/users_guide/Makefile.am (1.44) (+3 -3) src/cups/Makefile.am (1.83) (+3 -3) src/foomatic/Makefile.am (1.47) (+2 -2) @@ -27,6 +399,7 @@ doc/Makefile.am (1.42) (+1 -5) doc/developer/Makefile.am (1.17) (+1 -5) doc/developer/using.xml (1.3) (+1 -4) + doc/users_guide/Makefile.am (1.43) (+1 -5) include/Makefile.am (1.7) (+1 -5) include/gutenprint/Makefile.am (1.2) (+1 -5) include/gutenprintui/Makefile.am (1.3) (+1 -5) @@ -938,6 +1311,14 @@ Bump version +2005-05-17 + + Files: doc/users_guide/history.sgml (1.4) (+7 -7) + doc/users_guide/users-guide.sgml (1.9) (+2 -2) + + Fix project name in the project history chapter. + Fix the manual title. + 2005-05-17 Files: configure.ac (1.124) (+3 -3) @@ -1779,6 +2160,7 @@ Files: .cvsignore (1.24) (+1 -0) doc/developer/Makefile.am (1.16) (+3 -3) + doc/users_guide/Makefile.am (1.42) (+9 -9) scripts/.cvsignore (1.4) (+2 -0) scripts/autogen.sh (1.33) (+1 -1) @@ -2044,6 +2426,16 @@ doc/developer/using.xml (1.2) (+34 -34) doc/developer/weave.xml (1.2) (+1 -1) doc/gutenprint.dox.in (1.1) ( ) + doc/users_guide/README (1.7) (+1 -1) + doc/users_guide/cups-edition.sgml (1.2) (+5 -5) + doc/users_guide/cups.sgml (1.4) (+15 -15) + doc/users_guide/gimp-edition.sgml (1.2) (+5 -5) + doc/users_guide/gimp.sgml (1.3) (+5 -5) + doc/users_guide/history.sgml (1.3) (+10 -10) + doc/users_guide/title.sgml (1.3) (+8 -8) + doc/users_guide/users-guide.sgml (1.8) (+2 -2) + doc/users_guide/util-edition.sgml (1.2) (+5 -5) + doc/users_guide/utils.sgml (1.6) (+3 -3) include/Makefile.am (1.6) (+3 -3) include/gutenprint/.cvsignore (1.1) ( ) include/gutenprint/Makefile.am (1.1) ( ) @@ -3169,6 +3561,12 @@ when --enable-static is used with a new option --disable-static-genppd. Always build libgimpprintui statically, since it only has a single user. +2004-05-22 + + Files: doc/users_guide/Makefile.am (1.41) (+13 -13) + + Fix VPATH build. + 2004-05-22 Files: m4/gimp.m4 (1.5) (+41 -41) @@ -3874,6 +4272,7 @@ Files: Makefile.am (1.139) (+1 -1) configure.ac (1.97) (+9 -20) doc/developer/Makefile.am (1.13) (+1 -1) + doc/users_guide/Makefile.am (1.40) (+1 -1) m4/stp_option.m4 (1.4) (+42 -0) scripts/autogen.sh (1.30) (+1 -0) src/cups/cups-genppdconfig.in (1.8) (+1 -1) @@ -4161,6 +4560,14 @@ Fix a typo +2004-02-27 + + Files: doc/users_guide/Makefile.am (1.39) (+28 -22) + + Don't distribute the Postscript user's guide and .eps files (saves + about 500K in the bz2ball). Also don't distribute two copies of the + .pnd files (saves another 200K or so). + 2004-02-27 Files: Makefile.am (1.137) (+12 -3) @@ -4331,6 +4738,12 @@ Rename stpi_dither_matrix_iterated_init() argument name "exp" to "exponent" to quell compiler warnings. +2004-01-21 + + Files: doc/users_guide/Makefile.am (1.38) (+12 -12) + + Fix install error when using the provided install-sh. + 2004-01-11 Files: po/cs.po (1.17) (+17 -17) @@ -4624,6 +5037,7 @@ 2003-12-02 Files: NEWS (1.142) (+1 -1) + doc/users_guide/gimp.sgml (1.2) (+0 -12) po/cs.po (1.15) (+87 -272) po/da.po (1.43) (+86 -80) po/de.po (1.29) (+87 -265) @@ -4708,6 +5122,8 @@ Files: Makefile.am (1.136) (+2 -2) README (1.131) (+1 -1) + doc/users_guide/cups.sgml (1.3) (+2 -2) + doc/users_guide/history.sgml (1.2) (+1 -1) m4/stp.m4 (1.5) (+3 -3) m4/stp_cups.m4 (1.8) (+1 -1) m4/stp_gimp.m4 (1.4) (+1 -1) @@ -10226,6 +10642,7 @@ 2003-01-06 Files: doc/developer/Makefile.am (1.8) (+3 -2) + doc/users_guide/Makefile.am (1.37) (+4 -2) EPSLEVEL may be used to specify the EPS level to use @@ -10418,6 +10835,7 @@ configure.ac (1.38) (+52 -41) doc/Makefile.am (1.32) (+2 -0) doc/developer/Makefile.am (1.7) (+3 -1) + doc/users_guide/Makefile.am (1.36) (+3 -1) include/Makefile.am (1.3) (+3 -1) m4/stp.m4 (1.4) (+0 -21) m4/stp_cups.m4 (1.6) (+0 -1) @@ -11853,13 +12271,6 @@ Update .cvsignore -2002-10-09 - - Files: debian/.cvsignore (1.7) (+2 -2) - - Add ijsgimpprint package - Miscellaneous other small updates - 2002-10-07 Files: po/ja.po (1.1) ( ) @@ -12527,6 +12938,13 @@ Support quadtone printing on most pigment printers. +2002-06-30 + + Files: doc/users_guide/Makefile.am (1.35) (+14 -9) + + Distribute the cups-edition.sgml, gimp-edition.sgml, and + util-edition.sgml files. + 2002-06-30 Files: src/main/print-escp2-data.c (1.35) (+43 -337) @@ -13056,6 +13474,28 @@ Use AC_LIBOBJ instead of the deprecated direct LIBOJBS usage +2002-04-08 + + Files: doc/users_guide/utils.sgml (1.5) (+1 -1) + + + + Changed kernel config option from CONFIG_PRINTER_READBACK to CONFIG_PARPORT_1284. + +2002-04-08 + + Files: doc/users_guide/Makefile.am (1.34) (+256 -9) + doc/users_guide/cups-edition.sgml (1.1) ( ) + doc/users_guide/cups.sgml (1.2) (+6 -2) + doc/users_guide/gimp-edition.sgml (1.1) ( ) + doc/users_guide/title.sgml (1.2) (+0 -16) + doc/users_guide/users-guide.sgml (1.7) (+18 -0) + doc/users_guide/util-edition.sgml (1.1) ( ) + + + + Created new top level files for separate editions of the User's Guide. + 2002-04-08 Files: src/main/print-pcl.c (1.52) (+2 -2) @@ -13077,6 +13517,47 @@ Added descriptions for -o, -s, -l, -M options. Updated description for -u option. +2002-04-07 + + Files: doc/users_guide/utils.sgml (1.3) (+9 -5) + doc/users_guide/utils.sgml (1.4) (+6 -12) + + *** empty log message *** + +2002-04-07 + + Files: doc/users_guide/utils.sgml (1.2) (+57 -51) + + + + Reformatting of the escputil examples. I thought they looked ugly on the + right margin when printed. + +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) ( ) + + + + 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.32) (+2 -2) + + + + Updates include minor textual fixes to ch_0 and ch_4. Makefile.am repaired to + allow make dist to include more than users-guide.sgml. + 2002-04-06 Files: src/foomatic/Makefile.am (1.23) (+11 -13) @@ -13103,6 +13584,18 @@ Let Foomatic data for GhostScript and IJS drivers go into separate directories (to simplify Debian packaging). +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) + + + + 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: m4/.cvsignore (1.1) ( ) @@ -13288,6 +13781,7 @@ Files: Makefile.am (1.127) (+9 -20) doc/Makefile.am (1.31) (+6 -6) doc/developer/Makefile.am (1.6) (+6 -5) + doc/users_guide/Makefile.am (1.30) (+4 -2) man/Makefile.am (1.7) (+16 -2) samples/Makefile.am (1.4) (+6 -6) src/Makefile.am (1.12) (+2 -3) @@ -13613,6 +14107,12 @@ Check more values during verification +2002-01-26 + + Files: doc/users_guide/Makefile.am (1.29) (+3 -3) + + Fix manual.sgml dependencies to use $(srcdir) to create correct symlinks + 2002-01-26 Files: Makefile.am (1.124) (+1 -5) @@ -13882,13 +14382,6 @@ Fix image copying bug when there are no images to copy -2001-12-01 - - Files: debian/.cvsignore (1.6) (+0 -1) - - Update package descriptions for 4.3 - Packages depends on libgimpprint-locales >= the Source-Version - 2001-12-01 Files: doc/developer/.cvsignore (1.2) (+1 -1) @@ -13931,6 +14424,14 @@ Set release date. +2001-11-23 + + Files: doc/users_guide/figures/cups_admin_model.png (1.2) (+49 -62) + doc/users_guide/figures/cups_my_printer.png (1.2) (+33 -68) + doc/users_guide/users-guide.sgml (1.4) (+96 -91) + + Updates for rev 4.2.0 release + 2001-11-23 Files: Makefile.am (1.120) (+3 -1) @@ -13944,6 +14445,12 @@ Correct lists of translations. +2001-11-22 + + Files: doc/users_guide/users-guide.sgml (1.3) (+46 -9) + + Insert warning for connecting USB printers with CUPS. + 2001-11-22 Files: NEWS (1.66) (+2 -5) @@ -14085,6 +14592,12 @@ Updates for C80 +2001-11-10 + + Files: doc/users_guide/users-guide.sgml (1.2) (+1 -1) + + Update release date + 2001-11-10 Files: src/escputil/Makefile.am (1.10) (+2 -2) @@ -14131,6 +14644,7 @@ 2001-11-08 Files: doc/Makefile.am (1.27) (+10 -10) + doc/users_guide/Makefile.am (1.28) (+11 -11) Clean up rm use (many places need either -rm file or rm -f file): @@ -14322,6 +14836,20 @@ Common Samba problem +2001-10-30 + + Files: doc/users_guide/Makefile.am (1.27) (+2 -2) + + Minor typo, to fix VPATH build + +2001-10-30 + + Files: doc/users_guide/.cvsignore (1.4) (+8 -8) + doc/users_guide/Makefile.am (1.26) (+6 -6) + doc/users_guide/users-guide.sgml (1.1) ( ) + + Removed underscores from linkend, ids, and filename per Eric + 2001-10-30 Files: src/main/printers.xml (1.37) (+7 -7) @@ -14359,6 +14887,7 @@ 2001-10-28 Files: doc/Makefile.am (1.26) (+36 -12) + doc/users_guide/Makefile.am (1.25) (+50 -15) Fix VPATH build. Don't build gimpprint.pdf by default. @@ -14407,6 +14936,8 @@ doc/FAQ.html (1.7) (+3 -3) doc/Makefile.am (1.24) (+2 -2) doc/README.maintaining (1.8) (+16 -16) + doc/users_guide/README (1.6) (+9 -10) + doc/users_guide/figures/README (1.3) (+1 -1) scripts/autogen.sh (1.14) (+2 -2) src/cups/command.txt (1.2) (+1 -1) src/cups/genppd.c (1.31) (+5 -5) @@ -14578,6 +15109,12 @@ less than 360x180). Tested by comparing PPD files with and without the change. +2001-10-19 + + Files: doc/users_guide/Makefile.am (1.24) (+4 -3) + + Remove incorrect html-stamp usage + 2001-10-19 Files: test/Makefile.am (1.29) (+2 -2) @@ -14690,6 +15227,7 @@ 2001-10-16 Files: doc/Makefile.am (1.20) (+31 -30) + doc/users_guide/Makefile.am (1.23) (+26 -13) Make clean works fully in maintainer mode VPATH builds create symlinks to docs correctly @@ -14816,6 +15354,13 @@ Translate papersize (text) names before returning them to the user. +2001-10-13 + + Files: doc/users_guide/Makefile.am (1.22) (+7 -7) + doc/users_guide/README (1.5) (+3 -8) + + Fixed spacing...updated README + 2001-10-13 Files: Makefile.am (1.116) (+10 -10) @@ -14826,9 +15371,32 @@ Use more portable $(RM) instead of 'rm -f' Add reference to SGML users guide to Texinfo manual +2001-10-13 + + Files: doc/users_guide/Makefile.am (1.21) (+21 -19) + + Clean should not remove the pdf or ps version of the manual, to be + consistent with how it treats the html manual. It also can't remove + the .eps files, unfortunately. + + New veryclean target does remove all of the above. + + Distribute the html timestamp to inhibit rebuilding in the field. + + Add phony targets. + + Remove unused ps.gz target. + +2001-10-13 + + Files: doc/users_guide/Makefile.am (1.20) (+14 -8) + + Add DESTDIR support to install-data-local and uninstall-local + 2001-10-12 - Files: src/ghost/.cvsignore (1.6) (+1 -0) + Files: doc/users_guide/.cvsignore (1.3) (+1 -0) + src/ghost/.cvsignore (1.6) (+1 -0) Updates @@ -14853,6 +15421,25 @@ sizes exceeds 94 in the DesignJet 750 PPD file CUPS loses track of all printers in the administrative interface. +2001-10-11 + + Files: doc/users_guide/.cvsignore (1.2) (+1 -0) + + Ignore html directory + +2001-10-11 + + Files: doc/users_guide/Makefile.am (1.19) (+11 -31) + + Eliminate dependency on specific Linux (much less UNIX) distribution. + Preprocess source rather than intermediate file. + +2001-10-11 + + Files: doc/users_guide/Makefile.am (1.18) (+21 -16) + + PDF users guide builds independently of PS docs. Also, XREF and IMAGEDATA errors are gone. + 2001-10-10 Files: src/gimp/Makefile.am (1.18) (+4 -5) @@ -14887,12 +15474,24 @@ Updates +2001-10-07 + + Files: doc/users_guide/Makefile.am (1.17) (+2 -2) + + Need to remove the doc directory on uninstall. + 2001-10-07 Files: README (1.74) (+6 -6) A few very minor updates. +2001-10-07 + + Files: doc/users_guide/Makefile.am (1.16) (+12 -6) + + Assorted minor cleanup and bug fixing. + 2001-10-07 Files: po/.cvsignore (1.5) (+1 -0) @@ -14926,10 +15525,32 @@ 2001-10-06 - Files: scripts/autogen.sh (1.9) (+27 -11) + Files: doc/users_guide/Makefile.am (1.15) (+1 -7) + + Removed creation of figures directory in users_guide pdf and eps targets + +2001-10-06 + + Files: doc/users_guide/Makefile.am (1.14) (+6 -21) + doc/users_guide/README (1.4) (+2 -2) + scripts/autogen.sh (1.9) (+27 -11) Tweaked doc/users_guide/Makefile.am and added checks for convert and docbook_4 to scripts/autogen.sh +2001-10-06 + + Files: doc/users_guide/.cvsignore (1.1) ( ) + doc/users_guide/Makefile.am (1.13) (+6 -1) + doc/users_guide/figures/.cvsignore (1.1) ( ) + + Updates + +2001-10-06 + + Files: doc/users_guide/Makefile.am (1.12) (+31 -24) + + Add -without-user-guide. + 2001-10-06 Files: README (1.73) (+49 -39) @@ -14960,6 +15581,33 @@ Another attempt to fix printing at 720 DPI on Stylus Color Pro and friends. +2001-10-06 + + Files: doc/users_guide/Makefile.am (1.11) (+3 -3) + + We do need to distribute the .ps file. Sigh. + +2001-10-06 + + Files: doc/users_guide/Makefile.am (1.10) (+36 -23) + + * List all of the figures explicitly rather than wildcarding + + * Build and distribute HTML and PDF by default + + * Don't export SGML_CATALOG_FILES (especially not incorrect hardcoded + path) + + * Create make install + + * Fix directory permissions botched by the toolchain + +2001-10-06 + + Files: doc/users_guide/Makefile.am (1.9) (+2 -2) + + maintainer-clean should clear the html stamp + 2001-10-06 Files: src/foomatic/foomatic-printermap (1.16) (+3 -0) @@ -14972,10 +15620,17 @@ Print out all missing drivers before exiting. +2001-10-05 + + Files: doc/users_guide/Makefile.am (1.8) (+8 -2) + + Distribute the PDF manual + 2001-10-05 Files: Makefile.am (1.114) (+9 -1) doc/Makefile.am (1.18) (+25 -4) + doc/users_guide/Makefile.am (1.7) (+87 -44) Add new make targets: pdf and docs Distribute user_guide html manual by default @@ -14990,6 +15645,27 @@ Allow softweave printing on first generation printers that should support it. +2001-10-04 + + Files: doc/users_guide/Makefile.am (1.6) (+2 -3) + + Removing Makefile as it is now built by automake + +2001-10-04 + + Files: doc/users_guide/Makefile.am (1.5) (+3 -3) + doc/users_guide/README (1.3) (+8 -0) + + *** empty log message *** + +2001-10-04 + + Files: doc/users_guide/Makefile.am (1.4) (+13 -28) + doc/users_guide/README (1.2) (+12 -14) + doc/users_guide/figures/README (1.2) (+5 -7) + + Updates to Makefile.am, READMEs, and rename orig source file to remove rev + 2001-10-03 Files: src/foomatic/foomatic-generator.in (1.13) (+1 -1) @@ -15000,12 +15676,14 @@ Files: Makefile.am (1.113) (+6 -6) doc/Makefile.am (1.17) (+4 -4) + doc/users_guide/Makefile.am (1.3) (+4 -4) Correct program naming, use variables for perl invocation 2001-10-03 Files: doc/Makefile.am (1.16) (+3 -1) + doc/users_guide/Makefile.am (1.2) (+54 -13) Add users_guide to doc/Makefile.am SUBDIRS Automatically generate EPS and PDF images from PNG source @@ -15018,12 +15696,41 @@ These values are presumed better based on Epson output. +2001-10-02 + + Files: doc/users_guide/Makefile.am (1.1) ( ) + + Add preliminary support for the new SGML user guide + 2001-10-02 Files: Makefile.am (1.112) (+10 -1) Use standard Makefile formatting +2001-10-02 + + Files: doc/users_guide/README (1.1) ( ) + doc/users_guide/figures/README (1.1) ( ) + doc/users_guide/figures/cups_admin.png (1.1) ( ) + doc/users_guide/figures/cups_admin_device.png (1.1) ( ) + doc/users_guide/figures/cups_admin_make.png (1.1) ( ) + doc/users_guide/figures/cups_admin_model.png (1.1) ( ) + doc/users_guide/figures/cups_admin_success.png (1.1) ( ) + doc/users_guide/figures/cups_config_printer.png (1.1) ( ) + doc/users_guide/figures/cups_my_printer.png (1.1) ( ) + doc/users_guide/figures/cups_printers.png (1.1) ( ) + doc/users_guide/figures/cups_startup.png (1.1) ( ) + doc/users_guide/figures/gimp-print-gui-1.png (1.1) ( ) + doc/users_guide/figures/gimp-print-gui.png (1.1) ( ) + doc/users_guide/figures/gimp-print-new-printer.png (1.1) ( ) + doc/users_guide/figures/gimp-print-print-color-adjust.png (1.1) ( ) + doc/users_guide/figures/gimp-print-setup.png (1.1) ( ) + doc/users_guide/figures/gimp_image.png (1.1) ( ) + doc/users_guide/figures/gimp_startup.png (1.1) ( ) + + Initial checkin of user's guide + 2001-10-02 Files: src/escputil/escputil.c (1.31) (+2 -1) @@ -17057,7 +17764,6 @@ 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) @@ -18022,15 +18728,6 @@ it this way. Fixed minor bugs in bjc-unprint. -2001-03-20 - - Files: debian/.cvsignore (1.4) (+9 -0) - - Resurrect .cvsignore, and add a few more entries, too. - - This should have been resurrected a log time ago, but I missed it because - is began with a ".". - 2001-03-19 Files: src/main/print-canon.c (1.26) (+2 -2) @@ -18468,12 +19165,6 @@ Fix the page dimensions of some older Epson printers. -2001-02-22 - - Files: debian/.cvsignore (1.3) (+0 -0) - - Really, I mean it now, remove this file from the main trunk! - 2001-02-21 Files: Makefile.am (1.90) (+15 -2) @@ -18753,14 +19444,6 @@ Speed up escputil by using poll if available. -2001-02-12 - - Files: debian/.cvsignore (1.2) (+0 -2) - - Add debian/rules, debian/control and update debian/.cvsignore - Add error message to cups library checks in configure.in.in - Remove redundant cups/.cvsignore - 2001-02-12 Files: src/main/print-escp2.c (1.17) (+29 -28) @@ -22331,12 +23014,6 @@ More constant tuning -2000-07-24 - - Files: debian/.cvsignore (1.1) ( ) - - *** empty log message *** - 2000-07-23 Files: print-dither.c (1.75) (+4 -4) diff --git a/Makefile.in b/Makefile.in index 2ce07a2..55d7dbd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -295,10 +295,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/NEWS b/NEWS index 7605798..0ab7062 100644 --- a/NEWS +++ b/NEWS @@ -19,34 +19,39 @@ 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-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 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 5.0.0-rc2 is the second release candidate of Gutenprint +5.0, and incorporates extensive feedback from the first release +candidate. It is based on the Gimp-Print 4.3 series that has been in +development 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 (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. -Please the rest of the release notes, in particular the Exceptions and -Workarounds, for full details on installation, as there is an -important caveat. CUPS is the printing system used on Macintosh OS X -10.2 and above, and many other systems use it. The combination of -CUPS and Gutenprint provides a flexible, general purpose printing -system capable of producing the highest quality output with any of the -printers supported by this package. We strongly recommend using CUPS -with Gutenprint as a general-purpose printing solution. +700 printer models. + +The CUPS driver requires CUPS 1.1.15 or higher. If you wish to build +this from source, you may need to install a package named "cups-devel" +or something similar. Please the rest of the release notes, in +particular the Exceptions and Workarounds, for full details on +installation, as there is important information to be aware of. CUPS +is the printing system used on Macintosh OS X 10.2 and above, and many +other systems use it. The combination of CUPS and Gutenprint provides +a flexible, general purpose printing system capable of producing the +highest quality output with any of the printers supported by this +package. We strongly recommend using CUPS with Gutenprint as a +general-purpose printing solution. + +The Print plug-in for the GIMP requires either the GIMP 2.0 or above, +or 1.2.3 or above on the 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. For GIMP 2.0, you may need to install "gimp2-devel", +"gtk2-devel", "glib2-devel", and possibly other packages as well. +This plug-in will work with any printing system, and offers a +comprehensive user interface to control all aspects of the printing +process. The Ghostscript driver requires GNU Ghostscript 6.53 or higher, ESP Ghostscript 7.05 or higher, or AFPL Ghostscript 7.04 or higher. It @@ -59,7 +64,7 @@ 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 +We strongly 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 @@ -71,7 +76,7 @@ OS X 10.0 and 10.1 use a different system that would require a separate driver, and we do not plan to write that driver. The README file included with this package provides full instructions -on building and installing Gutenprint. +for building and installing Gutenprint. These release notes contain the following sections: @@ -97,66 +102,105 @@ These release notes contain the following sections: size. Previously it corrupted the output if the width of the image was not a multiple of 4 pixels. - 4) The GIMP plugin now loads the printrc file correctly in all + 4) The driver package now permits specifying all options regardless + of the setting of the Image Type and Quality options (previously + it disabled a lot of settings if Quality and/or Image Type were + not set to Manual Control). The behavior is now that Quality and + Image Type provide defaults that may be overridden by the user. + For example, if the resolution is provided explicitly, it will + override the resolution implied by the Quality setting. + + Related to this, the CUPS driver now handles Quality properly. + + 5) A description of all options supported by Gutenprint has been + added, in doc/gutenprint-options. + + 6) cups-genppdupdate now preserves the ownership and permissions of + the PPD files being updated, rather than forcibly setting the + owner to root and the permissions to root read/write and everyone + else read-only access. + + 7) The GIMP plugin now loads the printrc file correctly in all locales. Previously it did not load floating point numbers correctly in locales that don't use the `.' character as the decimal point. - 5) The GIMP plugin now offers improved choices in the color + 8) The GIMP plugin now offers improved choices in the color adjustment window for viewing individual channels of the output. It now offers red/green/blue, cyan/magenta/yellow, or cyan/magenta/yellow/black as appropriate. - 6) The GIMP plugin is now considerably more responsive; many - unnecessary screen redraws have been removed. + 9) The GIMP plugin is now considerably more responsive; many + unnecessary screen redraws have been removed. In addition, a + display glitch wherein horizontal lines were sometimes drawn + through certain widgets has been fixed. - 7) The Epson printer utility escputil now reports ink information + 10) The Epson printer utility escputil now reports ink information more consistently across a wider range of printers. In particular, the extended ink information command (escputil -e) should now work correctly on all models from the Stylus Color 740 through the present. - 8) Preliminary support for the Epson Stylus C68, C87, C88, CX3700, - CX3800, CX3810, CX4200, CX4700, CX4800, CX5800, CX7700, CX7800, - D68, D88, DX3800, DX3850, DX4200, DX4800, and Stylus Photo R220, - R320, and R340. These printers are expected to be fully - functional (for the multi-function devices, this package supports - only the printer function). + 11) Preliminary support for the Epson Stylus C68, C87, C88, CX3700, + CX3800, CX3805, CX3810, CX4100, CX4200, CX4500, CX4700, CX4800, + CX5700, CX5800, CX7700, CX7800, D68, D88, DX3800, DX3850, DX4200, + DX4250, DX4800, PX-A650, and Stylus Photo R220, R320, and R340. + These printers are expected to be fully functional (for the + multi-function devices, this package supports only the printer + function -- it does not support scanning or fax). - 9) Preliminary support for the Epson Stylus Photo R2400. This - printer has been partially tuned, but there will likely be + 12) Preliminary support for the Epson Stylus Photo R2400/PX-5500. + This printer has been partially tuned, but there will likely be further changes to this driver. - 10) Experimental support for the Epson Stylus Photo RX700. This - printer may or may not function correctly, and is not likely to - be properly tuned. + 13) Support for the Epson PictureMate/E-100. - 11) Initial support for Canon S200, SELPHY CP-510 and SELPHY CP-710; + 14) Preliminary support for the Epson Stylus Photo RX700/PM-A900. + This printer has been partially tuned, but there will likely be + further changes to this driver. + + 15) Initial support for Canon S200, SELPHY CP-510 and SELPHY CP-710; Sony UP-DR150, and Olympus P-11 has been added. - 12) The Canon PIXMA iP4000 printers can now print to cds. Duplex + 16) The Canon PIXMA iP4000 printers can now print to cds. Duplex printing with binding on the short side is now supported, too. - 13) The Epson Stylus Photo R200 and related printers have been + 17) The Epson Stylus Photo R200 and related printers have been retuned to give improved detail in the shadows, reduced ink usage, more accurate grayscale, and more accurate colors. - Affected printers are the R200, R210, R220, R300, R310, R320, - R340, RX400, RX420, RX425, RX430, RX500, RX510, RX600, RX620, - RX630, PM-D750, PM-D770, PM-G700, and, PM-G720. + Affected printers are presently the R200, R210, R220, R300, R310, + R320, R340, RX400, RX420, RX425, RX430, RX500, RX510, RX600, + RX620, RX630, PM-D750, PM-D770, PM-G700, and PM-G720. Any profiles generated against these printers will have to be re-created. - 14) New "transposed" resolutions (1440x720 and 2880x1440) have been + 18) The Epson Stylus Photo R800 and R1800 have been retuned to give + improved detail in the shadows, reduced ink usage, more accurate + grayscale, and more accurate colors. + + Any profiles generated against these printers will have to be + re-created. + + 19) New "transposed" resolutions (1440x720 and 2880x1440) have been added for some Epson printers. These resolutions are actually equivalent to 720x1440 and 1440x2880 DPI respectively. In some cases these may yield better results (specifically, less microbanding) than the normal 1440x720 and 2880x1440 DPI resolutions. - 15) Quadtone printing now works correctly regardless of whether + 20) Quadtone printing now works correctly regardless of whether color or grayscale mode is selected. +The following bugs have been fixed in Gutenprint 5.0.0-rc2: + +1389788 Poor discoverability of advanced options +1389787 CUPS driver does not set Quality correctly +1389785 cups-genppdupdate sets PPD file owners incorrectly +1388615 escputil with Epson CX3700 +1304710 Postscript driver corrupts output if width not multiple of 4 +1251978 PPD for Stylus Color 600 + ================================================================ @@ -179,16 +223,16 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: 3) Simplified bundles of settings are now offered for users who do not need to customize the settings. The Print Quality and Image Type controls offer a variety of settings optimized for common - printing tasks. Both controls offer Manual Control settings for - users who wish greater control over the output. + printing tasks; these settings may be overridden by explicit user + choice. 4) Many of the color settings have changed effect. We recommend - starting with no color correction and making appropriate changes + starting with no color adjustments and making appropriate changes only as required. Specific changes that you should be aware of include: * The default operation of the contrast setting has changed to be - more in accord with standard practice. In 4.2, reducing the + more in accord with other packages. In 4.2, reducing the contrast resulted in changing the black and white setting. In 5.0, reducing the contrast does not change the black and white settings. As a result, it is possible to use the contrast @@ -196,7 +240,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: contrast. The previous behavior is available by turning on the "Linear - Contrast Adjustment". + Contrast Adjustment" setting. * The brightness control now behaves more in accord with standard practice, adjusting the image's overall brightness without @@ -212,7 +256,8 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: correction. They are applied after the color correction to scale the individual channels. The per-channel gray balance settings adjust gray balance without affecting per-channel - density settings, permitting better color saturation without + density settings (i. e. the adjust the amount of ink used to + generate gray), permitting increased color saturation without compromising gray balance. 5) The Uncorrected color correction mode is recommended for users @@ -240,8 +285,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: * New Functionality: - 1) This release offers a new curve data type, permitting very - precise adjustments of output. + 1) This release offers a new "curve" data type, permitting very + precise adjustments of output. Currently the curves are only + accessible in the GIMP plugin. 2) This release offers many new output controls: @@ -289,7 +335,8 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: vs. bidirectional) is now a separate control. In addition to contributing to the simplification of the Epson printer resolutions, this permits the choice of unidirectional - vs. bidirectional at all resolutions. + vs. bidirectional at all resolutions if desired. By default, the + driver picks the most appropriate choice for the situation. 8) The Epson driver now allows printing directly to CD's on printers that support this functionality. In addition, a choice of center @@ -307,13 +354,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: different choices of inks (such as the Epson Stylus Photo 2200, which offers a choice of Matte Black and Photo Black inks). - 11) The Epson driver permits adjusting the dot size if required to - increase the amount of ink printed. For example, if 1440x720 DPI - is selected, but the density requested is very high, the printer - will switch to using drop sizes appropriate for 720 DPI. This - option is not normally required and is disabled by default. - - 12) Where practical, all controls offer a default setting for + 11) Where practical, all controls offer a default setting for simplicity of operation. This default value is intended to offer the optimal choice given the printer and its other settings. For example, if "Automatic" is selected for print head direction, the @@ -327,32 +368,32 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: based on the paper type loaded by the user. Similarly, there is no default for the input slot or ink set. - 13) Support for a variety of input types, in both 8 and 16 bit + 12) Support for a variety of input types, in both 8 and 16 bit resolution, has been added. Gutenprint can now handle input in grayscale, whitescale (inverted grayscale), RGB, CMY, CMYK, and KCMY in 8 and 16 bit resolutions for all output types. - 14) A new Threshold color correction mode has been added that + 13) A new Threshold color correction mode has been added that produces either all-on or all-off of each color. This is similar to the Monochrome mode in 4.2, except that it works for color as well as black. - 15) A new Desaturated color correction mode has been added that + 14) A new Desaturated color correction mode has been added that produces gray (desaturated) output using color inks. - 16) A new Density color correction mode has been added that corrects + 15) A new Density color correction mode has been added that corrects only for density. This will normally produce excessively dark output. However, applications that wish to use their own linearization curves may wish to use this interface to prevent Gutenprint from performing its own linearization. - 17) A new Raw color correction mode has been added that performs no + 16) A new Raw color correction mode has been added that performs no correction whatsoever on the input. This mode may be used by applications that wish to perform their own ink limiting and linearization, and use Gutenprint to perform dithering (screening) and output generation only. - 18) A new Predithered color correction mode has been added that + 17) A new Predithered color correction mode has been added that combines the effects of Raw and Threshold. This mode may be used by applications that wish to perform their own dithering and use Gutenprint to generate printer-specific output only. The input @@ -360,7 +401,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: printers, it should be 0 or 1; for printers with three drop sizes, it should be 0, 1, 2, or 3). - 19) A new Correct Hue Only color correction mode has been added that + 18) A new Correct Hue Only color correction mode has been added that performs partial color correction (adjusts hue, but not darkness). @@ -375,10 +416,11 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: 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 works on all known supported printers, + and may work on other non-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. @@ -390,13 +432,19 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: 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. + printer connected to a queue. However, commands that must be + run bidirectionally (ink level, identify, and printer status) + 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. + 20) The Epson driver permits adjusting the dot size if required to + increase the amount of ink printed. For example, if 1440x720 DPI + is selected, but the density requested is very high, the printer + will switch to using drop sizes appropriate for 720 DPI. This + option is not normally required and is disabled by default. + * Changes to the Print plugin for the GIMP: @@ -1253,8 +1301,6 @@ Known Build/Installation Issues the ijsgutenprint in the next release. This is to prevent accidentally using incorrect data, which could cause incorrect function to take place. - - ================================================================ @@ -1276,6 +1322,11 @@ good output at the highest resolution offered (2880x720, 2880x1440, or 2880x2880 DPI), since in general these printers will not use multiple drop sizes at such high resolutions. +Note that Gutenprint supports only the printer in multi-function +devices -- this package does not support scanning, fax, copying, or +any other function. For scanning, please visit the SANE project +(http://www.sane-project.org). + Please see the printer-specific notes section following the list of printers for any instructions specific to your printer. @@ -1432,8 +1483,11 @@ EPSON Stylus CX-3600 EPSON Stylus CX-3650 EPSON Stylus CX-3700 EPSON Stylus CX-3800 +EPSON Stylus CX-3805 EPSON Stylus CX-3810 +EPSON Stylus CX-4100 EPSON Stylus CX-4200 +EPSON Stylus CX-4500 EPSON Stylus CX-4600 EPSON Stylus CX-4700 EPSON Stylus CX-4800 @@ -1441,6 +1495,7 @@ EPSON Stylus CX-5100 EPSON Stylus CX-5200 EPSON Stylus CX-5300 EPSON Stylus CX-5400 +EPSON Stylus CX-5700 EPSON Stylus CX-5800 EPSON Stylus CX-6300 EPSON Stylus CX-6400 @@ -1455,7 +1510,9 @@ EPSON Stylus D88 EPSON Stylus DX-3800 EPSON Stylus DX-3850 EPSON Stylus DX-4200 +EPSON Stylus DX-4250 EPSON Stylus DX-4800 +EPSON PictureMate EPSON CL-700 EPSON CL-750 EPSON CL-760 (Experimental) @@ -1498,6 +1555,7 @@ EPSON PM-5000C EPSON PM-7000C EPSON PM-9000C EPSON PM-10000 +EPSON PM-A900 EPSON PM-D750 EPSON PM-D770 EPSON PM-D1000 @@ -1505,10 +1563,12 @@ EPSON PM-G700 EPSON PM-G720 EPSON PM-G800 (Experimental) EPSON PM-G820 (Experimental) +EPSON PX-A650 EPSON PX-G900 EPSON PX-G5000 EPSON PX-V500 EPSON PX-V600 +EPSON PX-5500 EPSON PX-7000 EPSON PX-9000 Fujifilm Printpix CX-400 @@ -1659,6 +1719,7 @@ Canon LBP-1000 pcl-6 HP LaserJet 6 series Canon LBP-1260 pcl-6 HP LaserJet 6 series Canon LBP-1760 pcl-6 HP LaserJet 6 series Canon S100 bjc-4300 Canon BJC 4300 +Canon S200 bjc-s200 Canon S200 Canon S300 bjc-s800 Canon S800 Canon S400 bjc-s400 Canon S400 Canon S450 bjc-s450 Canon S450 @@ -1794,7 +1855,9 @@ Epson Stylus Photo R340 escp2-r340 EPSON Stylus Photo R340 Epson Stylus Photo RX400 escp2-rx400 EPSON Stylus Photo RX400 Epson Stylus Photo RX420 escp2-rx420 EPSON Stylus Photo RX420 Epson Stylus Photo RX425 escp2-rx425 EPSON Stylus Photo RX425 +Epson Stylus Photo RX430 escp2-rx430 EPSON Stylus Photo RX430 Epson Stylus Photo RX500 escp2-rx500 EPSON Stylus Photo RX500 +Epson Stylus Photo RX510 escp2-rx510 EPSON Stylus Photo RX510 Epson Stylus Photo RX600 escp2-rx600 EPSON Stylus Photo RX600 Epson Stylus Photo RX620 escp2-rx620 EPSON Stylus Photo RX620 Epson Stylus Photo RX630 escp2-rx630 EPSON Stylus Photo RX630 @@ -1813,6 +1876,7 @@ Epson Stylus Pro 9600 escp2-9600 EPSON Stylus Pro 9600 Epson Stylus Pro 10000 escp2-10000 EPSON Stylus Pro 10000 Epson Stylus Scan 2000 escp2-scan2000 EPSON Stylus Scan 2000 Epson Stylus Scan 2500 escp2-scan2500 EPSON Stylus Scan 2500 +Epson Stylus CX1500 escp2-cx1500 EPSON Stylus CX-1500 Epson Stylus CX3100 escp2-cx3100 EPSON Stylus CX-3100 Epson Stylus CX3200 escp2-cx3200 EPSON Stylus CX-3200 Epson Stylus CX3500 escp2-cx3500 EPSON Stylus CX-3500 @@ -1820,7 +1884,11 @@ Epson Stylus CX3600 escp2-cx3600 EPSON Stylus CX-3600 Epson Stylus CX3650 escp2-cx3650 EPSON Stylus CX-3650 Epson Stylus CX3700 escp2-cx3700 EPSON Stylus CX-3700 Epson Stylus CX3800 escp2-cx3800 EPSON Stylus CX-3800 +Epson Stylus CX3805 escp2-cx3805 EPSON Stylus CX-3805 +Epson Stylus CX3810 escp2-cx3810 EPSON Stylus CX-3810 +Epson Stylus CX4100 escp2-cx4100 EPSON Stylus CX-4100 Epson Stylus CX4200 escp2-cx4200 EPSON Stylus CX-4200 +Epson Stylus CX4500 escp2-cx4500 EPSON Stylus CX-4500 Epson Stylus CX4600 escp2-cx4600 EPSON Stylus CX-4600 Epson Stylus CX4700 escp2-cx4700 EPSON Stylus CX-4700 Epson Stylus CX4800 escp2-cx4800 EPSON Stylus CX-4800 @@ -1828,9 +1896,11 @@ Epson Stylus CX5100 escp2-cx5100 EPSON Stylus CX-5100 Epson Stylus CX5200 escp2-cx5200 EPSON Stylus CX-5200 Epson Stylus CX5300 escp2-cx5300 EPSON Stylus CX-5300 Epson Stylus CX5400 escp2-cx5400 EPSON Stylus CX-5400 +Epson Stylus CX5700 escp2-cx5700 EPSON Stylus CX-5700 Epson Stylus CX5800 escp2-cx5800 EPSON Stylus CX-5800 Epson Stylus CX6300 escp2-cx6300 EPSON Stylus CX-6300 Epson Stylus CX6400 escp2-cx6400 EPSON Stylus CX-6400 +Epson Stylus CX6500 escp2-cx6500 EPSON Stylus CX-6500 Epson Stylus CX6600 escp2-cx6600 EPSON Stylus CX-6600 Epson Stylus CX7700 escp2-cx7700 EPSON Stylus CX-7700 Epson Stylus CX7800 escp2-cx7800 EPSON Stylus CX-7800 @@ -1841,12 +1911,16 @@ Epson Stylus D88 escp2-d88 EPSON Stylus D88 Epson Stylus DX3800 escp2-dx3800 EPSON Stylus DX-3800 Epson Stylus DX3850 escp2-dx3850 EPSON Stylus DX-3850 Epson Stylus DX4200 escp2-dx4200 EPSON Stylus DX-4200 +Epson Stylus DX4250 escp2-dx4250 EPSON Stylus DX-4250 Epson Stylus DX4800 escp2-dx4800 EPSON Stylus DX-4800 +Epson PictureMate escp2-picmate EPSON PictureMate +Epson PictureMate Deluxe escp2-picmated EPSON PictureMate Deluxe Epson CL-700 escp2-cl700 EPSON CL-700 Epson CL-750 escp2-cl750 EPSON CL-750 Epson CL-760 escp2-cl760 EPSON CL-760 Epson EM-900C escp2-em900c EPSON EM-900C Epson EM-930C escp2-em930c EPSON EM-930C +Epson E-100 escp2-e100 EPSON E-100 Epson MC-2000 escp2-mc2000 EPSON MC-2000 Epson MC-5000 escp2-mc5000 EPSON MC-5000 Epson MC-7000 escp2-mc7000 EPSON MC-7000 @@ -1884,6 +1958,7 @@ Epson PM-5000C escp2-pm5000c EPSON PM-5000C Epson PM-7000C escp2-pm7000c EPSON PM-7000C Epson PM-9000C escp2-pm9000c EPSON PM-9000C Epson PM-10000 escp2-pm10000 EPSON PM-10000 +Epson PM-A900 escp2-pma900 EPSON PM-A900 Epson PM-D750 escp2-pmd750 EPSON PM-D750 Epson PM-D770 escp2-pmd770 EPSON PM-D770 Epson PM-D1000 escp2-pmd1000 EPSON PM-D1000 @@ -1891,11 +1966,13 @@ Epson PM-G700 escp2-pmg700 EPSON PM-G700 Epson PM-G720 escp2-pmg720 EPSON PM-G720 Epson PM-G800 escp2-pmg800 EPSON PM-G800 Epson PM-G820 escp2-pmg820 EPSON PM-G820 +Epson PX-A650 escp2-pxa650 EPSON PX-A650 Epson PX-G900 escp2-pxg900 EPSON PX-G900 Epson PX-G920 escp2-pxg920 EPSON PX-G920 Epson PX-G5000 escp2-pxg5000 EPSON PX-G5000 Epson PX-V500 escp2-pxv500 EPSON PX-V500 Epson PX-V600 escp2-pxv600 EPSON PX-V600 +Epson PX-5500 escp2-px5500 EPSON PX-5500 Epson PX-7000 escp2-px7000 EPSON PX-7000 Epson PX-9000 escp2-px9000 EPSON PX-9000 Fujifilm Printpix CX-400 fujifilm-cx400 Fujifilm Printpix CX-400 @@ -2350,14 +2427,15 @@ Printer-Specific Notes: and offer benefit over lower resolutions. It is almost always better to have a printing resolution with - a smaller aspect ratio. Therefore a resolution of 2880x1440 - DPI is likely to yield superior results to a resolution of - 5760x720 DPI. Therefore, in some cases we do not offer - certain resolutions offered by the printer vendor (in the - case of the Epson Stylus Photo R800, 5760x1440 DPI) because - they are not likely to yield any benefit (either speed or - quality) over another resolution that we offer (in this case, - 2880x2880 DPI). + a smaller aspect ratio (i. e. the horizontal and vertical + resolutions are similar). For example, a resolution of + 2880x1440 DPI is likely to yield superior results to a + resolution of 5760x720 DPI. Therefore, in some cases we do + not offer certain resolutions offered by the printer vendor + (in the case of the Epson Stylus Photo R800, 5760x1440 DPI) + because they are not likely to yield any benefit (either + speed or quality) over another resolution that we offer (in + this case, 2880x2880 DPI). Indeed, we have received reports that in some cases a lower resolution may actually offer improved quality over a higher diff --git a/README b/README index 79350e6..c52ff69 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ INTRODUCTION - This is Gutenprint version 5.0.0 release candidate 1, the first + This is Gutenprint version 5.0.0 release candidate 2, the second 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, @@ -45,19 +45,15 @@ BASIC INSTALLATION Gutenprint includes the following primary components: - - The core driver, libgutenprint.so - - A user's manual - - A Print plug-in for the GIMP + - The core driver package - A CUPS (Common UNIX Printing System) driver - - An IJS-based Ghostscript driver + - A Print plug-in for the GIMP - Support for the Foomatic spooler configuration system - - A utility to administer Epson printers, escputil + - A Ghostscript driver using the IJS plugin facility + - A utility to administer and maintain Epson printers - By default, Gutenprint builds the Print plugin for the GIMP, the - user's manual, and a utility to perform head cleaning, nozzle - alignment, and other tasks on EPSON Stylus inkjet printers, named - "escputil". Directions for building other components are listed - below. + The core driver package is always built. Directions for building + the other components are listed below. Please check our web site at http://gimp-print.sourceforge.net for details about what is and is not supported. @@ -90,56 +86,6 @@ BASIC INSTALLATION need to use 'gmake'. -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 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: - - ./configure [--with-gimp] - make - make install - - 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 - to be explicit about building the GIMP Print plugin; --with-gimp - is implied if `configure' detects that the GIMP is installed, so - you do not actually need to specify it. - - This installs the GIMP Print plugin in your system plug-in - directory. If you wish to install it in your personal plugin - directory, you may use - - ./configure --enable-user-install - - If you have installed the GIMP as a precompiled package - (e. g. from an RPM), you will need to install the gimp-devel - (sometimes called gimp-developer, or something similar) package as - well as the gimp package. The GIMP package as supplied in most - distributions only contains what's needed to run the GIMP, not the - additional files needed to build GIMP-based applications and - plugins such as the Print plugin. On some systems, you will also - need to install gtk-devel and glib-devel packages as well. - - If you have installed the GIMP from source on Linux: after running - make install, you must run ldconfig as root before attempting to - build this plugin. - - 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.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 Gutenprint may be used as a driver under CUPS (Common UNIX @@ -150,8 +96,9 @@ CUPS above; that release of CUPS fixes some important bugs. This package includes a CUPS driver that may be built, allowing - use of this software for general printing purposes. To build and - install the CUPS driver, you must run: + use of this software for general printing purposes. Gutenprint + will normally detect the presence of CUPS; if it doesn't on your + system, you must run: ./configure --with-cups make @@ -199,11 +146,11 @@ CUPS 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 + work with driver version 5.0.0-rc2. 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) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(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 @@ -239,15 +186,15 @@ 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-rc1(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-rc2(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en) rather than this: - 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) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(sv) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(fr) you may wish to turn off the translation of PPD files: @@ -277,6 +224,56 @@ E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/u and installing CUPS. +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 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: + + ./configure [--with-gimp] + make + make install + + 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 + to be explicit about building the GIMP Print plugin; --with-gimp + is implied if `configure' detects that the GIMP is installed, so + you do not actually need to specify it. + + This installs the GIMP Print plugin in your system plug-in + directory. If you wish to install it in your personal plugin + directory, you may use + + ./configure --enable-user-install + + If you have installed the GIMP as a precompiled package + (e. g. from an RPM), you will need to install the gimp-devel + (sometimes called gimp-developer, or something similar) package as + well as the gimp package. The GIMP package as supplied in most + distributions only contains what's needed to run the GIMP, not the + additional files needed to build GIMP-based applications and + plugins such as the Print plugin. On some systems, you will also + need to install gtk-devel and glib-devel packages as well. + + If you have installed the GIMP from source on Linux: after running + make install, you must run ldconfig as root before attempting to + build this plugin. + + 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.x plugin may eventually be migrated to The GIMP project + for a future GIMP release. It may be removed from the Gutenprint + distribution in Gutenprint 5.1. + + FOOMATIC Gutenprint includes support for the Foomatic meta-driver package. @@ -294,9 +291,9 @@ FOOMATIC the release version of Gutenprint in its name. Therefore, the Foomatic name for this driver is "gutenprint-ijs.5.0". - Foomatic data generation has been fixed as of Gutenprint - 5.0.0-beta4, and is now an appropriate solution for queue - configuration. + Foomatic data generation works correctly as of Gutenprint + 5.0.0-beta4 and later releases, and is now an appropriate solution + for queue configuration. To verify that you have an appropriate version of Foomatic, please run @@ -392,12 +389,13 @@ GHOSTSCRIPT are very complex and are subject to change, and the older printer configuration tools (such as apsfilter and magicfilter) do not provide a convenient interface to the driver's capabilities. We - no longer provide documentation on manual use of this driver. + no longer provide documentation on direct use of this driver + without the Foomatic front end. Gutenprint 5.0 no longer provides the monolithic "stp" driver - present in 4.2. This driver, which was linked directly into - Ghostscript, was very difficult to maintain and required a complex - integration procedure. + present in Gimp-Print 4.2. This driver, which was compiled and + linked directly into Ghostscript, was very difficult to maintain + and required a complex integration procedure. RECOMMENDED SETTINGS diff --git a/aclocal.m4 b/aclocal.m4 index 111d141..a88e781 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -405,7 +405,7 @@ main () # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL +# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -555,6 +555,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -574,10 +575,10 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -625,6 +626,9 @@ AC_DEFUN([_LT_AC_SYS_COMPILER], # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER @@ -653,7 +657,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` AC_DEFUN([_LT_COMPILER_BOILERPLATE], [ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -666,7 +670,7 @@ $rm conftest* AC_DEFUN([_LT_LINKER_BOILERPLATE], [ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE @@ -972,6 +976,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -1014,9 +1034,9 @@ AC_CACHE_CHECK([$1], [$2], 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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -1047,8 +1067,8 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi @@ -1123,6 +1143,12 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1136,6 +1162,17 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) # 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 @@ -1167,7 +1204,7 @@ fi # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -1175,7 +1212,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN], # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -1241,6 +1278,8 @@ int main () else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] @@ -1251,7 +1290,7 @@ EOF case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -1263,7 +1302,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -1334,7 +1373,7 @@ else test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -1347,7 +1386,7 @@ else ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -1407,9 +1446,9 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1794,10 +1833,15 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -1857,6 +1901,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1990,6 +2046,7 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -2033,13 +2090,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -2065,7 +2115,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2098,6 +2148,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2111,6 +2184,11 @@ uts4*) esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -2135,6 +2213,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -2263,7 +2344,7 @@ AC_ARG_ENABLE([shared], # AC_DISABLE_SHARED # ----------------- -#- set the default shared flag to --disable-shared +# set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -2571,7 +2652,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in darwin*) if test "$GCC" = yes; then - reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -2671,6 +2752,11 @@ hpux10.20* | hpux11*) esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -2716,15 +2802,11 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -2745,10 +2827,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -2768,36 +2853,43 @@ AC_DEFUN([AC_PROG_NM], # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -2903,7 +2995,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX # _LT_AC_PROG_CXXCPP -# --------------- +# ------------------ AC_DEFUN([_LT_AC_PROG_CXXCPP], [ AC_REQUIRE([AC_PROG_CXX]) @@ -2952,7 +3044,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -2989,37 +3081,6 @@ _LT_AC_SYS_COMPILER _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -fi -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - - AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) @@ -3028,9 +3089,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) +AC_LIBTOOL_DLOPEN_SELF -# Report which librarie types wil actually be built +# Report which library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -3089,6 +3150,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -3116,7 +3178,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -3135,12 +3197,12 @@ lt_save_path_LD=$lt_cv_path_LD if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -3235,6 +3297,7 @@ case $host_os in ;; esac done + ;; esac exp_sym_flag='-bexport' @@ -3272,6 +3335,7 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -3303,12 +3367,12 @@ case $host_os in _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -3317,16 +3381,26 @@ case $host_os in # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + chorus*) case $cc_basename in *) @@ -3336,7 +3410,6 @@ case $host_os in esac ;; - cygwin* | mingw* | pw32*) # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. @@ -3346,7 +3419,7 @@ case $host_os in _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -3355,7 +3428,7 @@ case $host_os in echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi @@ -3492,34 +3565,23 @@ case $host_os in ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi case $host_cpu in - hppa*64*) + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, @@ -3535,8 +3597,11 @@ case $host_os in ;; aCC*) case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -3556,8 +3621,11 @@ case $host_os in if test "$GXX" = yes; then if test $with_gnu_ld = no; then case $host_cpu in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -3571,6 +3639,20 @@ case $host_os in ;; esac ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; irix5* | irix6*) case $cc_basename in CC*) @@ -3853,19 +3935,6 @@ case $host_os in # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; sunos4*) case $cc_basename in CC*) @@ -3958,8 +4027,59 @@ case $host_os in ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in @@ -3996,8 +4116,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -4015,7 +4133,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ +# ------------------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -4148,6 +4266,14 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_AC_TAGVAR(predep_objects,$1)= + _LT_AC_TAGVAR(postdep_objects,$1)= + _LT_AC_TAGVAR(postdeps,$1)= + ;; + solaris*) case $cc_basename in CC*) @@ -4157,6 +4283,7 @@ solaris*) _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' ;; esac + ;; esac ]) @@ -4166,7 +4293,7 @@ esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ +# -------------------------- # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -4250,8 +4377,6 @@ AC_MSG_CHECKING([whether to build static libraries]) test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -4261,8 +4386,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP - AC_LIBTOOL_CONFIG($1) @@ -4319,8 +4442,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -4330,7 +4451,7 @@ CC="$lt_save_CC" # AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- +# ------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -4393,7 +4514,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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -4562,6 +4683,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -4935,9 +5059,18 @@ irix* | nonstopux*) osf*) symcode='[[BCDEGQRST]]' ;; -solaris* | sysv5*) +solaris*) symcode='[[BDRT]]' ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; sysv4) symcode='[[DFNSTU]]' ;; @@ -5120,6 +5253,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -5189,14 +5326,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) case $cc_basename in CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -5210,6 +5347,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in CC*) @@ -5289,15 +5430,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; psos*) ;; - sco*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in CC*) @@ -5339,7 +5471,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -5386,6 +5525,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -5500,11 +5644,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' - ;; - solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5522,7 +5661,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5535,6 +5674,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + unicos*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no @@ -5576,6 +5721,16 @@ case $host_os in _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -5602,6 +5757,9 @@ ifelse([$1],[CXX],[ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; + kfreebsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; linux*) _LT_AC_TAGVAR(link_all_deplibs, $1)=no ;; @@ -5657,6 +5815,10 @@ ifelse([$1],[CXX],[ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -5741,7 +5903,7 @@ EOF _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -5750,12 +5912,27 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= @@ -5798,7 +5975,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <&2 @@ -5819,6 +5996,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -5852,7 +6056,7 @@ EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5886,6 +6090,7 @@ EOF break fi done + ;; esac exp_sym_flag='-bexport' @@ -5923,6 +6128,7 @@ EOF _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -5935,11 +6141,11 @@ EOF # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -5953,12 +6159,12 @@ EOF # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -5967,13 +6173,11 @@ EOF # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -6091,11 +6295,20 @@ EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # GNU/kFreeBSD uses gcc -shared to do shared libraries. + kfreebsd*-gnu) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(link_all_deplibs, $1)=no ;; hpux9*) @@ -6114,47 +6327,62 @@ EOF _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in - hppa*64*|ia64*) + hppa*64*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -6256,14 +6484,6 @@ EOF _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then @@ -6349,36 +6569,45 @@ EOF fi ;; - sysv4.2uw2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -6396,11 +6625,6 @@ EOF AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -6428,6 +6652,7 @@ x|xyes) libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= diff --git a/config.h.in b/config.h.in index 9a4e967..3a828c9 100644 --- a/config.h.in +++ b/config.h.in @@ -29,6 +29,14 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if GCC special attributes are supported */ +#undef HAVE_GCC_ATTRIBUTES + +#ifndef HAVE_GCC_ATTRIBUTES +/* This should really be a C99 anonymous variadic macro. */ +#define __attribute__(attr) +#endif + /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H diff --git a/configure b/configure index a97e889..e703ef5 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.131 . +# From configure.ac Revision: 1.133 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc2. # @@ -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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX 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 gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA' ac_subst_files='' # Initialize some variables set by options. @@ -3461,7 +3461,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in darwin*) if test "$GCC" = yes; then - reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -3477,36 +3477,43 @@ else # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -3614,6 +3621,11 @@ hpux10.20* | hpux11*) esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -3659,15 +3671,11 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -3688,10 +3696,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -3709,6 +3720,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -3744,7 +3758,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3747 "configure"' > conftest.$ac_ext + echo '#line 3761 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3899,6 +3913,26 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac @@ -5206,7 +5240,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5209:" \ +echo "$as_me:5243:" \ "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 @@ -5407,6 +5441,12 @@ else lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5420,6 +5460,17 @@ else esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) # 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 @@ -5505,9 +5556,18 @@ irix* | nonstopux*) osf*) symcode='[BCDEGQRST]' ;; -solaris* | sysv5*) +solaris*) symcode='[BDRT]' ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; sysv4) symcode='[DFNSTU]' ;; @@ -5973,6 +6033,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -5992,10 +6053,10 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -6194,6 +6255,9 @@ lt_simple_link_test_code='int main(){return(0);}\n' # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -6201,82 +6265,17 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* -# -# Check for any special shared library compilation flags. -# -lt_prog_cc_shlib= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - lt_prog_cc_shlib='-belf' - ;; - esac -fi -if test -n "$lt_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_prog_compiler_static" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes - fi - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - lt_prog_compiler_no_builtin_flag= @@ -6302,17 +6301,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6305: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6304: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6309: \$? = $ac_status" >&5 + echo "$as_me:6308: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -6373,6 +6372,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -6487,11 +6491,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic='-Kpic' - lt_prog_compiler_static='-dn' - ;; - solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -6509,7 +6508,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -6522,6 +6521,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + unicos*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_can_build_shared=no @@ -6564,17 +6569,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6567: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6572: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6571: \$? = $ac_status" >&5 + echo "$as_me:6576: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works=yes fi fi @@ -6605,6 +6610,48 @@ case $host_os in ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works=yes + fi + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o+set}" = set; then @@ -6626,18 +6673,18 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6629: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6676: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6633: \$? = $ac_status" >&5 + echo "$as_me:6680: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi @@ -6737,6 +6784,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -6821,7 +6872,7 @@ EOF export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -6830,12 +6881,27 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; + interix3*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= @@ -6878,7 +6944,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 @@ -6899,6 +6965,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -6932,7 +7025,7 @@ EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -6966,6 +7059,7 @@ EOF break fi done + ;; esac exp_sym_flag='-bexport' @@ -7003,6 +7097,7 @@ EOF hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -7015,11 +7110,11 @@ EOF # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -7083,12 +7178,12 @@ rm -f conftest.err conftest.$ac_objext \ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -7147,13 +7242,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec=' ' + whole_archive_flag_spec='$convenience' archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -7271,13 +7364,22 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; + # GNU/kFreeBSD uses gcc -shared to do shared libraries. + kfreebsd*-gnu) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + link_all_deplibs=no + ;; + hpux9*) if test "$GCC" = yes; then archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -7294,47 +7396,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in - hppa*64*|ia64*) + hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in - hppa*64*|ia64*) - archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=no hardcode_shlibpath_var=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes ;; *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -7436,14 +7553,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator=: ;; - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then @@ -7529,36 +7638,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no ;; - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -7577,11 +7695,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -7614,6 +7727,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -7895,10 +8009,15 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -7958,6 +8077,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -8091,6 +8222,7 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -8134,13 +8266,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -8166,7 +8291,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -8199,6 +8324,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -8214,6 +8362,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= @@ -8862,7 +9015,7 @@ fi test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8878,7 +9031,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then @@ -8976,7 +9131,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&6 fi -# Report which librarie types wil actually be built +# Report which library types will actually be built echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -9130,7 +9287,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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -9296,6 +9453,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -9626,6 +9786,9 @@ echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -9678,6 +9841,7 @@ hardcode_libdir_flag_spec_CXX= hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -9705,13 +9869,16 @@ objext_CXX=$objext lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -9719,13 +9886,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -9740,12 +9907,12 @@ lt_save_path_LD=$lt_cv_path_LD if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9956,6 +10123,7 @@ case $host_os in ;; esac done + ;; esac exp_sym_flag='-bexport' @@ -9993,6 +10161,7 @@ case $host_os in hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -10074,12 +10243,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -10138,16 +10307,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX=' ' + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + chorus*) case $cc_basename in *) @@ -10157,7 +10336,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - cygwin* | mingw* | pw32*) # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. @@ -10167,7 +10345,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -10176,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -10313,34 +10491,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - hardcode_libdir_separator_CXX=: - ;; - ia64*) - hardcode_libdir_flag_spec_CXX='-L$libdir' ;; *) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi case $host_cpu in - hppa*64*) + hppa*64*|ia64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no ;; - ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; *) hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, @@ -10356,8 +10523,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; aCC*) case $host_cpu in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -10377,8 +10547,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes; then if test $with_gnu_ld = no; then case $host_cpu in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -10392,6 +10565,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; + interix3*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; irix5* | irix6*) case $cc_basename in CC*) @@ -10674,19 +10861,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - sco*) - archive_cmds_need_lc_CXX=no - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; sunos4*) case $cc_basename in CC*) @@ -10779,8 +10953,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in @@ -10915,6 +11140,14 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + solaris*) case $cc_basename in CC*) @@ -10924,6 +11157,7 @@ solaris*) postdeps_CXX='-lCstd -lCrun' ;; esac + ;; esac @@ -10974,6 +11208,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -11043,14 +11281,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -11064,6 +11302,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in CC*) @@ -11143,15 +11385,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; psos*) ;; - sco*) - case $cc_basename in - CC*) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in CC*) @@ -11193,7 +11426,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -11229,17 +11469,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11236: \$? = $ac_status" >&5 + echo "$as_me:11476: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_CXX=yes fi fi @@ -11270,6 +11510,48 @@ case $host_os in ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_CXX=yes + fi + else + lt_prog_compiler_static_works_CXX=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 + +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then @@ -11291,18 +11573,18 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11576: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:11580: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes fi fi @@ -11363,6 +11645,9 @@ 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 '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; + kfreebsd*-gnu) + link_all_deplibs_CXX=no + ;; linux*) link_all_deplibs_CXX=no ;; @@ -11375,11 +11660,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6 test "$ld_shlibs_CXX" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -11412,6 +11692,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -11693,10 +11974,15 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -11756,6 +12042,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -11889,6 +12187,7 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -11932,13 +12231,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -11964,7 +12256,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11997,6 +12289,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12012,6 +12327,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_CXX= @@ -12049,1152 +12369,327 @@ elif test "$shlibpath_overrides_runpath" = yes || enable_fast_install=needless fi -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - 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 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # 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 LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_CXX \ + CC_CXX \ + LD_CXX \ + lt_prog_compiler_wl_CXX \ + lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ + export_dynamic_flag_spec_CXX \ + thread_safe_flag_spec_CXX \ + whole_archive_flag_spec_CXX \ + enable_shared_with_static_runtimes_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + predep_objects_CXX \ + postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ + postuninstall_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ + allow_undefined_flag_CXX \ + no_undefined_flag_CXX \ + export_symbols_cmds_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ + hardcode_automatic_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else + case $var in + old_archive_cmds_CXX | \ + old_archive_from_new_cmds_CXX | \ + archive_cmds_CXX | \ + archive_expsym_cmds_CXX | \ + module_cmds_CXX | \ + module_expsym_cmds_CXX | \ + old_archive_from_expsyms_cmds_CXX | \ + export_symbols_cmds_CXX | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -fi +cfgfile="$ofile" - ;; + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -#ifdef __STDC__ -# include -#else -# include -#endif +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -#undef shl_load +# Whether or not to build static libraries. +build_old_libs=$enable_static -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -ac_cv_func_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# An echo program that does not interpret backslashes. +echo=$lt_echo -#ifdef __STDC__ -# include -#else -# include -#endif +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -#undef dlopen +# A C compiler. +LTCC=$lt_LTCC -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# A language-specific compiler. +CC=$lt_compiler_CXX -ac_cv_func_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# An ERE matcher. +EGREP=$lt_EGREP -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# The linker used to build libraries. +LD=$lt_LD_CXX -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Whether we need hard or soft links. +LN_S=$lt_LN_S -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# A BSD-compatible nm program. +NM=$lt_NM -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi +# A symbol stripping program +STRIP=$lt_STRIP +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -fi +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -fi +# Used on cygwin: assembler. +AS="$AS" +# The name of the directory that contains temporary libtool files. +objdir=$objdir -fi +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX -fi +# Object file suffix (normally "o"). +objext="$ac_objext" +# Old archive suffix (normally "a"). +libext="$libext" -fi +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' - ;; - esac +# Executable file suffix (normally ""). +exeext="$exeext" - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +# Must we lock files when doing compilation? +need_locks=$lt_need_locks - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif +# Do we need a version for libraries? +need_version=$need_version -#include +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +# Library versioning type. +version_type=$version_type - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif +# Format of library name prefix. +libname_spec=$lt_libname_spec -#include +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_CXX +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_CXX - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_CXX - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_CXX - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_CXX +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # 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 \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX -cfgfile="$ofile" +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Whether or not to build static libraries. -build_old_libs=$enable_static +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var +# This is the shared library runtime path variable. +runpath_var=$runpath_var # This is the shared library path variable. shlibpath_var=$shlibpath_var @@ -13351,6 +12846,9 @@ lt_simple_link_test_code=" program t\n end\n" # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -13358,13 +12856,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -13420,8 +12918,6 @@ test "$enable_shared" = yes || enable_static=yes echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 -test "$ld_shlibs_F77" = no && can_build_shared=no - GCC_F77="$G77" LD_F77="$LD" @@ -13468,6 +12964,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_F77='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -13582,11 +13083,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_F77='-Kpic' - lt_prog_compiler_static_F77='-dn' - ;; - solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13604,7 +13100,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13617,6 +13113,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + unicos*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_can_build_shared_F77=no @@ -13659,17 +13161,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13662: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13164: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13666: \$? = $ac_status" >&5 + echo "$as_me:13168: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_F77=yes fi fi @@ -13700,6 +13202,48 @@ case $host_os in ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_F77=yes + fi + else + lt_prog_compiler_static_works_F77=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 + +if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then @@ -13721,18 +13265,18 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13268: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13728: \$? = $ac_status" >&5 + echo "$as_me:13272: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_F77=yes fi fi @@ -13832,6 +13376,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -13916,7 +13464,7 @@ EOF export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -13925,14 +13473,29 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_F77=no fi ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + interix3*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -13973,7 +13536,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <&2 @@ -13994,6 +13557,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -14027,7 +13617,7 @@ EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -14061,6 +13651,7 @@ EOF break fi done + ;; esac exp_sym_flag='-bexport' @@ -14098,6 +13689,7 @@ EOF hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -14110,11 +13702,11 @@ EOF # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -14168,12 +13760,12 @@ rm -f conftest.err conftest.$ac_objext \ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -14222,13 +13814,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77=' ' + whole_archive_flag_spec_F77='$convenience' archive_cmds_need_lc_F77=yes # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -14346,11 +13936,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + # GNU/kFreeBSD uses gcc -shared to do shared libraries. + kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no + link_all_deplibs_F77=no ;; hpux9*) @@ -14369,47 +13968,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; + + hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in - hppa*64*|ia64*) + hppa*64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in - hppa*64*|ia64*) - archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + hppa*64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - ia64*) - hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_direct_F77=no hardcode_shlibpath_var_F77=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes ;; *) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -14511,14 +14125,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_F77=: ;; - sco3.2v5*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then @@ -14604,36 +14210,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no ;; - sysv5*) - no_undefined_flag_F77=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_F77= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_F77='${wl}-z,text' + allow_undefined_flag_F77='${wl}-z,nodefs' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -14652,11 +14267,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 echo "${ECHO_T}$ld_shlibs_F77" >&6 test "$ld_shlibs_F77" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -14689,6 +14299,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 + pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -14970,10 +14581,15 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -15033,6 +14649,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -15166,6 +14794,7 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -15209,13 +14838,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -15241,7 +14863,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15274,6 +14896,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15289,6 +14934,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_F77= @@ -15326,36 +14976,6 @@ elif test "$shlibpath_overrides_runpath" = yes || enable_fast_install=needless fi -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - 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 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -15370,7 +14990,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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -15488,6 +15108,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -15798,6 +15421,9 @@ lt_simple_link_test_code='public class conftest { public static void main(String # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -15805,13 +15431,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -15862,17 +15488,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15865: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15491: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15869: \$? = $ac_status" >&5 + echo "$as_me:15495: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -15933,6 +15559,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_GCJ='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -16047,11 +15678,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_GCJ='-Kpic' - lt_prog_compiler_static_GCJ='-dn' - ;; - solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16069,7 +15695,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16082,6 +15708,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + unicos*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_can_build_shared_GCJ=no @@ -16124,17 +15756,17 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16127: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15759: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16131: \$? = $ac_status" >&5 + echo "$as_me:15763: \$? = $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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_GCJ=yes fi fi @@ -16165,6 +15797,48 @@ case $host_os in ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_GCJ=yes + fi + else + lt_prog_compiler_static_works_GCJ=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 + +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then @@ -16186,18 +15860,18 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16189: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15863: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16193: \$? = $ac_status" >&5 + echo "$as_me:15867: \$? = $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 # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi @@ -16297,6 +15971,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -16381,7 +16059,7 @@ EOF export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -16390,12 +16068,27 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_GCJ=no fi ;; + interix3*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= @@ -16438,7 +16131,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <&2 @@ -16459,6 +16152,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -16492,7 +16212,7 @@ EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -16526,6 +16246,7 @@ EOF break fi done + ;; esac exp_sym_flag='-bexport' @@ -16563,6 +16284,7 @@ EOF hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi + ;; esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then @@ -16575,11 +16297,11 @@ EOF # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -16643,12 +16365,12 @@ rm -f conftest.err conftest.$ac_objext \ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -16707,13 +16429,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ=' ' + whole_archive_flag_spec_GCJ='$convenience' archive_cmds_need_lc_GCJ=yes # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -16831,11 +16551,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + # GNU/kFreeBSD uses gcc -shared to do shared libraries. + kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no + link_all_deplibs_GCJ=no ;; hpux9*) @@ -16854,49 +16583,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; + + hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in - hppa*64*|ia64*) + hppa*64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in - hppa*64*|ia64*) - archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + hppa*64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no ;; - ia64*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; - *) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' + *) + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -16996,14 +16740,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_GCJ=: ;; - sco3.2v5*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then @@ -17089,36 +16825,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no ;; - sysv5*) - no_undefined_flag_GCJ=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_GCJ= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_GCJ='${wl}-z,text' + allow_undefined_flag_GCJ='${wl}-z,nodefs' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -17137,11 +16882,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 echo "${ECHO_T}$ld_shlibs_GCJ" >&6 test "$ld_shlibs_GCJ" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -17174,6 +16914,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ + pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -17296,1347 +17037,558 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - 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`' - # 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"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -kfreebsd*-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='GNU ld.so' - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - *) # from 3.2 on - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -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 - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux*) - 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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - 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 - 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='GNU ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - 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=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - 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=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux - 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 - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -uts4*) - version_type=linux - 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 - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 -test "$dynamic_linker" = no && can_build_shared=no - -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - 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 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -fi +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes -fi + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -fi +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + 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`' + # 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"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; +freebsd1*) + dynamic_linker=no + ;; -fi +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; +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 + hardcode_into_libs=yes + ;; -fi +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac ;; esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi -#ifdef __cplusplus -extern "C" void exit (int); -#endif + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +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' + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +knetbsd*-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='GNU ld.so' + ;; - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif +nto-qnx*) + 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=yes + ;; -#include +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -#ifdef __cplusplus -extern "C" void exit (int); -#endif +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; esac - else : - # compilation failed - lt_cv_dlopen_self_static=no fi -fi -rm -fr conftest* + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi @@ -18653,7 +17605,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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18771,6 +17723,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -19080,6 +18035,9 @@ lt_simple_link_test_code="$lt_simple_compile_test_code" # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -19087,13 +18045,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -19128,7 +18086,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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -19246,6 +18204,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -25842,6 +24803,68 @@ fi +echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5 +echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +typedef struct __attribute__((__packed__)) { + unsigned char foo; + char bar; + long baz; +} test_struct_t; +int +main () +{ +test_struct_t mystruct; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + 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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE_GCC_ATTRIBUTES 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + + + + + if test "$USE_READLINE" = yes ; then if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then unset ac_cv_lib_readline_readline @@ -31254,7 +30277,7 @@ cat >>confdefs.h <<_ACEOF #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL} _ACEOF -RELEASE_DATE="22 Nov 2005" +RELEASE_DATE="22 Jan 2006" cat >>confdefs.h <<_ACEOF #define RELEASE_DATE "${RELEASE_DATE}" @@ -31301,9 +30324,11 @@ RM='rm' gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" + gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}" + gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" @@ -31311,6 +30336,7 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" + ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files doc/Makefile" @@ -32412,10 +31438,13 @@ s,@GUTENPRINTUI2_LIBDEPS@,$GUTENPRINTUI2_LIBDEPS,;t t s,@GUTENPRINTUI2_VERSION@,$GUTENPRINTUI2_VERSION,;t t s,@gutenprint_cflags@,$gutenprint_cflags,;t t s,@gutenprint_libs@,$gutenprint_libs,;t t +s,@gutenprint_libdeps@,$gutenprint_libdeps,;t t s,@gutenprintui_cflags@,$gutenprintui_cflags,;t t s,@gutenprintui_libs@,$gutenprintui_libs,;t t +s,@gutenprintui_libdeps@,$gutenprintui_libdeps,;t t s,@gutenprintui2_cflags@,$gutenprintui2_cflags,;t t s,@gutenprintui2_libs@,$gutenprintui2_libs,;t t +s,@gutenprintui2_libdeps@,$gutenprintui2_libdeps,;t t s,@LIBREADLINE_DEPS@,$LIBREADLINE_DEPS,;t t s,@MAINTAINER_CFLAGS@,$MAINTAINER_CFLAGS,;t t s,@PLUG_IN_PATH@,$PLUG_IN_PATH,;t t diff --git a/configure.ac b/configure.ac index 80b8ebb..ec1d2ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 1.131 2005/11/21 11:16:22 rleigh Exp $ +dnl $Id: configure.ac,v 1.133 2006/01/13 16:09:14 rleigh 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.131 $) +AC_REVISION($Revision: 1.133 $) AC_CONFIG_SRCDIR(src/main/print-vars.c) AC_CONFIG_AUX_DIR(scripts) STP_INIT @@ -618,6 +618,25 @@ if test x$ENABLE_PROFILE = xyes ; then fi AC_SUBST(GNUCFLAGS) +AH_TEMPLATE([HAVE_GCC_ATTRIBUTES], + [Define to 1 if GCC special attributes are supported]) +AC_MSG_CHECKING([if $CC supports __attribute__ syntax]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef struct __attribute__((__packed__)) { + unsigned char foo; + char bar; + long baz; +} test_struct_t;], + [test_struct_t mystruct;])], + [AC_MSG_RESULT([yes])] + AC_DEFINE([HAVE_GCC_ATTRIBUTES], 1), + [AC_MSG_RESULT([no])]) + +AH_VERBATIM([HAVE_GCC_ATTRIBUTES_BOILERPLATE], +[#ifndef HAVE_GCC_ATTRIBUTES +/* This should really be a C99 anonymous variadic macro. */ +#define __attribute__(attr) +#endif]) + dnl Checks for libraries. dnl When checking readline, check using extra libraries first. dnl We want to protect against the link somehow succeeding, but only @@ -899,12 +918,15 @@ AC_SUBST(GUTENPRINTUI2_VERSION) AC_SUBST(gutenprint_cflags) gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" AC_SUBST(gutenprint_libs) +AC_SUBST(gutenprint_libdeps) AC_SUBST(gutenprintui_cflags) gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}" AC_SUBST(gutenprintui_libs) +AC_SUBST(gutenprintui_libdeps) AC_SUBST(gutenprintui2_cflags) gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" AC_SUBST(gutenprintui2_libs) +AC_SUBST(gutenprintui2_libdeps) AC_SUBST(LIBREADLINE_DEPS) AC_SUBST(MAINTAINER_CFLAGS) AC_SUBST(PLUG_IN_PATH) diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index cc24b31..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,23 +0,0 @@ -Gutenprint for Debian ---------------------- - -This is Gutenprint version 5.0.0-rc1, a beta release in the 5.0 -series. Gutenprint is the print facility for the GIMP, and in -addition a suite of drivers that may be used with common UNIX spooling -systems using Ghostscript or CUPS. These drivers provide printing -quality for UNIX/Linux on a par with proprietary vendor-supplied -drivers in many cases, and can be used for many of the most demanding -printing tasks. - -A complete list of supported printers may be found in the NEWS file. -On Debian GNU/Linux, the NEWS file is called `changelog.gz'. - -Documentation can be found in the gutenprint-doc package, which covers -the use of libgutenprint-based programs, and the libgutenprint-doc -package, which covers developing programs using libgutenprint. - -Gutenprint was previously known as Gimp-Print. The name was changed -for the 5.0 release. - - - -- Roger Leigh , Tue, 02 Aug 2005 19:30:56 +0100 diff --git a/debian/README.building b/debian/README.building deleted file mode 100644 index c0cad80..0000000 --- a/debian/README.building +++ /dev/null @@ -1,78 +0,0 @@ -Building the gutenprint Debian packages -*- mode: text -*- -======================================= - - -Prerequisites -------------- - -The packages that must be installed to build the gutenprint packages -are listed in the Build-Depends field of the control file -debian/control[.in]. However, these are the prerequisites to build -the Debianised source. Other packages may be needed if building -directly from CVS; it is less likely other tools will be needed if -building from a distributed tarball. Other tools that might -potentially be needed are the latest versions of gettext, texi2html, -docbook-utils and imagemagick. build-essential and devscripts should -also be installed in order to build Debian packages. - -# apt-get build-dep gutenprint - -should do this automatically, if the gutenprint sources are available -in your APT sources.list. - - -Getting the source ------------------- - -Since 5.0.0 (and its prereleases), building from upstream CVS or -the release tarball is no longer supported (and in fact, not even -possible). The Debian packaging is only provided in the Debian -diff. - -To get the source, run - -$ apt-get source gutenprint - -or download it from your nearest Debian mirror. - - -Making changes --------------- - -If needed, modify debian/changelog to change the version -numbering. The version number should be the same as the package -version number, followed by a hyphen and a Debian package revision -number e.g. 4.2.0-1 for release 4.2.0, Debian revision 1. Run - -$ debian/rules debian/control - -after changing the version number, to ensure the control file is -up-to-date. - - -If any source changes are required, please use dpatch, and place -the patch under debian/patches. Once you have created a diff, -create a dpatch as follows: - -dpatch patch-template -p '0n_patch_name' "Patch description" \ -< mypatch.diff > debian/patches/0n_patch_name.dpatch - -and add "0n_patch_name.dpatch" to debian/patches/00list - - -Building --------- - -To build the packages: - -$ dpkg-buildpackage -rfakeroot -us -uc -or -$ debuild -us -uc -L -i - -It should build without problems on Debian 3.1 (sarge) and unstable, -but will no longer build on Debian 3.0 (woody) and earlier distributions. - - -I hope you like it! - -Roger Leigh -- Sun, 14 Aug 2005 13:11:35 +0100 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 69a8843..0000000 --- a/debian/changelog +++ /dev/null @@ -1,670 +0,0 @@ -gutenprint (4.3.99+cvs20051122-1) experimental; urgency=low - - * New upstream CVS snapshot (Closes: #340155). - * The GFDL licensed user's guide has been removed from the - upstream tarball to create a DFSG-free .orig.tar.gz. - * Several Epson Stylus Photo printers have been retuned since the - last version (Closes: #335789). - * The Epson Stylus C88 is now supported (Closes: #338961). - * debian/control.in: - - Improve the ijsgutenprint package description (Closes: #337845). - - Remove 'Suggests: gutenprint-doc (>= ${Source-Version})' from - gimp-print and cupsys-driver-gutenprint. - - Remove the gutenprint-doc package, which was GFDL licensed. - The control data is kept in debian/control.gfdl. - - -- Roger Leigh Tue, 22 Nov 2005 15:00:23 +0000 - -gutenprint (4.3.99+cvs20050901-1) unstable; urgency=low - - * New upstream release candidate. - * Drop patches which have been incorporated upstream: - - 01_cups_genppdupdate_filename_metacharacters.dpatch - - 02_escp2_r800_papers.dpatch - - 03_escp2_colour_adjust_segfault.dpatch - - 04_print_settings_corruption.dpatch - * debian/control: - - cupsys-driver-gutenprint: Drop libperlmenu-perl dependency. - - gimp-print: Add an "Enhances: gimp" to reinforce the fact this is a - useful part of gimp (Closes: #322066). This does not entirely fix the - upgrade issues, but without a strict dependency in gimp (which the - author does not want), this is the best that can be done. - * src/cups/cups-genppdconfig.in: Remove support for perlmenu in favour - of dialog(1). This prevents a number of warnings on startup, and also - removes a lot of dead code (Closes: #323450). Applied as - 05_genppdconfig_remove_perlmenu.dpatch. - - -- Roger Leigh Sat, 3 Sep 2005 20:46:06 +0100 - -gutenprint (4.3.99+cvs20050813-2) unstable; urgency=low - - * src/main/print-canon.c: Change "Plain PIXMA" paper name to - "PlainPIXMA" in order to avoid illegal whitespace in - generated PPD files (Closes: #322397). - - -- Roger Leigh Wed, 31 Aug 2005 21:16:10 +0100 - -gutenprint (4.3.99+cvs20050813-1) unstable; urgency=low - - * New upstream release candidate. - * src/cups/cups-genppdconfig.in: drop Locale::gettext patch, - which is now incorporated upstream. - * debian/control.in, debian/rules: Use dpatch. - * Added cups-genppdupdate patch as - 01_cups_genppdupdate_filename_metacharacters.dpatch - * Don't segfault when using certain paper types with an Epson R800. - Applied patch from Dan Torop as 02_escp2_r800_papers.dpatch - and 03_escp2_colour_adjust_segfault.dpatch (Closes: #321603). - * Don't corrupt print settings under certain conditions, due to - using uninitialised global variables. Applied patch from upstream - based on a patch contributed by Dan Torop as - 04_print_settings_corruption.dpatch (Closes: #321599). - * debian/debian/cupsys-driver-gutenprint.postinst: Remove bashisms. - - -- Roger Leigh Sun, 14 Aug 2005 22:20:52 +0100 - -gutenprint (4.3.99+cvs20050801-1) unstable; urgency=low - - * New upstream release candidate. - * src/cups/cups-genppdconfig.in: Remove "use Locale::gettext" to - drop missing dependency on liblocale-gettext-perl - (Closes: #320745). - - -- Roger Leigh Tue, 2 Aug 2005 21:06:08 +0100 - -gutenprint (4.3.99+cvs20050715-4) unstable; urgency=low - - * debian/rules: Correct the names of the ijsgutenprint - symlinks. - - -- Roger Leigh Thu, 28 Jul 2005 23:19:35 +0100 - -gutenprint (4.3.99+cvs20050715-3) unstable; urgency=low - - * src/cups/cups-genppdupdate.in: Apply patch to handle shell - metacharacters in PPD filenames, to fix a regression from - cupsys-driver-gimpprint (Closes: #319109). - * debian/control.in: Add foomatic-db-gimp-print as a - transitional package to ease upgrades. - * debian/rules: ijsgutenprint symlinks should not be relative - to the build directory (Closes: #319416). - - -- Roger Leigh Thu, 28 Jul 2005 21:14:31 +0100 - -gutenprint (4.3.99+cvs20050715-2) unstable; urgency=low - - * debian/control.in: - - ijsgimpprint depends on ijsgutenprint, not - cupsys-driver-gutenprint (Closes: #318911). - - ijsgimpprint is in section text, not graphics - (correction of override disparity). - - -- Roger Leigh Mon, 18 Jul 2005 18:39:47 +0100 - -gutenprint (4.3.99+cvs20050715-1) unstable; urgency=low - - * New upstream release candidate. - * debian/control.in: Change Maintainer to Debian Printing Group - . - * debian/rules: Don't build translated PPDs. They may be generated - after installation by the user. - - -- Roger Leigh Sat, 16 Jul 2005 22:45:28 +0100 - -gutenprint (4.3.99+cvs20050702-1) experimental; urgency=low - - * New upstream release candidate (Closes: #293890). - * Renamed package to gutenprint. The following packages were - renamed in consequence: - - cupsys-driver-gimpprint renamed to cupsys-driver-gutenprint - - foomatic-db-gimp-print renamed to foomatic-db-gutenprint - - gimpprint-doc renamed to gutenprint-doc - - gimpprint-locales renamed to gutenprint-locales - - ijsgimpprint renamed to ijsgutenprint - - libgimpprint renamed to libgutenprint - - libgimpprint-dev renamed to libgutenprint-dev - - libgimpprint-doc renamed to libgutenprint-doc - * New packages: - - libgimpprintui1-1 (GTK+ 1.2 UI library) - - libgimpprintui1-dev (GTK+ 1.2 UI library headers) - - libgimpprintui2-1 (GTK+ 2.0 UI library) - - libgimpprintui2-dev (GTK+ 2.0 UI library headers) - * Upgrade to Standards-Version 3.6.2 - * Build-Depends: - - replace libreadline4-dev with libreadline5-dev - - add libcupsimage2-dev - - remove libtool - * debian/rules: add LIBRARYUI_VERSION, required to support - separate sonames for libgutenprint and libgutenprintui*. - * cupsys-driver-gutenprint: - - add cups-genppdupdate - - generates the PPDs in postinst, and removes them in prerm - - use new versioned CUPS executables - * libgutenprint: add modules and XML data. - * libgutenprint-doc: - - fix documentation installation for new API reference and - developer's reference. - - distribute gutenprint.pdf; gutenprint.ps is no longer created. - * Remove old and outdated manual pages. - * Provide versioned ijsgutenprint manual page, and unversioned - symlinks for the binary and manpage. - * Create a dummy cupsys-driver-gimpprint package to enable - upgrades from stable. - * Create a dummy ijsgimpprint package to enable upgrades from stable. - * Remove symlinks in debian directory. - * Don't autogenerate files in debian directory for anything but the - libgutenprintui package. - - -- Roger Leigh Sat, 2 Jul 2005 10:12:46 +0100 - -gimp-print (4.2.7-10) unstable; urgency=high - - * cupsys-driver-gimpprint: Depend on a perl >= 5.8.0, otherwise - upgrades from woody may fail due to /usr/bin/cups-genppdupdate - using features only available in perl 5.8 (Closes: #307286). - * Build-Depend on libreadline5-dev, rather than the old - libreadline4-dev. - - -- Roger Leigh Mon, 2 May 2005 14:58:39 +0100 - -gimp-print (4.2.7-9) unstable; urgency=low - - * debian/cups-genppdupdate: Fix grepping of PPDs to work with PPD - file names with shell metacharacters in them. Patch from Martin - Pitt (Closes: #302434). - - -- Roger Leigh Thu, 31 Mar 2005 22:10:41 +0100 - -gimp-print (4.2.7-8) unstable; urgency=low - - * cupsys-driver-gimpprint: Depend on cupsys >= 1.1.23 to ensure - that /etc/init.d/cupsys supports the force-reload option. - Some older versions of cupsys did not, and this causes - package configuration to fail when restarting cupsys. - (Closes: #300966) - - -- Roger Leigh Wed, 23 Mar 2005 18:06:35 +0000 - -gimp-print (4.2.7-7) unstable; urgency=low - - * debian/control.in: - - Prefer gs-esp as gs interpreter. Patch from Colin Watson. - - Recommend gnome-gv as default postscript-viewer. Patch - from Sebastien Bacher. - - -- Roger Leigh Tue, 22 Mar 2005 00:20:09 +0000 - -gimp-print (4.2.7-6) unstable; urgency=low - - * Allow A4 printing on HP DesignJet printers. Patch from - Klaus Singvogel. - - -- Roger Leigh Sat, 19 Mar 2005 09:58:18 +0000 - -gimp-print (4.2.7-5) unstable; urgency=low - - * Patch src/cups/Makefile.in so that genppd will use the "C" - locale when generating PPDs, not the locale of the build - system. This will prevent wrongly UTF-8 encoded "ISOLatin1" - PPDs being generated (Closes: #293178). - * ijsgimpprint: Conditionally depend upon gs-afpl instead of - gs-aladdin, which it replaces (Closes: #293384). - - -- Roger Leigh Wed, 2 Feb 2005 21:45:16 +0000 - -gimp-print (4.2.7-4) unstable; urgency=low - - * cupsys-driver-gimpprint: Use "force-reload" rather than - "reload" in postinst and postrm (Closes: #274820). Reported - by Martin Pitt. - * Applied GNU/k*BSD patch from Robert Millan (Closes: #263763). - - -- Roger Leigh Tue, 5 Oct 2004 19:46:08 +0100 - -gimp-print (4.2.7-3) unstable; urgency=low - - * foomatic-db-gimp-print: ensure all files are UTF-8 encoded - by building the package in a UTF-8 locale (en_GB.UTF-8). - Thanks to Chris Lawrence for finding this problem. - - -- Roger Leigh Tue, 21 Sep 2004 21:37:38 +0100 - -gimp-print (4.2.7-2) unstable; urgency=medium - - * Medium urgency to facilitate the libtiff transition. - * cupsys-driver-gimpprint: - - Link explicitly with -lcupsimage, rather than - `cups-config --image --libs`. This prevents unnecessary - libpng, libjpeg and libtiff dependencies. The cups-config - logic in configure is overridden. Thanks to Steve Langasek - for this patch (Closes: #262852). - - Backport some PPD generation logic from current Gimp-Print - CVS, and use the new PPD keywords in cups-genppdupdate. - The PPD PCFileName keyword was made compliant with the PPD - standard with version 4.2.6 (read: crippled to an 8.3 DOS - filename) which broke the upgrade script since the full PPD - name could no longer be encoded. The new Gimp-Print specific - keywords *StpDriverName, *StpPPDLocation and *StpLocale have - been added to the PPDs, and this information is now used to - correctly upgrade PPDs (Closes: #260072). - * debian/rules: Don't enable maintainer-mode when running - configure. - - -- Roger Leigh Tue, 3 Aug 2004 19:23:19 +0100 - -gimp-print (4.2.7-1) unstable; urgency=low - - * New upstream stable release. - * Dropped patches for: - - missing strdup prototype in AM_PATH_GIMPPRINT (#233971). - - fixing garbage output when files generated with psnup are - printed (#175970). - - correct margin definitions for Epson Stylus C63, C64, C83 - and C84. - All of these patches have been incorporated into the new - release. - * Update to Standards-Version 3.6.1. - * cupsys-driver-gimpprint: update Recommends to depend upon the - current gs package names, and put the virtual package - postscript-viewer as the last alternative, rather than the - first. - * cupsys-driver-gimpprint: patched src/cups/Makefile.am to - disable linking rastertoprinter with a static libgimpprint. - - -- Roger Leigh Sat, 17 Jul 2004 17:38:35 +0100 - -gimp-print (4.2.6-7) unstable; urgency=high - - * Reupload with high urgency to shorten libcupsys2-gnutls10 - transition waiting time. - - -- Roger Leigh Fri, 9 Jul 2004 11:56:34 +0100 - -gimp-print (4.2.6-6) unstable; urgency=low - - * cupsys-driver-gimpprint-data depends on cupsys-driver-gimpprint. - - -- Roger Leigh Wed, 7 Jul 2004 13:26:51 +0100 - -gimp-print (4.2.6-5) unstable; urgency=medium - - * NMU. - * Rebuild against libcupsys2-gnutls10. - - -- Kenshi Muto Thu, 27 May 2004 16:39:55 +0000 - -gimp-print (4.2.6-4) unstable; urgency=low - - * Split architecture-independent data in cupsys-driver-gimpprint - into a separate arch-all cupsys-driver-gimpprint-data package - which cupsys-driver-gimpprint depends upon (Closes: #233338). - * Add missing strdup prototype in AM_PATH_GIMPPRINT in - gimpprint.m4. This prevents configure scripts using this macro - from segfaulting on ia64 (Closes: #233971). - * Correct margin definitions for Epson Stylus C63, C64, C83 and - C84. This is a temporary fix until the margins have been - correctly computed. - * Build-Depend upon libijs-dev (>= 0.35-1) to ensure that - ijsgimpprint is built against the current libijs - (Closes: #237561). - - -- Roger Leigh Fri, 12 Mar 2004 20:32:51 +0000 - -gimp-print (4.2.6-3) unstable; urgency=low - - * Rebuild against new Foomatic packages. This should hopefully - fix autobuilding problems with older Foomatic releases (which - wouldn't autoconfigure on the buildd). - - -- Roger Leigh Mon, 1 Mar 2004 13:07:07 +0000 - -gimp-print (4.2.6-2) unstable; urgency=low - - * Fix garbage output when files generated with psnup are printed. - The output quality will be degraded, and warnings will be - logged, since the job options have been broken. This is - because psnup generates non-ADSC compliant PostScript which - makes pstops output incorrect job options. Patch from - Martin Kögler (Closes: #175970). - - -- Roger Leigh Tue, 10 Feb 2004 19:39:17 +0000 - -gimp-print (4.2.6-1) unstable; urgency=low - - * New upstream stable release. - * cupsys-driver-gimpprint: cups-genppdupdate should escape - metacharacters in queue names. quotemeta fix from David - Beaumont (Closes: #223081). - * A locale issue which resulted in buggy PostScript output - with some locales has been fixed (Closes: #221662). - * CUPS PPD files moved from /usr/share/cups/model/gimp-print - to /usr/share/cups/model/gimp-print/4.2. This is the - 5.0 naming scheme, and will allow 4.2 and 5.0 to - coexist. cups-genppdupdate uses the new scheme. - - -- Roger Leigh Tue, 13 Jan 2004 23:42:02 +0000 - -gimp-print (4.2.5-6) unstable; urgency=low - - * Change Recommends on gimpprint-locales to Suggests (Closes: #212302). - * cupsys-driver-gimpprint postrm should not reload cupsys if it - has already been removed (Closes: #217295). - - -- Roger Leigh Sun, 26 Oct 2003 23:10:31 +0000 - -gimp-print (4.2.5-5) unstable; urgency=low - - * Clean up package descriptions in debian/control.in. - * Don't depend on essential package gzip. - - -- Roger Leigh Sun, 7 Sep 2003 23:04:56 +0100 - -gimp-print (4.2.5-4) unstable; urgency=low - - * Fix the use of an unintialised value in cups-genppdupdate - (Closes: #193501). - * cups-genppdupdate no longer prints an error when there are no PPD files - available (use Perl glob() instead of shell globbing). - * Update cups-genppdupdate using the latest upstream CVS version. - * Replace cupsys-driver-gimpprint dependency on libcompress-zlib-perl, with - a gzip dependency (gunzip replaces Compress::Zlib in cups-genppdupdate). - * Update for Foomatic 3.0: - - Update foomatic-db-gimp-print description (sync with foomatic-db). - - Build-Depend on foomatic-db-engine (foomatic-bin is deprecated). - - Update foomatic-db-gimp-print dependencies (correctly depend on the - new foomatic packages and conflict with the old packages). - - Run configure with --with-foomatic3 - * Include escputil fix from 4.2.6 prerelease to fix intermittent hanging - reads from printer (Closes: #156228). - * Audit all manual pages to ensure correct use of hyphens and minus signs, - required for copy and paste in a unicode locale (Closes: #203930). - * gimp1.2-print has been removed now the gimp package provides an up-to-date - version of the Print plugin. - * Updated debian/copyright to include the GFDL-licensed User's Guide. - - -- Roger Leigh Mon, 25 Aug 2003 19:12:24 +0100 - -gimp-print (4.2.5-3) unstable; urgency=low - - * Build-Depend on libcupsimage2-dev (Closes: #189093). - * Remove automake, autoconf, libtool, and bison from - Build-Depends, since they are not strictly required. - * Remove docbook-utils, texi2html and imagemagick from Build-Depends, - since the documentation is pre-generated in the upstream tarball. - * Change my maintainer email address to . - * Move libgimpprint1-dev to section libdevel. - - -- Roger Leigh Wed, 23 Apr 2003 12:57:58 +0100 - -gimp-print (4.2.5-2) unstable; urgency=low - - * cupsys-driver-gimpprint: cups-genppdupdate will not die if grep exits with - a nonzero status (for example, there are no Gimp-Print PPDs in use). - (Closes: #179137) - * cupsys-driver-gimpprint: Depend on libcompress-zlib-perl, since dh_perl - doesn't compute module dependencies. - (Closes: #179120, #179170, #179171, #179203) - - -- Roger Leigh Fri, 31 Jan 2003 23:26:51 +0000 - -gimp-print (4.2.5-1) unstable; urgency=low - - * New stable release - * Update for Standards-Version 3.5.7 - * Use debian/build and debian/install instead of debian/gimp-print-build - and debian/gimp-print-install, respectively. - * Use dh_install rather than dh_movefiles. This makes debian/rules - slightly cleaner, and debian/install is unchanged after install. - * Create symlinks for HTML manuals, since different versions - of texi2html and db2html create different names. - * Make the dependencies sane (remove incorrect dependencies, and correct - dubious ones). foomatic-db-gimp-print now depends only upon foomatic-db - and ijsgimpprint. - * escputil has been changed to section "utils", and the override changed - (Closes: #145094). - * Gimp-Print PPDs are automatically upgraded using a new tool, - cups-genppdupdate, which will prevent the in-use PPDs mismatching with - the libgimpprint version in use (Closes: #172116). - * The Epson stc640 will now print in greyscale and black and white at - resolutions >= 720 DPI (Closes: #170473). - * The CUPS epson backend uses non-blocking I/O, and so will not hang with - some models when no status readback data is sent. - - -- Roger Leigh Wed, 29 Jan 2003 11:37:49 +0000 - -gimp-print (4.2.4-1) unstable; urgency=low - - * New stable release. - * foomatic-db-gimp-print: removed "stp" data, to start the transition - to using ijsgimpprint only. - * The escputil manual page documents the needed kernel configuration - options (Closes: #139000). - * The gimpprint-doc package includes the following manual pages: - gimpprint-color.7, gimpprint-dithers.7, gimpprint-imagetypes.7 - gimpprint-inktypes.7, gimpprint-mediasizes.7 - gimpprint-mediasources.7, gimpprint-mediatypes.7 - gimpprint-models.7, gimpprint-resolutions.7 - This documents all the features of gimp-print, in particular all of the - details from src/ghost/README (Closes: #113075). - * Magenta and cyan are no longer swapped on some Lexmark printers - (Closes: #166815). - - -- Roger Leigh Tue, 26 Nov 2002 20:54:30 +0000 - -gimp-print (4.2.3-2) unstable; urgency=low - - * Use libtool 1.4.3 instead of the release version, to correctly support - shared libraries on some architectures. Closes #168901 - * escputil is now in section "utils". Closes #145094 - - -- Roger Leigh Tue, 19 Nov 2002 20:55:01 +0000 - -gimp-print (4.2.3-1) unstable; urgency=low - - * New stable release. - * Fixed doc-base problems in libgimpprint-doc. The doc-base file is - generated with sed to insert the version number, Closes #149847 - * libgimpprint$(VERSION)-doc provides and conflicts with a virtual - package libgimpprint-doc to prevent clashes with gimpprint.info - docs. - * New package ijsgimpprint. This provides an IJS server for use - with ghostscript. - * Remove the autotools, texi2html, imagemagick and docbook-utils from the - Build-Depends. - * Put config.sub and config.guess into scripts/ and clean - libgimpprint-doc.doc-base - * I am the new maintainer of gimp-print for Debian. - - -- Roger Leigh Sun, 20 Oct 2002 22:10:17 +0100 - -gimp-print (4.2.2-pre2-1) unstable; urgency=low - - * New stable release, Closes: #148737 - * Upgrade to debhelper version 4 (RL) - * Automate library versioning to work for stable and unstable series. - LIBRARY_VERSION is the library major version or -UPSTREAM_VERSION (RL) - * Update configure regeneration to work with configure.ac (RL) - * libgimpprint$(VERSION)-dev provides and conflicts with a virtual - package `libgimpprint-dev' (RL) - * Remove libgimpprint.postinst as ldconfig is called by debhelper (RL) - * Update package descriptions (RL) - - -- Eric Sharkey Thu, 6 Jun 2002 15:35:28 -0400 - -gimp-print (4.2.2-pre1-1) unstable; urgency=low - - * New upstream release, Closes: #147404, #139218 - * Move escputil to section utils (RL) - * Add postscript-viewer virtual package as an alternative to gs Recommends - for cupsys-driver-gimpprint (RL) - * Reinitialise cupsys after installation or removal of - cupsys-driver-gimpprint (RL) - * Correctly version libgimpprint1 shlibs with -V dh_makeshlibs option - * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a - lintian warning. (RL) - * Split out the message catalogues from the libgimpprint package into - a new gimpprint-locales package to avoid filename conflicts when - multiple libgimpprint versions are installed concurrently. (RL) - * Add libgimpprint-doc.doc-base (existed for six months, but was never - added to CVS!) (RL) - * New package foomatic-db-gimpprint. Contains foomatic data (RL) - - -- Eric Sharkey Sat, 25 May 2002 14:20:17 -0400 - -gimp-print (4.2.0-4) unstable; urgency=low - - * Apply Roger's user's guide Makefile.am patch, Closes: #128421 - * Work around bug #130756 by building docs with EPS1 figures. - - -- Eric Sharkey Sat, 16 Feb 2002 22:46:29 -0500 - -gimp-print (4.2.0-3) unstable; urgency=low - - * Fix locales package description, Closes: #123796 - * Change conflicts to replaces, Closes: #123811 - - -- Eric Sharkey Mon, 31 Dec 2001 12:02:42 -0500 - -gimp-print (4.2.0-2) unstable; urgency=low - - * Fix build dependencies, Closes: #121597 - * Fix broken gimpprint-doc.doc-base pointing to old index filename - * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a - lintian warning. (Roger Leigh) - * Split out the message catalogues from the libgimpprint package into - a new gimpprint-locales package to avoid filename conflicts when - multiple libgimpprint versions are installed concurrently. (RL) - * Add libgimpprint-doc.doc-base (existed for six months, but was never - added to CVS!) (RL) - - -- Eric Sharkey Sun, 9 Dec 2001 09:47:05 -0500 - -gimp-print (4.2.0-1) unstable; urgency=low - - * New upstream release - * cupsys-driver-gimpprint only includes the basic `C' POSIX locale - ppd files due to the size of the ppd files (Roger Leigh) - * New package gimpprint-doc contains the new user guide. (RL) - * Enable i18n (RL) - * Add Build-Depends for gettext (>= 0.10.36-1), because - 'make install' fails with earlier versions due to absent - DESTDIR support. (RL) - * libgimpprint-doc uses ps instead of dvi manual, due to inclusion - of graphics (RL) - * gimp1.2-print no longer registers documentation with doc-base, as - the manual is provided in libgimpprint-doc (RL) - * Disable building of translated PPD files (RL) - - -- Eric Sharkey Sun, 25 Nov 2001 22:20:33 -0500 - -gimp-print (4.1.99-b1-1) unstable; urgency=low - - * New upstream release, Closes: #110066 - * Remove README.dither from libgimpprint-dev.docs (Roger Leigh) - * Add image samples to gimp1.2-print and cupsys-driver-gimpprint (RL) - * Change rules and control to use ABI library versioning (RL) - * Changed library version names to reflect upstream library - versioning change to ABI versioning. (RL) - - -- Eric Sharkey Mon, 23 Jul 2001 10:49:04 -0400 - -gimp-print (4.1.99-a2-1) unstable; urgency=low - - * New upstream release - - -- Eric Sharkey Mon, 23 Jul 2001 10:49:04 -0400 - -gimp-print (4.1.99-a1-1) unstable; urgency=low - - * New upstream release (first 4.2 pre-release) - - -- Eric Sharkey Tue, 10 Jul 2001 16:19:03 -0400 - -gimp-print (4.1.10-1) unstable; urgency=low - - * New upstream release (4.1.8 and 4.1.9 were buggy) - - -- Eric Sharkey Fri, 29 Jun 2001 23:08:27 -0400 - -gimp-print (4.1.7-1) unstable; urgency=low - - * New package libgimpprint-doc for Info and dvi docs. (Roger Leigh) - * Change debian/rules to use separate binary-arch and binary-indep - targets (Roger Leigh) - * New upstream release - - -- Eric Sharkey Wed, 9 May 2001 12:19:43 -0400 - -gimp-print (4.1.6-2) unstable; urgency=low - - * Fix build dependencies to include flex, Closes: #96401 - - -- Eric Sharkey Tue, 8 May 2001 20:09:30 -0400 - -gimp-print (4.1.6-1) unstable; urgency=low - - * New upstream release - - -- Eric Sharkey Mon, 30 Apr 2001 13:45:56 -0400 - -gimp-print (4.1.5-2.01) unstable; urgency=low - - * Recompile 4.1.5-2 with updated debhelper to fix dependencies - * Closes #90741 - - -- Eric Sharkey Fri, 6 Apr 2001 21:11:15 -0400 - -gimp-print (4.1.5-2) unstable; urgency=low - - * Clean up build process so that things work even if some scripts - don't have execute permissions, complicate things a bit by using - funky building script, Closes #89283, I hope... - - -- Eric Sharkey Thu, 15 Mar 2001 21:54:52 -0500 - -gimp-print (4.1.5-1) unstable; urgency=low - - * New upstream release - * First Official version uploaded to Debian - * Close ITP bug for wnpp, Closes #85563 - - -- Eric Sharkey Fri, 2 Mar 2001 19:59:11 -0500 - -gimp-print (4.1.4-2) unstable; urgency=low - - * Repackage gimp-print after forking the Debian branch from 4.1.4 - * Add version numbers to the libgimpprint package name - * Move documentation files from libgimpprint to libgimpprint-dev - - -- Eric Sharkey Tue, 27 Feb 2001 11:22:18 -0500 - -gimp-print (4.1.4-1) unstable; urgency=low - - * New upstream release - * Debian package rewritten from scratch. - * Added diversion of the print plugin that is part of the GIMP - package to /usr/lib/gimp/1.2/print - * Fixed shared library dependencies for programs linked with - libgimpprint - * Added /etc/cups/command.types as a conffile for package cupsys- - driver-gimpprint - * Added gimp1.2-print html and sgml docs to doc-base - * Remove /etc/cups in postrm for cupsys-driver-gimprint (but - won't if not empty) - * Added versioned debhelper Build-Depends - - -- Roger Leigh Fri, 16 Feb 2001 00:16:10 +0000 - -gimp-print (4.0.2-1) unstable; urgency=low - - * Debian packages of the latest GP - - -- Eric Sharkey Sun, 12 Nov 2000 04:46:54 +0900 - -gimp-print (3.1.4-1) unstable; urgency=low - - * Debianised gimp-print built from gimp-print CVS at sourceforge. - - -- Charles Briscoe-Smith Wed, 24 May 2000 00:39:54 +0100 - - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index 11cb415..0000000 --- a/debian/control +++ /dev/null @@ -1,327 +0,0 @@ -Source: gutenprint -Section: graphics -Priority: optional -Maintainer: Debian Printing Group -Uploaders: Roger Leigh -Standards-Version: 3.6.2 -Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch - -Package: gimp-print -Architecture: any -Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1) -Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) -Enhances: gimp -Description: print plugin for the GIMP - This package includes the Print plugin for the GIMP. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: cupsys-driver-gimpprint -Architecture: any -Section: graphics -Depends: cupsys-driver-gutenprint (>= ${Source-Version}) -Description: printer drivers for CUPS - This is a transitional package to migrate existing users of - cupsys-driver-gimpprint to cupsys-driver-gutenprint (its - successor). It may be safely removed after upgrading. - -Package: cupsys-driver-gutenprint -Architecture: any -Section: graphics -Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23) -Recommends: gnome-gv | postscript-viewer -Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) -Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data -Description: printer drivers for CUPS - This package includes a CUPS driver based on Gutenprint. - . - The CUPS drivers contain all of the files needed to support - photo-quality printing on any printer supported by Gutenprint. You - can find out more about the Common UNIX Printing System ("CUPS"), an - IPP-based printing system for UNIX/Linux, at: - . - http://www.cups.org - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint-dev -Architecture: any -Section: libdevel -Depends: libgutenprint2 (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver library - This package contains the header files for the Gutenprint library, - along with a static version of libgutenprint. - . - Install this package if you wish to develop programs that use - libgutenprint. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint-doc -Architecture: all -Section: doc -Suggests: libgutenprint-dev (= ${Source-Version}) -Description: documentation for the Gutenprint printer driver library - This package contains lots of info-files, DVI docs and other - documentation about the Gutenprint library for photo-quality - printing. - . - Install this package if you want to have lots of info about the - Gutenprint library when you're programming. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint2 -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Suggests: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver library - This package includes the Gutenprint shared library, needed to - run programs using Gutenprint drivers. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui1-dev -Architecture: any -Section: devel -Depends: libgutenprintui1-1 (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver user interface library - This package contains the header files for the libgutenprintui - library, along with a static version of libgutenprintui. - libgutenprintui contains GTK+ widgets which may be used for print - dialogs etc. for use with libgutenprint. - . - Install this package if you wish to develop packages that use - libgutenprintui. This package is intended for use only by cinepaint - and gimp-1.2. - . - This is Gutenprint version 5.0.0-rc2, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui1-1 -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Recommends: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver user interface library - This package includes the libgutenprintui library. libgutenprintui - contains GTK+ widgets which may be used for print dialogs etc. for - use with libgutenprint. - . - This is Gutenprint version 5.0.0-rc2, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui2-dev -Architecture: any -Section: devel -Depends: libgutenprintui2-1 (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver user interface library - This package contains the header files for the libgutenprintui - library, along with a static version of libgutenprintui. - libgutenprintui contains GTK+ widgets which may be used for print - dialogs etc. for use with libgutenprint. - . - Install this package if you wish to develop packages that use - libgutenprintui. - . - This is Gutenprint version 5.0.0-rc2, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui2-1 -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Recommends: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver user interface library - This package includes the libgutenprintui library, necessary to run - gimp-print. libgutenprintui contains GTK+ widgets which may be - used for print dialogs etc. for use with libgutenprint. - . - This is Gutenprint version 5.0.0-rc2, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: gutenprint-locales -Architecture: all -Section: libs -Description: locale data files for Gutenprint - This package contains the i18n files of Gutenprint, used by - libgutenprint2, cupsys-driver-gutenprint and - escputil. It is also used by the GIMP Print plugin. - . - They are needed when you want the programs in Gutenprint to print - their messages in other languages than US English. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: escputil -Architecture: any -Section: utils -Depends: ${shlibs:Depends} -Suggests: gutenprint-locales (>= ${Source-Version}) -Description: maintenance utility for Epson Stylus printers - escputil is a utility to clean and align the heads of Epson Stylus - printers. It can also check the current ink levels in the printer. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: ijsgimpprint -Architecture: any -Section: text -Depends: ijsgutenprint (>= ${Source-Version}) -Description: printer drivers for CUPS - This is a transitional package to migrate existing users of - ijsgimpprint to ijsgutenprint (its successor). It may be - safely removed after upgrading. - -Package: ijsgutenprint -Architecture: any -Section: text -Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14) -Description: inkjet server - Ghostscript driver for Gutenprint - This package contains the ijsgutenprint binary which provides - Ghostscript with a Gutenprint driver, including all printers - supported by Gutenprint. ijsgutenprint is an IJS server (driver), - which communicates with Ghostscript (an IJS client) using the IJS - (InkJet Server) communications protocol. IJS is a method for - separating ghostscript drivers from ghostscript, to allow - ghostscript to be more extensible. - . - If you wish to print using Ghostscript and the Gutenprint drivers, - install this package. This is typical for LPRng setups. If you - are using CUPS, cupsys-driver-gutenprint is a better choice, but - this package will still work with the appropriate foomatic setup - if you wish to make use of foomatic. - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: foomatic-db-gimp-print -Architecture: all -Section: text -Depends: foomatic-db-gutenprint (>= ${Source-Version}) -Description: linuxprinting.org printer support - database for Gimp-Print printer drivers - This is a transitional package to migrate existing users of - foomatic-db-gimp-print to foomatic-db-gutenprint (its successor). It - may be safely removed after upgrading. - -Package: foomatic-db-gutenprint -Architecture: all -Section: text -Depends: foomatic-db, ijsgutenprint (>= ${Source-Version}) -Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9) -Description: linuxprinting.org printer support - database for Gutenprint printer drivers - Foomatic is a printing system designed to make it easier to set up - common printers for use with Debian (and other operating systems). - It provides the "glue" between a print spooler (like CUPS or lpr) and - your actual printer, by telling your computer how to process files - sent to the printer. - . - This package includes support for printers using the Gutenprint - printer driver suite. - . - Home Page: http://www.linuxprinting.org/ - . - This is Gutenprint version 5.0.0-rc2, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. diff --git a/debian/control.gfdl b/debian/control.gfdl deleted file mode 100644 index cd1e1c4..0000000 --- a/debian/control.gfdl +++ /dev/null @@ -1,23 +0,0 @@ -Package: gutenprint-doc -Architecture: all -Section: doc -Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version}) -Description: users' guide for Gutenprint and CUPS - This package contains a user guide for programs using the - Gutenprint library for photographic quality printing. Currently - this covers using the Print plugin for the GIMP and the Common Unix - Printing System (CUPS). - . - The documentation is available in both HTML and PDF formats for - on-line viewing and hardcopy. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index 6026fca..0000000 --- a/debian/control.in +++ /dev/null @@ -1,327 +0,0 @@ -Source: gutenprint -Section: graphics -Priority: optional -Maintainer: Debian Printing Group -Uploaders: Roger Leigh -Standards-Version: 3.6.2 -Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch - -Package: gimp-print -Architecture: any -Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1) -Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) -Enhances: gimp -Description: print plugin for the GIMP - This package includes the Print plugin for the GIMP. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: cupsys-driver-gimpprint -Architecture: any -Section: graphics -Depends: cupsys-driver-gutenprint (>= ${Source-Version}) -Description: printer drivers for CUPS - This is a transitional package to migrate existing users of - cupsys-driver-gimpprint to cupsys-driver-gutenprint (its - successor). It may be safely removed after upgrading. - -Package: cupsys-driver-gutenprint -Architecture: any -Section: graphics -Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23) -Recommends: gnome-gv | postscript-viewer -Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) -Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data -Description: printer drivers for CUPS - This package includes a CUPS driver based on Gutenprint. - . - The CUPS drivers contain all of the files needed to support - photo-quality printing on any printer supported by Gutenprint. You - can find out more about the Common UNIX Printing System ("CUPS"), an - IPP-based printing system for UNIX/Linux, at: - . - http://www.cups.org - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint-dev -Architecture: any -Section: libdevel -Depends: libgutenprint#LIBRARY_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver library - This package contains the header files for the Gutenprint library, - along with a static version of libgutenprint. - . - Install this package if you wish to develop programs that use - libgutenprint. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint-doc -Architecture: all -Section: doc -Suggests: libgutenprint-dev (= ${Source-Version}) -Description: documentation for the Gutenprint printer driver library - This package contains lots of info-files, DVI docs and other - documentation about the Gutenprint library for photo-quality - printing. - . - Install this package if you want to have lots of info about the - Gutenprint library when you're programming. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprint#LIBRARY_VERSION# -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Suggests: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver library - This package includes the Gutenprint shared library, needed to - run programs using Gutenprint drivers. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui1-dev -Architecture: any -Section: devel -Depends: libgutenprintui1-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver user interface library - This package contains the header files for the libgutenprintui - library, along with a static version of libgutenprintui. - libgutenprintui contains GTK+ widgets which may be used for print - dialogs etc. for use with libgutenprint. - . - Install this package if you wish to develop packages that use - libgutenprintui. This package is intended for use only by cinepaint - and gimp-1.2. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui1-#LIBRARYUI_VERSION# -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Recommends: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver user interface library - This package includes the libgutenprintui library. libgutenprintui - contains GTK+ widgets which may be used for print dialogs etc. for - use with libgutenprint. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui2-dev -Architecture: any -Section: devel -Depends: libgutenprintui2-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0) -Suggests: libgutenprint-doc (= ${Source-Version}) -Description: development files for the Gutenprint printer driver user interface library - This package contains the header files for the libgutenprintui - library, along with a static version of libgutenprintui. - libgutenprintui contains GTK+ widgets which may be used for print - dialogs etc. for use with libgutenprint. - . - Install this package if you wish to develop packages that use - libgutenprintui. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: libgutenprintui2-#LIBRARYUI_VERSION# -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Recommends: gutenprint-locales (>= ${Source-Version}) -Description: runtime for the Gutenprint printer driver user interface library - This package includes the libgutenprintui library, necessary to run - gimp-print. libgutenprintui contains GTK+ widgets which may be - used for print dialogs etc. for use with libgutenprint. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta - development release in the 5.0 line. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: gutenprint-locales -Architecture: all -Section: libs -Description: locale data files for Gutenprint - This package contains the i18n files of Gutenprint, used by - libgutenprint#LIBRARY_VERSION#, cupsys-driver-gutenprint and - escputil. It is also used by the GIMP Print plugin. - . - They are needed when you want the programs in Gutenprint to print - their messages in other languages than US English. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: escputil -Architecture: any -Section: utils -Depends: ${shlibs:Depends} -Suggests: gutenprint-locales (>= ${Source-Version}) -Description: maintenance utility for Epson Stylus printers - escputil is a utility to clean and align the heads of Epson Stylus - printers. It can also check the current ink levels in the printer. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: ijsgimpprint -Architecture: any -Section: text -Depends: ijsgutenprint (>= ${Source-Version}) -Description: printer drivers for CUPS - This is a transitional package to migrate existing users of - ijsgimpprint to ijsgutenprint (its successor). It may be - safely removed after upgrading. - -Package: ijsgutenprint -Architecture: any -Section: text -Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14) -Description: inkjet server - Ghostscript driver for Gutenprint - This package contains the ijsgutenprint binary which provides - Ghostscript with a Gutenprint driver, including all printers - supported by Gutenprint. ijsgutenprint is an IJS server (driver), - which communicates with Ghostscript (an IJS client) using the IJS - (InkJet Server) communications protocol. IJS is a method for - separating ghostscript drivers from ghostscript, to allow - ghostscript to be more extensible. - . - If you wish to print using Ghostscript and the Gutenprint drivers, - install this package. This is typical for LPRng setups. If you - are using CUPS, cupsys-driver-gutenprint is a better choice, but - this package will still work with the appropriate foomatic setup - if you wish to make use of foomatic. - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. - -Package: foomatic-db-gimp-print -Architecture: all -Section: text -Depends: foomatic-db-gutenprint (>= ${Source-Version}) -Description: linuxprinting.org printer support - database for Gimp-Print printer drivers - This is a transitional package to migrate existing users of - foomatic-db-gimp-print to foomatic-db-gutenprint (its successor). It - may be safely removed after upgrading. - -Package: foomatic-db-gutenprint -Architecture: all -Section: text -Depends: foomatic-db, ijsgutenprint (>= ${Source-Version}) -Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9) -Description: linuxprinting.org printer support - database for Gutenprint printer drivers - Foomatic is a printing system designed to make it easier to set up - common printers for use with Debian (and other operating systems). - It provides the "glue" between a print spooler (like CUPS or lpr) and - your actual printer, by telling your computer how to process files - sent to the printer. - . - This package includes support for printers using the Gutenprint - printer driver suite. - . - Home Page: http://www.linuxprinting.org/ - . - This is Gutenprint version #UPSTREAM_VERSION#, a beta release - in the 5.0 series. - . - Gutenprint is the print facility for the GIMP, and in addition a - suite of drivers that may be used with common UNIX spooling systems - using GhostScript or CUPS. These drivers provide printing quality - for UNIX/Linux on a par with proprietary vendor-supplied drivers in - many cases, and can be used for many of the most demanding printing - tasks. Gutenprint was formerly known as Gimp-Print. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 02805bb..0000000 --- a/debian/copyright +++ /dev/null @@ -1,21 +0,0 @@ -This package was debianized by Roger Leigh on -Fri, 26 Jan 2001 17:42:06 +0000. - -It was downloaded from cvs.gimp-print.sourceforge.net - -Upstream Authors: Michael Sweet (mike@easysw.com) - Robert Krawitz (rlk@alum.mit.edu) - -Copyright: - -This software is copyright (c) 1997-2003 Michael Sweet and Robert Krawitz - -You are free to distribute this software under the terms of -the GNU General Public License. -On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL file. - -The User's Guide (in the gutenprint-doc package) is licensed under the -terms of the GNU Free Documentation License, version 1.1. The full -license text is contained within the manual. - diff --git a/debian/cupsys-driver-gutenprint.docs b/debian/cupsys-driver-gutenprint.docs deleted file mode 100644 index 0b55f7f..0000000 --- a/debian/cupsys-driver-gutenprint.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -doc/FAQ.html diff --git a/debian/cupsys-driver-gutenprint.install b/debian/cupsys-driver-gutenprint.install deleted file mode 100644 index 291f653..0000000 --- a/debian/cupsys-driver-gutenprint.install +++ /dev/null @@ -1,12 +0,0 @@ -debian/install/etc/cups etc -debian/install/usr/bin/cups-calibrate usr/bin -debian/install/usr/sbin/cups-genppd.5.0 usr/sbin -debian/install/usr/sbin/cups-genppdconfig.5.0 usr/sbin -debian/install/usr/sbin/cups-genppdupdate.5.0 usr/sbin -debian/install/usr/lib/cups usr/lib -debian/install/usr/share/cups/calibrate.ppm usr/share/cups -debian/install/usr/share/man/man8/cups-calibrate.8 usr/share/man/man8 -debian/install/usr/share/man/man8/cups-genppd.8 usr/share/man/man8 -debian/install/usr/share/man/man8/cups-genppdconfig.8 usr/share/man/man8 -debian/install/usr/share/man/man8/cups-genppdupdate.8 usr/share/man/man8 -samples/profile.jpg usr/share/doc/cupsys-driver-gutenprint/samples diff --git a/debian/cupsys-driver-gutenprint.postinst b/debian/cupsys-driver-gutenprint.postinst deleted file mode 100644 index 0784757..0000000 --- a/debian/cupsys-driver-gutenprint.postinst +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh -# postinst script for cupsys-driver-gutenprint -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see /usr/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -#s/^if\s+\[\s+"\$1"\s+=\s+"configure"\s+\];\s+then\s+ldconfig\b//m; - -if [ "$1" = "configure" ]; then -# Upgrade in-use PPD files - /usr/sbin/cups-genppdconfig.5.0 -u - /usr/sbin/cups-genppdupdate.5.0 -# Restart CUPSys (to register new and updated PPDs) - [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload -elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then - : -else - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/cupsys-driver-gutenprint.postrm b/debian/cupsys-driver-gutenprint.postrm deleted file mode 100644 index 63c1b49..0000000 --- a/debian/cupsys-driver-gutenprint.postrm +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -# postrm script for cupsys-driver-gutenprint -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see /usr/doc/packaging-manual/ - -if [ "$1" = remove ]; then - # Remove generated PPDs - rm -rf /usr/share/cups/model/gutenprint/5.0 - [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload -fi - -if [ "$1" = purge ]; then - # Remove /etc/cups if it is empty - rmdir --ignore-fail-on-non-empty /etc/cups - rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - - diff --git a/debian/escputil.docs b/debian/escputil.docs deleted file mode 100644 index e845566..0000000 --- a/debian/escputil.docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/escputil.install b/debian/escputil.install deleted file mode 100644 index 75d88a3..0000000 --- a/debian/escputil.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/bin/escputil usr/bin -debian/install/usr/share/man/man1/escputil.1 usr/share/man/man1 diff --git a/debian/foomatic-db-gutenprint.install b/debian/foomatic-db-gutenprint.install deleted file mode 100644 index dc49f93..0000000 --- a/debian/foomatic-db-gutenprint.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/share/foomatic/db/source/driver/gutenprint*.xml usr/share/foomatic/db/source/driver -debian/install/usr/share/foomatic/db/source/opt/gutenprint-ijs* usr/share/foomatic/db/source/opt diff --git a/debian/gimp-print.docs b/debian/gimp-print.docs deleted file mode 100644 index 7610b61..0000000 --- a/debian/gimp-print.docs +++ /dev/null @@ -1,3 +0,0 @@ -README -doc/*.html -doc/*.png diff --git a/debian/gimp-print.install b/debian/gimp-print.install deleted file mode 100644 index 8932be3..0000000 --- a/debian/gimp-print.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/lib/gimp/2.0/plug-ins/print usr/lib/gimp/2.0/plug-ins -samples/*.png usr/share/doc/gimp-print/samples diff --git a/debian/gimp-print.postrm b/debian/gimp-print.postrm deleted file mode 100644 index 87c41e4..0000000 --- a/debian/gimp-print.postrm +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -# postrm script for gimp-print -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see /usr/doc/packaging-manual/ - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ remove = "$1" ]; then - dpkg-divert --package gimp-print --remove --rename \ - --divert /usr/lib/gimp/2.0/print.orig \ - /usr/lib/gimp/2.0/plug-ins/print - fi - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - - diff --git a/debian/gimp-print.preinst b/debian/gimp-print.preinst deleted file mode 100644 index 36782c3..0000000 --- a/debian/gimp-print.preinst +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -# preinst script for gimp-print -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' - -case "$1" in - install|upgrade) - if [ install = "$1" ]; then - dpkg-divert --package gimp-print --add --rename \ - --divert /usr/lib/gimp/2.0/print.orig \ - /usr/lib/gimp/2.0/plug-ins/print - fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base deleted file mode 100644 index b7a0cd2..0000000 --- a/debian/gutenprint-doc.doc-base +++ /dev/null @@ -1,14 +0,0 @@ -Document: gutenprint-doc -Title: The User's Guide to the Gutenprint Top Quality Printer Drivers -Author: Andy Stewart -Abstract: The Gutenprint Top Quality Printer Drivers are a set of - printer drivers written to take advantage of the full capabilities - of a wide range of printers. 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). -Section: Apps/Graphics - -Format: HTML -Index: /usr/share/doc/gutenprint-doc/html/index.html -Files: /usr/share/doc/gutenprint-doc/html/* diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install deleted file mode 100644 index d481933..0000000 --- a/debian/gutenprint-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/share/gutenprint/doc/*.pdf usr/share/doc/gutenprint-doc -debian/install/usr/share/gutenprint/doc/html usr/share/doc/gutenprint-doc diff --git a/debian/gutenprint-locales.install b/debian/gutenprint-locales.install deleted file mode 100644 index 525d334..0000000 --- a/debian/gutenprint-locales.install +++ /dev/null @@ -1 +0,0 @@ -debian/install/usr/share/locale usr/share diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install deleted file mode 100644 index 46c6e2d..0000000 --- a/debian/ijsgutenprint.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/bin/ijsgutenprint.5.0 usr/bin -debian/install/usr/share/man/man1/ijsgutenprint.1 usr/share/man/man1 diff --git a/debian/libgutenprint-dev.docs b/debian/libgutenprint-dev.docs deleted file mode 100644 index 0b55f7f..0000000 --- a/debian/libgutenprint-dev.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -doc/FAQ.html diff --git a/debian/libgutenprint-dev.install b/debian/libgutenprint-dev.install deleted file mode 100644 index b680b22..0000000 --- a/debian/libgutenprint-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/usr/lib/libgutenprint.so usr/lib -debian/install/usr/lib/pkgconfig/gutenprint.pc usr/lib/pkgconfig -debian/install/usr/include/gutenprint usr/include diff --git a/debian/libgutenprint-doc.doc-base.developer b/debian/libgutenprint-doc.doc-base.developer deleted file mode 100644 index e1a7e2a..0000000 --- a/debian/libgutenprint-doc.doc-base.developer +++ /dev/null @@ -1,15 +0,0 @@ -Document: libgutenprint-doc-developer -Title: The libgutenprint Reference Manual -Author: The Gutenprint Project -Abstract: The gutenprint library routines give programmers an interface to - print high quality bitmap images on most modern printers. It includes drivers - which provide printing quality for UNIX/Linux on a par with proprietary - vendor-supplied drivers in many cases, and can be used for many of the most - demanding printing tasks. This manual covers developing programs that use - libgutenprint for printing, as well as the concepts and internals of the - library. -Section: Apps/Programming - -Format: HTML -Index: /usr/share/doc/libgutenprint-doc/developer/html/index.html -Files: /usr/share/doc/libgutenprint-doc/developer/html/*.html diff --git a/debian/libgutenprint-doc.doc-base.reference b/debian/libgutenprint-doc.doc-base.reference deleted file mode 100644 index 303c3ef..0000000 --- a/debian/libgutenprint-doc.doc-base.reference +++ /dev/null @@ -1,14 +0,0 @@ -Document: libgutenprint-doc-reference -Title: The libgutenprint API Reference Manual -Author: The Gutenprint Project -Abstract: The gutenprint library routines give programmers an interface to - print high quality bitmap images on most modern printers. It includes drivers - which provide printing quality for UNIX/Linux on a par with proprietary - vendor-supplied drivers in many cases, and can be used for many of the most - demanding printing tasks. This manual is a reference to the libgutenprint - library. -Section: Apps/Programming - -Format: HTML -Index: /usr/share/doc/libgutenprint-doc/reference/html/index.html -Files: /usr/share/doc/libgutenprint-doc/reference/html/*.html diff --git a/debian/libgutenprint-doc.install b/debian/libgutenprint-doc.install deleted file mode 100644 index 2864212..0000000 --- a/debian/libgutenprint-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -doc/developer/reference-html/* usr/share/doc/libgutenprint-doc/developer/html -doc/gutenprint/* usr/share/doc/libgutenprint-doc/reference diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in deleted file mode 100644 index 1a0d0f4..0000000 --- a/debian/libgutenprint2.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/usr/lib/libgutenprint.so.* usr/lib -debian/install/usr/lib/gutenprint usr/lib -debian/install/usr/share/gutenprint/#UPSTREAM_VERSION# usr/share/gutenprint diff --git a/debian/libgutenprintui1-1.install b/debian/libgutenprintui1-1.install deleted file mode 100644 index ed8acb5..0000000 --- a/debian/libgutenprintui1-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/install/usr/lib/libgutenprintui.so.* usr/lib diff --git a/debian/libgutenprintui1-dev.install b/debian/libgutenprintui1-dev.install deleted file mode 100644 index 5823133..0000000 --- a/debian/libgutenprintui1-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/usr/lib/libgutenprintui.so usr/lib -debian/install/usr/lib/pkgconfig/gutenprintui.pc usr/lib/pkgconfig -debian/install/usr/include/gutenprintui usr/include diff --git a/debian/libgutenprintui2-1.install b/debian/libgutenprintui2-1.install deleted file mode 100644 index 42c6a6f..0000000 --- a/debian/libgutenprintui2-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/install/usr/lib/libgutenprintui2.so.* usr/lib diff --git a/debian/libgutenprintui2-dev.install b/debian/libgutenprintui2-dev.install deleted file mode 100644 index 3ea421f..0000000 --- a/debian/libgutenprintui2-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/usr/lib/libgutenprintui2.so usr/lib -debian/install/usr/lib/pkgconfig/gutenprintui2.pc usr/lib/pkgconfig -debian/install/usr/include/gutenprintui2 usr/include diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 76b2013..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -05_genppdconfig_remove_perlmenu.dpatch diff --git a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch deleted file mode 100755 index afbd9d2..0000000 --- a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch +++ /dev/null @@ -1,257 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_genppdconfig_remove_perlmenu.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove perlmenu support from cups-genppdconfig.in - -@DPATCH@ - -diff -urN gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in ---- gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in 2005-09-03 19:46:25.240866064 +0100 -+++ gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in 2005-09-02 22:52:31.936066848 +0100 -@@ -36,12 +36,8 @@ - sub create_dir($); - sub dialog_read($$); - sub dialog_read_list (\%\@$$); --sub perl_menu ($$$$@); --sub perl_menu_read_list (\%\@$$); --sub perl_menu_mult ($$@); - - my $DIALOG = "@DIALOG@"; # version of dialog to call --my $use_dialog = 0; # whether to use dialog - my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title - my %printers; # master list of printers - my %languages; # master list of languages -@@ -74,16 +70,6 @@ - exit 0; - } - --# Can we use dialog? --if (-x $DIALOG) { -- $use_dialog = 1; --} else { -- BEGIN { $Curses::OldCurses = 1; } -- use Curses; -- use perlmenu; -- perl_menu_defaults(); --} -- - while (my $option = main_menu()) { # Display main menu and run selection - if ($option eq "Help") { - display_help(); -@@ -218,21 +204,14 @@ - [ "Create", "Create PPDs" ], - [ "Exit", "Exit the program" ] - ); -- if ($use_dialog) { -- my $dialog_options; -- for my $i ( 0 .. $#menu_options) { -- for my $j ( 0 .. $#{$menu_options[$i]}) { -- $dialog_options .= "\"$menu_options[$i][$j]\" "; -- } -- } -- while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) { -- chomp ($option); -- return $option; -+ my $dialog_options; -+ for my $i ( 0 .. $#menu_options) { -+ for my $j ( 0 .. $#{$menu_options[$i]}) { -+ $dialog_options .= "\"$menu_options[$i][$j]\" "; - } -- } else { -- $option = perl_menu(1, "Main menu", "Choose an option.", -- "Current PPD directory: $chosen_location", -- @menu_options); -+ } -+ while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) { -+ chomp ($option); - return $option; - } - } -@@ -310,19 +289,7 @@ - or die "can't open temporary help file"; - print $HELPFILE "$help_text"; - $HELPFILE->flush(); -- if ($use_dialog) { -- dialog_read("Help", "--textbox $helpfilename 18 76"); -- } else { -- &menu_init(0, "Help", 0); -- open(TEMP,$helpfilename); -- while () { -- s/^(\t+)/' ' x length($1)/e; -- &expand($_) if /\t/; -- &menu_item($_,"", -1); -- } -- close(TEMP); -- &menu_display("Help viewer: (RET/u/t) exit (n/p) next/previous page (b) beginning (e) end"); -- } -+ dialog_read("Help", "--textbox $helpfilename 18 76"); - unlink0($HELPFILE, $helpfilename) or die "Error unlinking help file $helpfilename safely: $!"; - close($HELPFILE) or die "can't close help file $helpfilename: $!"; - return; -@@ -336,12 +303,7 @@ - sub choose_printers { - my $title = "Printer selection"; - my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11"; -- if ($use_dialog) { -- dialog_read_list(%printers, @chosen_printers, $title, $options); -- } else { -- perl_menu_read_list(%printers, @chosen_printers, $title, -- "Choose the printer models you wish to use with CUPS."); -- } -+ dialog_read_list(%printers, @chosen_printers, $title, $options); - } - - -@@ -352,12 +314,7 @@ - sub choose_languages { - my $title = "Language selection"; - my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11"; -- if ($use_dialog) { -- dialog_read_list(%languages, @chosen_languages, $title, $options); -- } else { -- perl_menu_read_list(%languages, @chosen_languages, $title, -- "Choose the languages you wish to use with CUPS."); -- } -+ dialog_read_list(%languages, @chosen_languages, $title, $options); - } - - -@@ -367,12 +324,8 @@ - # - sub choose_location { - my $location; -- if ($use_dialog) { -- $location = dialog_read("Location selection", -- "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location"); -- } else { -- $location = &menu_getstr(5,12,"Directory:", 1, $chosen_location); -- } -+ $location = dialog_read("Location selection", -+ "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location"); - if (!defined($location)) { - $location = ""; - } -@@ -432,7 +385,7 @@ - } else { - $printers = ""; - } -- if (! $silent && $use_dialog) { -+ if (! $silent) { - open DIALOG, "| $DIALOG --sleep 2 --backtitle \"$BACKTITLE\" --title \"Creating PPD files\" --guage \"Language: \nPPD files: \" 10 72 0" - or die "can't fork dialog: $!"; - } -@@ -449,7 +402,7 @@ - if ($percent > 100) { - $percent = 100; - } -- if (! $silent && $use_dialog) { -+ if (! $silent) { - print DIALOG "$percent\n"; - print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n"; - DIALOG->flush(); -@@ -460,7 +413,7 @@ - } - close GENPPD or die "can't close cups-genppd pipe: $!"; - } -- if (! $silent && $use_dialog) { -+ if (! $silent) { - print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n"; - close DIALOG or die "can't close dialog pipe"; - } -@@ -521,95 +474,3 @@ - @$list=split(/ /, $tmplist); - } - } -- -- --# scalar --# perl_menu($title) --# --sub perl_menu ($$$$@) { -- my ($top, $title, $question, $subtitle, @items) = @_; -- my $selection; -- &menu_init(1, "cups-genppdconfig", $top, $title, "$BACKTITLE\n-<$subtitle"); -- -- for my $i ( 0 .. $#items) { -- &menu_item($items[$i][1], $items[$i][0]); -- } -- -- $selection = &menu_display($question); -- return $selection; --} -- --# scalar --# perl_menu_mult($title, $question, @items) --# --sub perl_menu_mult ($$@) { -- my ($title, $question, @items) = @_; -- my $selection; -- &menu_init(1, "cups-genppdconfig", 0, $title, $BACKTITLE); -- -- for my $i ( 0 .. $#items) { -- &menu_item($items[$i][1], $items[$i][0], $items[$i][2]); -- } -- -- perl_menu_sel_defaults(); -- $selection = &menu_display_mult($question); -- perl_menu_defaults(); -- if ($selection eq "%UP%" or $selection eq "%NONE%") { -- return undef; -- } -- return $selection; --} -- -- --# --# perl_menu_read_list(%masterlist --# @chosenlist --# $title --# $question --# - Construct list dialog, entries from %masterlist, --# defaults from @chosenlist. --# --sub perl_menu_read_list (\%\@$$) { -- my $masterlist = $_[0]; -- my $list = $_[1]; -- my $title = $_[2]; -- my $question = $_[3]; -- my $tmplist; -- my @menulist = (); -- my $item; -- my $selected; --# Make a list for use with perlmenu. -- foreach $item (sort keys %$masterlist) { -- $selected = 0; -- foreach (@$list) { -- if ($item eq $_) { -- $selected = 1; -- last; -- } -- } -- my $formatstring = sprintf "%-14s - %s", $item, $masterlist->{$item}; -- push @menulist, [ $item, $formatstring, $selected ] ; -- } -- $tmplist = perl_menu_mult("$title", "RET=toggle selection (u/t) exit (n/p) next/previous page (b) beginning (e) end", @menulist); -- if (defined($tmplist)) { -- $tmplist =~ s/\"//g; -- @$list=split(/,/, $tmplist); -- } --} -- -- --# --# perl_menu_defaults - set menu defaults --# --sub perl_menu_defaults { -- &menu_prefs(1, 0, 1, 0, "y", 0, 0); --} -- -- --# --# perl_menu_sel_defaults - set menu defaults for multiple selections --# --sub perl_menu_sel_defaults { -- &menu_prefs(1, 0, 1, 0, "y", 1, 0); --} -- diff --git a/debian/rules b/debian/rules deleted file mode 100755 index dca0207..0000000 --- a/debian/rules +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/make -f -# rules to package gutenprint -# $Id: rules,v 1.58 2005/06/26 17:06:59 rleigh Exp $ -# -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# Use dpatch. -include /usr/share/dpatch/dpatch.make - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -# Get upstream version, and define libgutenprint suffix -#UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//") -UPSTREAM_VERSION = 5.0.0-rc2 -UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/" -#LIBRARY_VERSION = -$(UPSTREAM_VERSION) -LIBRARY_VERSION = 2 -LIBRARYUI_VERSION = 1 - -GENERATED_FILES = \ - debian/libgutenprint2.install - -autoconfigure: autoconfigure-stamp -autoconfigure-stamp: debian/control $(GENERATED_FILES) - dh_testdir - mkdir debian/build; \ - cd debian/build; \ - ../../configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --disable-static --enable-shared --disable-rpath \ - --with-modules=dlopen \ - --enable-libgutenprintui --enable-libgutenprintui2 \ - --without-gimp --with-gimp2 --with-cups --with-ijs \ - --with-foomatic --with-foomatic3 \ - --disable-test \ - --enable-cups-level3-ppds --disable-translated-cups-ppds \ - --disable-cups-level3-ps --disable-static-genppd - touch autoconfigure-stamp - - -build: build-stamp debian/control -build-stamp: patch-stamp autoconfigure-stamp - dh_testdir - - cd debian/build; \ - $(MAKE) - - touch build-stamp - -clean: realclean unpatch -realclean: debian/control - dh_testdir - rm -f build-stamp autoconfigure-stamp - - -$(MAKE) distclean - -test -r /usr/share/misc/config.sub && \ - cp -f /usr/share/misc/config.sub scripts/config.sub - -test -r /usr/share/misc/config.guess && \ - cp -f /usr/share/misc/config.guess scripts/config.guess - - rm -rf debian/build debian/install - -$(MAKE) distclean - - rm -f $(GENERATED_FILES) - - dh_clean - -install: DH_OPTIONS= -install: build debian/control - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd debian/build; \ - $(MAKE) DESTDIR=`pwd`/../install install - - dh_install - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installexamples -i - dh_installchangelogs -i NEWS - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -a - cp src/cups/README debian/cupsys-driver-gutenprint/usr/share/doc/cupsys-driver-gutenprint/README.cups - mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.5.0.8 - mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.5.0.8 - mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.5.0.8 - mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.0.1 - ln -s ijsgutenprint.5.0.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz - ln -s ijsgutenprint.5.0 debian/ijsgutenprint/usr/bin/ijsgutenprint - dh_installexamples -a - dh_installchangelogs -a NEWS - dh_strip -a - dh_link -a - dh_compress -a - dh_fixperms -a -# Strip DT_RPATH from CUPS binaries. - find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete - chrpath --delete debian/cupsys-driver-gutenprint/usr/sbin/cups-genppd.5.0 - dh_makeshlibs -a -V -X usr/lib/gutenprint - dh_installdeb -a - dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui1-$(LIBRARYUI_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch - -SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_VERSION\#/$(LIBRARY_VERSION)/g" -e "s/\#LIBRARYUI_VERSION\#/$(LIBRARYUI_VERSION)/g" - -debian/control: debian/control.in debian/changelog debian/rules - sed $(SEDPATTERN) <$< >$@ - -debian/libgutenprint2.install: debian/libgutenprint2.install.in debian/changelog - sed $(SEDPATTERN) <$< >$@ - -.PHONY: build clean binary-indep binary-arch binary install autoconfigure patch unpatch diff --git a/doc/Makefile.am b/doc/Makefile.am index 4a280c8..55e716e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.42 2005/11/21 11:16:22 rleigh Exp $ +## $Id: Makefile.am,v 1.43 2006/01/14 20:03:39 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -51,19 +51,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure docs: gutenprint-stamp cd developer; $(MAKE) - cd users_guide; $(MAKE) ps: $(MANUAL).ps cd developer; $(MAKE) ps - cd users_guide; $(MAKE) ps pdf: $(MANUAL).pdf cd developer; $(MAKE) pdf - cd users_guide; $(MAKE) pdf html: cd developer; $(MAKE) html - cd users_guide; $(MAKE) html + +install-data-local: gutenprint-options + $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc + $(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc ## Clean @@ -83,6 +83,7 @@ EXTRA_DIST = \ gutenprint \ gutenprintui2 \ gutenprint-stamp \ - gutenprintui2-stamp + gutenprintui2-stamp \ + gutenprint-options .PHONY: html ps pdf docs diff --git a/doc/Makefile.in b/doc/Makefile.in index 9f5d134..7a73fdd 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ @@ -321,7 +324,8 @@ EXTRA_DIST = \ gutenprint \ gutenprintui2 \ gutenprint-stamp \ - gutenprintui2-stamp + gutenprintui2-stamp \ + gutenprint-options all: all-recursive @@ -592,7 +596,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-data-local install-exec-am: @@ -624,10 +628,10 @@ uninstall-info: uninstall-info-recursive ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-recursive distclean-tags distdir \ dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ + install-data install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ maintainer-clean-local maintainer-clean-recursive mostlyclean \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ @@ -671,19 +675,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure docs: gutenprint-stamp cd developer; $(MAKE) - cd users_guide; $(MAKE) ps: $(MANUAL).ps cd developer; $(MAKE) ps - cd users_guide; $(MAKE) ps pdf: $(MANUAL).pdf cd developer; $(MAKE) pdf - cd users_guide; $(MAKE) pdf html: cd developer; $(MAKE) html - cd users_guide; $(MAKE) html + +install-data-local: gutenprint-options + $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc + $(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc maintainer-clean-local: $(RM) -r gutenprint diff --git a/doc/README.maintaining b/doc/README.maintaining index 4d3c8da..3bfa6ec 100644 --- a/doc/README.maintaining +++ b/doc/README.maintaining @@ -49,7 +49,7 @@ something that you would like covering, please let me know! -- Roger Leigh - $Id: README.maintaining,v 1.20 2005/11/21 20:06:30 rleigh Exp $ + $Id: README.maintaining,v 1.21 2005/12/29 00:41:23 rleigh Exp $ 1. Setting up the autotools @@ -66,7 +66,7 @@ v. GNU make (any recent version) and also -vi. pkg-config (at least 0.15.0) +vi. pkg-config (at least 0.18.0) GNU autoconf made some incompatible changes between the 2.13 and 2.50 stable releases. You cannot use a configure.in written for 2.13 with diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in index 2a98d84..4a01053 100644 --- a/doc/developer/Makefile.in +++ b/doc/developer/Makefile.in @@ -271,10 +271,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf index 4d8ad0a..ae94158 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..8c8b39c --- /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..3a40313 100644 --- a/doc/developer/reference-html/c1717.html +++ b/doc/developer/reference-html/c1717.html @@ -1,4 +1,4 @@ - + <LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Appropriate Remote Commands" HREF="x1669.html"><LINK REL="NEXT" TITLE="Weaving algorithms" -HREF="x1734.html"></HEAD +HREF="x1734.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -73,18 +70,37 @@ NAME="AEN1717" ></A >Chapter 6. Weaving for inkjet printers</H1 ><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="c1717.html#AEN1719" +>Introduction</A +></DT +><DT +><A +HREF="x1734.html" +>Weaving algorithms</A +></DT +></DL +></DIV +><DIV CLASS="sect1" ><H1 CLASS="sect1" ><A NAME="AEN1719" ->6.1. Introduction</A +>Introduction</A ></H1 ><P > 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" ><P > 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. </P ><P > Older Epson printers had a mode called MicroWeave<SUP ->™</SUP +>â„¢</SUP >. 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" ><P > 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. </P @@ -240,7 +256,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/c194.html b/doc/developer/reference-html/c194.html index 5ed6bd7..40d250a 100644 --- a/doc/developer/reference-html/c194.html +++ b/doc/developer/reference-html/c194.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Integrating libgutenprint" HREF="x79.html"><LINK REL="NEXT" TITLE="Adding a new printer" -HREF="c200.html"></HEAD +HREF="c200.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -129,7 +126,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/c1968.html b/doc/developer/reference-html/c1968.html index e03ce26..6604cc4 100644 --- a/doc/developer/reference-html/c1968.html +++ b/doc/developer/reference-html/c1968.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Weaving algorithms" HREF="x1734.html"><LINK REL="NEXT" TITLE="GNU General Public License" -HREF="a2122.html"></HEAD +HREF="gpl.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -56,7 +53,7 @@ WIDTH="10%" ALIGN="right" VALIGN="bottom" ><A -HREF="a2122.html" +HREF="gpl.html" ACCESSKEY="N" >Next</A ></TD @@ -149,7 +146,7 @@ CLASS="literal" ><P > 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" </P ><P > 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" </P ><P > 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" </P ><P > 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" ></LI ><LI ><P -> 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. </P @@ -485,16 +482,16 @@ CLASS="emphasis" ></LI ><LI ><P -> 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. </P ></LI @@ -915,7 +912,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD @@ -924,7 +921,7 @@ WIDTH="33%" ALIGN="right" VALIGN="top" ><A -HREF="a2122.html" +HREF="gpl.html" ACCESSKEY="N" >Next</A ></TD diff --git a/doc/developer/reference-html/c200.html b/doc/developer/reference-html/c200.html index cd26eae..a995e70 100644 --- a/doc/developer/reference-html/c200.html +++ b/doc/developer/reference-html/c200.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Reporting Bugs" HREF="c194.html"><LINK REL="NEXT" TITLE="The driver file" -HREF="x271.html"></HEAD +HREF="x271.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -72,6 +69,28 @@ CLASS="chapter" NAME="AEN200" ></A >Chapter 4. Adding a new printer</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="c200.html#AEN217" +><TT +CLASS="filename" +>printers.xml</TT +></A +></DT +><DT +><A +HREF="x271.html" +>The driver file</A +></DT +></DL +></DIV ><P > 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" ><A NAME="AEN217" ->4.1. <TT +><TT CLASS="filename" >printers.xml</TT ></A @@ -155,6 +174,12 @@ CLASS="informalexample" ><A NAME="AEN223" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" ><printer name="EPSON Stylus Color 1500" driver="escp2-1500"> @@ -163,6 +188,9 @@ CLASS="programlisting" <gamma value="0.597"/> <density value="1.0"/> </printer></PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -325,7 +353,7 @@ CLASS="literal" > 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. </P ></DD @@ -358,7 +386,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/c39.html b/doc/developer/reference-html/c39.html index 3021576..1b6ce3e 100644 --- a/doc/developer/reference-html/c39.html +++ b/doc/developer/reference-html/c39.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Preface" HREF="f14.html"><LINK REL="NEXT" TITLE="Using libgutenprint" -HREF="c48.html"></HEAD +HREF="c48.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -114,7 +111,7 @@ CLASS="emphasis" ><P > Gutenprint is licensed under the terms of the GNU General Public License (GPL), reproduced in <A -HREF="a2122.html" +HREF="gpl.html" >Appendix A</A >. </P @@ -144,7 +141,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/c464.html b/doc/developer/reference-html/c464.html index cb3bede..059dc9a 100644 --- a/doc/developer/reference-html/c464.html +++ b/doc/developer/reference-html/c464.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="The driver file" HREF="x271.html"><LINK REL="NEXT" TITLE="Remote Mode Commands" -HREF="x955.html"></HEAD +HREF="x955.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -72,6 +69,30 @@ CLASS="chapter" NAME="AEN464" ></A >Chapter 5. ESC/P2</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="c464.html#AEN477" +>Standard commands</A +></DT +><DT +><A +HREF="x955.html" +>Remote Mode Commands</A +></DT +><DT +><A +HREF="x1669.html" +>Appropriate Remote Commands</A +></DT +></DL +></DIV ><P > This is a description of the ESC/P2 raster commands used by the Gutenprint printer driver, which is a subset of the complete @@ -100,10 +121,10 @@ CLASS="literal" 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 - ‘<TT + ‘<TT CLASS="literal" >(</TT ->’ (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. @@ -133,7 +154,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN477" ->5.1. Standard commands</A +>Standard commands</A ></H1 ><P ></P @@ -281,7 +302,7 @@ CLASS="varname" <CODE CLASS="constant" >2</CODE ->; in 1440×720 DPI mode, +>; in 1440×720 DPI mode, <CODE CLASS="varname" >PAGEUNIT</CODE @@ -376,7 +397,7 @@ CLASS="constant" printers, this is used to turn on microweave; on newer printers, it prints one row at a time. All printers support this mode. It should only be used at 720 (or - 1440×720) DPI. The Epson Stylus Pro series + 1440×720) DPI. The Epson Stylus Pro series indicates additional modes: </P ><P @@ -391,7 +412,7 @@ CLASS="constant" ></DT ><DD ><P -> “Full-overlap” +> “Full-overlap†</P ></DD ><DT @@ -401,7 +422,7 @@ CLASS="constant" ></DT ><DD ><P -> “Four-pass” +> “Four-pass†</P ></DD ><DT @@ -411,7 +432,7 @@ CLASS="constant" ></DT ><DD ><P -> “Full-overlap 2” +> “Full-overlap 2†</P ></DD ></DL @@ -552,7 +573,7 @@ CLASS="varname" ></DT ><DD ><P -> Set the length of the page in “pageunits” +> Set the length of the page in “pageunits†(see <TT CLASS="literal" >ESC (U</TT @@ -595,7 +616,7 @@ CLASS="varname" ><DD ><P > Set the vertical page margins of the page in - “pageunits” (see <TT + “pageunits†(see <TT CLASS="literal" >ESC (U</TT > @@ -625,7 +646,7 @@ CLASS="varname" ><DD ><P > Set the width and length of the printed page region in - “pageunits” (see <TT + “pageunits†(see <TT CLASS="literal" >ESC (U</TT > @@ -660,7 +681,7 @@ CLASS="varname" CLASS="varname" >ADVANCE</CODE > - “vertical units” (see <TT + “vertical units†(see <TT CLASS="literal" >ESC (U</TT @@ -696,7 +717,7 @@ CLASS="varname" CLASS="varname" >ADVANCE</CODE > - “vertical units” (see <TT + “vertical units†(see <TT CLASS="literal" >ESC (U</TT @@ -800,7 +821,7 @@ CLASS="varname" >OFFSET</CODE > from the previous print head position, measured in - “horizontal units” (see <TT + “horizontal units†(see <TT CLASS="literal" >ESC (U</TT @@ -1037,7 +1058,7 @@ CLASS="constant" ></TD ><TD > TIFF compression (incorrectly documented as - “run length encoded”) + “run length encodedâ€) </TD ></TR ><TR @@ -1070,7 +1091,7 @@ CLASS="constant" <CODE CLASS="constant" >40</CODE -> (8 × 5}). On some other +> (8 × 5}). On some other printers, it varies. </P ><P @@ -1283,7 +1304,7 @@ CLASS="constant" >16</CODE ></TD ><TD ->Gray (“light black”)</TD +>Gray (“light blackâ€)</TD ></TR ><TR ><TD @@ -1358,7 +1379,7 @@ CLASS="constant" ></TD ><TD > TIFF compression (incorrectly documented as - “run length encoded”) + “run length encodedâ€) </TD ></TR ><TR @@ -1369,7 +1390,7 @@ CLASS="constant" ></TD ><TD > TIFF compression with a special command set, or - “run length encoding 2” on some + “run length encoding 2†on some printers. </TD ></TR @@ -1387,7 +1408,7 @@ CLASS="varname" CLASS="varname" >BYTES</CODE > is the number of bytes wide for - each row (ceiling(BITS × width_of_row, 8)}). Note + each row (ceiling(BITS × width_of_row, 8)}). Note that this is different from the <TT CLASS="literal" >ESC .</TT @@ -1456,11 +1477,11 @@ CLASS="varname" >VERTICAL</CODE > is the distance in these units between printed rows; it should be - ((separation_in_nozzles × <CODE + ((separation_in_nozzles × <CODE CLASS="varname" >BASE</CODE > - ÷ 720). + ÷ 720). </P ><P > <CODE @@ -1468,8 +1489,8 @@ CLASS="varname" >HORIZONTAL</CODE > 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. @@ -1486,7 +1507,7 @@ CLASS="varname" ></DT ><DD ><P -> 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. @@ -1514,6 +1535,12 @@ CLASS="informalexample" ><A NAME="AEN937" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >@EJL ID\r @@ -1523,6 +1550,9 @@ MDL:[printer model]; CLS:PRINTER; DES:EPSON [printer model]; \f</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1548,10 +1578,19 @@ CLASS="informalexample" ><A NAME="AEN941" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >ESC 01@EJL[space]1284.4[newline]@EJL[space][space][space][space] [space][newline]ESC@</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1565,6 +1604,12 @@ CLASS="informalexample" ><A NAME="AEN944" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >magic command @@ -1582,6 +1627,9 @@ ESC (c ESC (S ESC (D (if needed) ESC (V (optional -- this can be accomplished with ESC (v)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1595,9 +1643,18 @@ CLASS="informalexample" ><A NAME="AEN947" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >ESC (v</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1611,12 +1668,21 @@ CLASS="informalexample" ><A NAME="AEN950" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1630,10 +1696,19 @@ CLASS="informalexample" ><A NAME="AEN953" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >[formfeed] (0C hex) ESC @</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1664,7 +1739,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/c48.html b/doc/developer/reference-html/c48.html index 3e4767b..907e61a 100644 --- a/doc/developer/reference-html/c48.html +++ b/doc/developer/reference-html/c48.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="Copying, modification and redistribution" HREF="c39.html"><LINK REL="NEXT" TITLE="Linking with libgutenprint" -HREF="x67.html"></HEAD +HREF="x67.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="chapter" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -72,6 +69,30 @@ CLASS="chapter" NAME="AEN48" ></A >Chapter 2. Using libgutenprint</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="c48.html#AEN51" +>Code prerequisites</A +></DT +><DT +><A +HREF="x67.html" +>Linking with libgutenprint</A +></DT +><DT +><A +HREF="x79.html" +>Integrating libgutenprint</A +></DT +></DL +></DIV ><P > This chapter describes how to write programs that use libgutenprint. @@ -82,7 +103,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN51" ->2.1. Code prerequisites</A +>Code prerequisites</A ></H1 ><P > To use libgutenprint with a program, several steps must be taken: @@ -100,9 +121,18 @@ CLASS="informalexample" ><A NAME="AEN57" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" ><gimp-print/gimp-print.h></PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -135,6 +165,12 @@ CLASS="informalexample" ><A NAME="AEN65" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >#include <gimp-print/gimp-print.h> @@ -145,6 +181,9 @@ main (int argc, char *argv[]) return 0; } </PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -175,7 +214,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/docbook.css b/doc/developer/reference-html/docbook.css new file mode 100644 index 0000000..0f90516 --- /dev/null +++ b/doc/developer/reference-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/developer/reference-html/f14.html b/doc/developer/reference-html/f14.html index 203891e..b9e5ab2 100644 --- a/doc/developer/reference-html/f14.html +++ b/doc/developer/reference-html/f14.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,20 +8,17 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="PREVIOUS" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="NEXT" TITLE="Copying, modification and redistribution" -HREF="c39.html"></HEAD +HREF="c39.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="preface" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -42,7 +39,7 @@ WIDTH="10%" ALIGN="left" VALIGN="bottom" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="P" >Prev</A ></TD @@ -80,7 +77,7 @@ NAME="AEN14" on a par with proprietary vendor-supplied drivers in many cases, and can be used for many of the most demanding printing tasks, especially for high quality printing on modern inkjets, including - “photographic quality” models which offer very high + “photographic quality†models which offer very high resolutions and several inks. The core of Gutenprint is a shared library (libgutenprint) which may be used by any program that wishes to produce high-quality printed output. @@ -161,7 +158,7 @@ CLASS="command" > <P CLASS="literallayout" >We hope you enjoy using Gutenprint!<br> -—The Gutenprint project<br> +—The Gutenprint project<br>     </P > </P @@ -182,7 +179,7 @@ WIDTH="33%" ALIGN="left" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="P" >Prev</A ></TD @@ -191,7 +188,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/gpl-terms.html b/doc/developer/reference-html/gpl-terms.html new file mode 100644 index 0000000..a457062 --- /dev/null +++ b/doc/developer/reference-html/gpl-terms.html @@ -0,0 +1,588 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML +><HEAD +><TITLE +>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..ccdc927 --- /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..cf959ef --- /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..9f290fe 100644 --- a/doc/developer/reference-html/x1669.html +++ b/doc/developer/reference-html/x1669.html @@ -1,4 +1,4 @@ - + <LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="ESC/P2" HREF="c464.html"><LINK @@ -17,14 +17,11 @@ TITLE="Remote Mode Commands" HREF="x955.html"><LINK REL="NEXT" TITLE="Weaving for inkjet printers" -HREF="c1717.html"></HEAD +HREF="c1717.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,7 +71,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN1669" ->5.3. Appropriate Remote Commands</A +>Appropriate Remote Commands</A ></H1 ><P > All of the remote commands described above are wrapped up with @@ -82,7 +79,7 @@ NAME="AEN1669" <TT CLASS="literal" >00 00 00</TT -> and the “magic” +> and the “magic†command described above, then two <TT CLASS="literal" >ESC @</TT @@ -135,7 +132,7 @@ CLASS="literal" ></LI ><LI ><P -> If the user said “realign”, meaning he isn't +> If the user said “realignâ€, meaning he isn't done yet, go to step 1. </P ></LI @@ -160,6 +157,12 @@ CLASS="informalexample" ><A NAME="AEN1693" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >PM 00 00 @@ -167,6 +170,9 @@ SN 00 00 00 EX 00 00 00 00 05 01 ST 00 01 SM 00 02</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -180,6 +186,12 @@ CLASS="informalexample" ><A NAME="AEN1696" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -202,10 +217,19 @@ CLASS="informalexample" ><A NAME="AEN1699" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >IR 00 02 LD</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -223,13 +247,13 @@ CLASS="literal" CLASS="literal" >SN</TT > command above; - the arguments to the second (“platen gap”) are + the arguments to the second (“platen gapâ€) are <TT CLASS="literal" >00 01 01</TT -> for thick papers (“matte - paper—heavyweight”, “photo paper” and - “premium glossy photo paper”) and <TT +> for thick papers (“matte + paper—heavyweightâ€, “photo paper†and + “premium glossy photo paperâ€) and <TT CLASS="literal" >00 01 00</TT @@ -306,7 +330,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/x1734.html b/doc/developer/reference-html/x1734.html index 8c52bfd..1a3623a 100644 --- a/doc/developer/reference-html/x1734.html +++ b/doc/developer/reference-html/x1734.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,7 +8,7 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="Weaving for inkjet printers" HREF="c1717.html"><LINK @@ -17,14 +17,11 @@ TITLE="Weaving for inkjet printers" HREF="c1717.html"><LINK REL="NEXT" TITLE="Dithering" -HREF="c1968.html"></HEAD +HREF="c1968.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,11 +71,11 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN1734" ->6.2. Weaving algorithms</A +>Weaving algorithms</A ></H1 ><P > 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" ><P > 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â€. </P ><P > Yet another complication is how to get near the top and bottom @@ -128,7 +125,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN1740" ->6.2.1. Simple weaving algorithms</A +>Simple weaving algorithms</A ></H2 ><P > The initial problem is to calculate the starting position of @@ -141,12 +138,12 @@ NAME="AEN1740" </P ><P > 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. </P ><P > 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: </P ><DIV @@ -170,6 +167,12 @@ CLASS="informalexample" ><A NAME="AEN1747" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -204,7 +210,7 @@ CLASS="computeroutput" CLASS="computeroutput" >0</SAMP > 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: </P @@ -226,6 +232,12 @@ CLASS="informalexample" ><A NAME="AEN1754" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *---*---*---*---*---*---* @@ -240,12 +252,15 @@ CLASS="screen" 9 *---*---*---*---*---* 10 *---*---*---*---*--- 11 *---*---*---*---*--</PRE +></TD +></TR +></TABLE ><P ></P ></DIV ><P > (Now you can see why this process is called - “weaving”!) + “weavingâ€!) </P ></DIV ><DIV @@ -254,7 +269,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN1757" ->6.2.2. Perfect weaving</A +>Perfect weaving</A ></H2 ><P > This simple weave pattern prints every row, but will give @@ -271,15 +286,15 @@ NAME="AEN1757" each pass as possible. </P ><P -> 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. </P ><P -> Here's what this “perfect” weave looks like: +> Here's what this “perfect†weave looks like: </P ><DIV CLASS="informalexample" @@ -288,6 +303,12 @@ CLASS="informalexample" ><A NAME="AEN1763" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start of full weave @@ -304,13 +325,16 @@ CLASS="screen" 9 *---*---*---*-- 10 *---*--- 11 *</PRE +></TD +></TR +></TABLE ><P ></P ></DIV ><P > 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: </P ><DIV @@ -320,9 +344,18 @@ CLASS="informalexample" ><A NAME="AEN1766" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ->start = (S − 1) × (J − 1)</PRE +>start = (S − 1) × (J − 1)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -341,8 +374,14 @@ CLASS="informalexample" NAME="AEN1770" ></A ><P -> S = 2, J = 7, start = (2−1) × (7−1) = 6: +> S = 2, J = 7, start = (2−1) × (7−1) = 6: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > starting row of full weave @@ -355,6 +394,9 @@ CLASS="screen" 5 *-*-*-*-*-*-* 6 *-*-*-*-*-*-* 7 *-*-*-*-*-*-*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -368,6 +410,12 @@ NAME="AEN1773" ><P > S = 7, J = 2, start = 6: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -382,6 +430,9 @@ CLASS="screen" 7 *------* 8 *------* 9 *------*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -395,6 +446,12 @@ NAME="AEN1776" ><P > S = 4, J = 13, start = 36: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -405,6 +462,9 @@ CLASS="screen" 3 *---*---*---*---*---*---*---*---*---*-- 4 *---*---*---*---*---*---*- 5 *---*---*---*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -418,6 +478,12 @@ NAME="AEN1779" ><P > S = 13, J = 4, start = 36: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -442,6 +508,9 @@ CLASS="screen" 17 *--------- 18 *----- 19 *-</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -455,6 +524,12 @@ NAME="AEN1782" ><P > S = 8, J = 5, start = 28: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -475,6 +550,9 @@ CLASS="screen" 13 *-------*---- 14 *------- 15 *--</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -488,6 +566,12 @@ NAME="AEN1785" ><P > S = 9, J = 5, start = 32: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -508,6 +592,9 @@ CLASS="screen" 13 *--------*--- 14 *------- 15 *--</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -521,6 +608,12 @@ NAME="AEN1788" ><P > S = 6, J = 7, start = 30: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > start @@ -537,6 +630,9 @@ CLASS="screen" 9 *-----*-----*-- 10 *-----*- 11 *</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -547,7 +643,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN1791" ->6.2.3. Weaving collisions</A +>Weaving collisions</A ></H2 ><P > A perfect weave is not possible in all cases. Let's look at @@ -563,6 +659,12 @@ NAME="AEN1794" ><P > S = 6, J = 4: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----*-----*-----* @@ -573,6 +675,9 @@ CLASS="screen" 5 | ^ | *-^---*-----*-----* OUCH! ^ | ^ | |</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -589,9 +694,18 @@ CLASS="informalexample" ><A NAME="AEN1798" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ->row(p, j) = (p × J) + (j × S)</PRE +>row(p, j) = (p × J) + (j × S)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -606,10 +720,19 @@ CLASS="informalexample" ><A NAME="AEN1801" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ->row(0, 2) = (0 × 4) + (2 × 6) = 12 -row(3, 0) = (3 × 4) + (0 × 6) = 12</PRE +>row(0, 2) = (0 × 4) + (2 × 6) = 12 +row(3, 0) = (3 × 4) + (0 × 6) = 12</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -636,6 +759,12 @@ NAME="AEN1806" ><P > S = 6, J = 4: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----*-----*-----* @@ -644,6 +773,9 @@ CLASS="screen" 3 ^-----^-----*-----* 4 ^-----^-----*-----* 5 ^-----^-----*-----*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -654,7 +786,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN1809" ->6.2.4. What makes a “perfect” weave?</A +>What makes a “perfect†weave?</A ></H2 ><P > So what causes the perfect weave cases to be perfect, and @@ -743,6 +875,12 @@ CLASS="informalexample" ><A NAME="AEN1836" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >unsigned int @@ -757,6 +895,9 @@ gcd(unsigned int x, unsigned int y) } return y; }</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -768,7 +909,7 @@ CLASS="literal" weaving algorithm. </P ><P -> 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" ><P > S = 8, J = 6, G = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-------*-------*-------*-------*-------* @@ -791,6 +938,9 @@ CLASS="screen" 3 *-------*-------*-------*-------*-------* 4 ^-------^-------^-------*-------*-------* 5 ^-------^-------^-------*-------*-------*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -812,6 +962,12 @@ CLASS="informalexample" ><A NAME="AEN1846" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-------*-------* - - - @@ -820,6 +976,9 @@ CLASS="screen" 3 *-------*-------* - - - 4 *-------*-------* - - - 5 *-------*-------* - - -</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -834,6 +993,12 @@ CLASS="informalexample" ><A NAME="AEN1849" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-------*-------* - - - @@ -844,6 +1009,9 @@ CLASS="screen" 5 *-------*-------* - - - ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ These rows need filling in.</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -857,19 +1025,19 @@ CLASS="computeroutput" </P ><P > 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). </P ><P -> 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. </P @@ -877,7 +1045,7 @@ CLASS="computeroutput" > 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. </P @@ -894,6 +1062,12 @@ NAME="AEN1857" ><P > S = 6, J = 9, G = 3, C = S / G = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----*-----*-----*-----*-----*-----*-----*-----* @@ -904,11 +1078,14 @@ CLASS="screen" 5 ^-----^-----^-----^-----^-----^-- ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ These rows need filling in.</PRE +></TD +></TR +></TABLE ><P ></P ></DIV ><P -> 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" ><P > S = 9, J = 6, G = 3, C = 3: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > 0 *--------*--------*--------*--------*--------* @@ -931,6 +1114,9 @@ CLASS="screen" 3 ^--------^--------^--------^--------*--------* 4 ^--------^--------^--------^--------*--------* 5 ^--------^--------^--------^--------*--------*</PRE +></TD +></TR +></TABLE ><P > 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" ><P > S = 7, J = 2, G = 1: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > imaginary extra jet @@ -982,25 +1174,28 @@ CLASS="screen" 7 *------* <--start of pass block 1 8 *------* 9 *------*</PRE +></TD +></TR +></TABLE ><P ></P ></DIV ><P > 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. </P ><P > 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. </P ><P -> 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). </P ><P @@ -1045,6 +1240,12 @@ NAME="AEN1878" ><P > S = 6, J = 9, G = 3, B = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1073,6 +1277,12 @@ NAME="AEN1881" ><P > S = 9, J = 6, G = 3, B = 3: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *--------*--------*--------*--------*--------* @@ -1088,6 +1298,9 @@ CLASS="screen" 10 \---/ *--------*-------- 11 small offset *--------*-- 12 *----</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1107,6 +1320,12 @@ NAME="AEN1885" ><P > S = 8, J = 4, G = 4, B = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-------*-------*-------* @@ -1120,6 +1339,9 @@ CLASS="screen" 8 *-------*-------*-------* 9 \/ *-------*-------*-------* very small offset!</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1134,6 +1356,12 @@ CLASS="informalexample" ><A NAME="AEN1889" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >subblock number @@ -1148,6 +1376,9 @@ CLASS="screen" 1 * 2 * 3 *</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1168,10 +1399,19 @@ CLASS="informalexample" ><A NAME="AEN1893" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >offset(b) = 2*b , if b < ceiling(G/2) = 2*(G-b)-1 , otherwise</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1185,6 +1425,12 @@ CLASS="informalexample" ><A NAME="AEN1896" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0123456789 @@ -1208,6 +1454,9 @@ CLASS="screen" 7 * 8 * 9 *</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1221,6 +1470,12 @@ CLASS="informalexample" ><A NAME="AEN1899" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" > 1 @@ -1247,6 +1502,9 @@ CLASS="screen" 8 * 9 * 10 *</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1263,6 +1521,12 @@ NAME="AEN1902" ><P > S = 12, J = 6, G = 6, B = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----------*-----------*-----------*-----------*-----------* @@ -1278,6 +1542,9 @@ CLASS="screen" 10 *-----------*---- 11 *---------- 12 *-----</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1289,7 +1556,7 @@ CLASS="screen" > (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" ><A NAME="AEN1909" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >passesperblock = S @@ -1330,6 +1603,9 @@ if subpassblock < ceiling(subblocksperblock/2) else subblockoffset = 2*(subblocksperblock-subpassblock)-1 startingrow = passblock * S * J + offsetinpassblock * J + subblockoffset</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1345,6 +1621,12 @@ CLASS="informalexample" ><A NAME="AEN1912" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >subblocksperblock = gcd(S, J) @@ -1354,6 +1636,9 @@ if subpassblock * 2 < subblocksperblock else subblockoffset = 2*(subblocksperblock-subpassblock)-1 startingrow = p * J + subblockoffset</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1367,6 +1652,12 @@ CLASS="informalexample" ><A NAME="AEN1915" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P ></P ></DIV ><P -> 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" ><A NAME="AEN1918" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >subblocksperblock = gcd(S, J) subblockoffset = r % subblocksperblock pass = (r - subblockoffset) / J</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1416,6 +1719,12 @@ CLASS="informalexample" ><A NAME="AEN1921" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >offset = r % J @@ -1426,6 +1735,9 @@ pass-- offset += J } jet = offset / S</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1440,6 +1752,12 @@ CLASS="informalexample" ><A NAME="AEN1924" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1478,6 +1799,12 @@ NAME="AEN1927" passesperblock = S = 6, passespersubblock = S / G = 6 / 2 = 3: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----*-----*-----* @@ -1500,6 +1827,9 @@ CLASS="screen" 17 *-----*-- 18 *----- 19 *-</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1515,6 +1845,12 @@ NAME="AEN1930" passesperblock = S = 8, passespersubblock= S / G = 8 / 2 = 4: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-------*-------*-------*-------*-------* @@ -1530,6 +1866,9 @@ CLASS="screen" 10 *-------*-------*- 11 *-------*--- 12 *----</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1545,6 +1884,12 @@ NAME="AEN1933" passesperblock = S = 6, passespersubblock= S / G = 6 / 6 = 1: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*-----* @@ -1554,6 +1899,9 @@ CLASS="screen" 4 *-----*-----*-----*-----*-- 5 *-----*-----*---- 6 *-----</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1572,7 +1920,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN1937" ->6.2.5. Oversampling</A +>Oversampling</A ></H2 ><P > 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" ><P > 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. </P ><P > 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â€). </P ><P > 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. </P ><P @@ -1654,6 +2002,12 @@ NAME="AEN1946" passesperblock = S = 4, passespersubblock = S/G = 4/1 = 4: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >0 *---*---*---*---*---*---*---*---*---* @@ -1672,6 +2026,9 @@ CLASS="screen" 13 *---*---*---* 14 *---*--- 15 *--</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1683,7 +2040,7 @@ CLASS="screen" CLASS="computeroutput" >*</SAMP >s - with integers in the range [0…H−1]. + with integers in the range [0…H−1]. </P ><P > Overprinting occurs once per pass block, so we can simply @@ -1698,6 +2055,12 @@ CLASS="informalexample" ><A NAME="AEN1952" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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--</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1732,6 +2098,12 @@ NAME="AEN1954" passesperblock= S = 4, passespersubblock= S/G = 4/2 = 2: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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-</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1770,6 +2145,12 @@ NAME="AEN1958" passesperblock = S = 4, passespersubblock = S/G = 4/1 = 4 </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >Band 0: @@ -1790,6 +2171,9 @@ Band 1: 12 1---1---1---1- 13 1---1---1 14 1---</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1804,6 +2188,12 @@ CLASS="informalexample" ><A NAME="AEN1962" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1829,6 +2222,12 @@ CLASS="informalexample" ><A NAME="AEN1965" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >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</PRE +></TD +></TR +></TABLE ><P -> To be continued… +> To be continued… </P ><P ></P @@ -1880,7 +2282,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/x2153.html b/doc/developer/reference-html/x2153.html deleted file mode 100644 index 4ccc109..0000000 --- a/doc/developer/reference-html/x2153.html +++ /dev/null @@ -1,616 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> -<HTML -><HEAD -><TITLE ->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..6be31a9 100644 --- a/doc/developer/reference-html/x271.html +++ b/doc/developer/reference-html/x271.html @@ -1,4 +1,4 @@ - + <LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="Adding a new printer" HREF="c200.html"><LINK @@ -17,14 +17,11 @@ TITLE="Adding a new printer" HREF="c200.html"><LINK REL="NEXT" TITLE="ESC/P2" -HREF="c464.html"></HEAD +HREF="c464.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,7 +71,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN271" ->4.2. The driver file</A +>The driver file</A ></H1 ><P > 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. </P @@ -128,7 +125,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN281" ->4.2.1. Epson inkjet printers</A +>Epson inkjet printers</A ></H2 ><P > The <CODE @@ -167,6 +164,12 @@ CLASS="informalexample" ><A NAME="AEN291" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >typedef struct escp2_printer @@ -242,6 +245,9 @@ const double *hue_adjustment; const double *sat_adjustment; const paperlist_t *paperlist; } escp2_printer_t;</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -477,14 +483,14 @@ CLASS="emphasis" ><P > 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. </P ><P > For the dot sizes, the value for each element in the vector @@ -581,28 +587,28 @@ CLASS="constant" CLASS="constant" >0x10</CODE > usually works best at - 1440×720 and <CODE + 1440×720 and <CODE CLASS="constant" >0x11</CODE > works best at - 720×720. Unfortunately, <CODE + 720×720. Unfortunately, <CODE CLASS="constant" >0x10</CODE > 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… </P ><P > 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 <CODE CLASS="constant" >0.5</CODE >, 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. </P ><P > 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 <CODE CLASS="constant" >1</CODE @@ -804,7 +810,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN403" ->4.2.2. Tuning the printer</A +>Tuning the printer</A ></H2 ><P > 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" ><A NAME="AEN433" ->4.2.3. Canon inkjet printers</A +>Canon inkjet printers</A ></H2 ><P > Basically, a new Canon printer can be added to @@ -1012,8 +1018,8 @@ CLASS="filename" differences are noted here. </P ><P -> 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" ><A NAME="AEN440" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >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;</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1060,11 +1075,11 @@ canon_variable_inklist_t *inxs; /* Choices of inks for this printer */ > Since there are Canon printers which print in resolutions of 2<SUP >n</SUP -> × 150 DPI (e.g. 300, 600, +> × 150 DPI (e.g. 300, 600, 1200) and others which support resolutions of 2<SUP >n</SUP -> × 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 <SPAN CLASS="type" @@ -1128,6 +1143,12 @@ CLASS="informalexample" ><A NAME="AEN458" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >static const canon_variable_inklist_t canon_ink_myinks[] = @@ -1143,6 +1164,9 @@ CLASS="programlisting" &ci_CMYK_3, &ci_CMYK_3, &ci_CMYK_3, }, };</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1188,7 +1212,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/x67.html b/doc/developer/reference-html/x67.html index 425a70b..9130f98 100644 --- a/doc/developer/reference-html/x67.html +++ b/doc/developer/reference-html/x67.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,7 +8,7 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="Using libgutenprint" HREF="c48.html"><LINK @@ -17,14 +17,11 @@ TITLE="Using libgutenprint" HREF="c48.html"><LINK REL="NEXT" TITLE="Integrating libgutenprint" -HREF="x79.html"></HEAD +HREF="x79.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,7 +71,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN67" ->2.2. Linking with libgutenprint</A +>Linking with libgutenprint</A ></H1 ><P > To link a program with libgutenprint, the option @@ -89,6 +86,12 @@ CLASS="filename" > the following commands would be used: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ><SAMP @@ -105,6 +108,9 @@ CLASS="prompt" CLASS="userinput" >gcc -o stpimage -lgutenprint stpimage.o</KBD ></PRE +></TD +></TR +></TABLE ><P > 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" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/x79.html b/doc/developer/reference-html/x79.html index ac4968b..05f0608 100644 --- a/doc/developer/reference-html/x79.html +++ b/doc/developer/reference-html/x79.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,7 +8,7 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="Using libgutenprint" HREF="c48.html"><LINK @@ -17,14 +17,11 @@ TITLE="Linking with libgutenprint" HREF="x67.html"><LINK REL="NEXT" TITLE="Reporting Bugs" -HREF="c194.html"></HEAD +HREF="c194.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,7 +71,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN79" ->2.3. Integrating libgutenprint</A +>Integrating libgutenprint</A ></H1 ><P > This section describes how to integrate the compiling and @@ -102,7 +99,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN86" ->2.3.1. <B +><B CLASS="command" >pkg-config</B ></A @@ -152,6 +149,12 @@ CLASS="option" >--cflags</CODE > option: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ><SAMP @@ -162,6 +165,9 @@ CLASS="userinput" >pkg-config --cflags gutenprint</KBD > -I/usr/local/include</PRE +></TD +></TR +></TABLE ><P > The correct <CODE CLASS="varname" @@ -172,6 +178,12 @@ CLASS="option" >--libs</CODE > option: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ><SAMP @@ -182,6 +194,9 @@ CLASS="userinput" >pkg-config --libs gutenprint</KBD > -L/usr/local/lib -lgutenprint -lm -ldl</PRE +></TD +></TR +></TABLE ><P > Lastly, the installed version of Gutenprint can be obtained with the <CODE @@ -189,6 +204,12 @@ CLASS="varname" >--version</CODE > option: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ><SAMP @@ -199,10 +220,19 @@ CLASS="userinput" >pkg-config --modversion gutenprint</KBD > 4.3.23</PRE +></TD +></TR +></TABLE ><P > The command can be used from the shell by enclosing it in - backquotes ‘`’: + backquotes ‘`’: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" ><SAMP @@ -220,6 +250,9 @@ CLASS="userinput" >gcc `pkg-config --libs gutenprint` -o stpimage stpimage.o</KBD ></PRE +></TD +></TR +></TABLE ><P > However, this is not the way it it typically used. Normally it is used in a <TT @@ -238,7 +271,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN123" ->2.3.2. <B +><B CLASS="command" >make</B ></A @@ -259,11 +292,20 @@ CLASS="command" >make</B >: </P +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >GUTENPRINT_VERSION = $(shell pkg-config --version gutenprint) GUTENPRINT_CFLAGS = $(shell pkg-config --cflags gutenprint) GUTENPRINT_LIBS = $(shell pkg-config --libs gutenprint)</PRE +></TD +></TR +></TABLE ><P > How you choose to use these variables is entirely up to you. See the GNU <B @@ -279,7 +321,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN133" ->2.3.3. <B +><B CLASS="command" >autoconf</B ></A @@ -305,7 +347,7 @@ CLASS="filename" CLASS="command" >autoconf</B > expands - the m4 macros into ‘real’ shell script. The + the m4 macros into ‘real’ shell script. The resulting <B CLASS="command" >configure</B @@ -342,9 +384,18 @@ CLASS="informalexample" ><A NAME="AEN148" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >PKG_CHECK_MODULES(GUTENPRINT, gutenprint)</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -355,7 +406,7 @@ CLASS="sect2" CLASS="sect2" ><A NAME="AEN150" ->2.3.4. <B +><B CLASS="command" >automake</B ></A @@ -515,6 +566,12 @@ CLASS="informalexample" ><A NAME="AEN189" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="programlisting" >@SET_MAKE@ @@ -526,6 +583,9 @@ stpimage_SOURCES = stpimage.c stpimage_LDADD = $(GUTENPRINT_LIBS) MAINTAINERCLEANFILES = Makefile.in</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -567,7 +627,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/developer/reference-html/x955.html b/doc/developer/reference-html/x955.html index bc3f395..cd11971 100644 --- a/doc/developer/reference-html/x955.html +++ b/doc/developer/reference-html/x955.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <HTML ><HEAD ><TITLE @@ -8,7 +8,7 @@ NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REL="HOME" TITLE="The Developer's Guide to Gutenprint" -HREF="index.html"><LINK +HREF="book1.html"><LINK REL="UP" TITLE="ESC/P2" HREF="c464.html"><LINK @@ -17,14 +17,11 @@ TITLE="ESC/P2" HREF="c464.html"><LINK REL="NEXT" TITLE="Appropriate Remote Commands" -HREF="x1669.html"></HEAD +HREF="x1669.html"><META +http-equiv="Content-Type" +content="text/html; charset=UTF-8"></HEAD ><BODY CLASS="sect1" -BGCOLOR="#FFFFFF" -TEXT="#000000" -LINK="#0000FF" -VLINK="#840084" -ALINK="#0000FF" ><DIV CLASS="NAVHEADER" ><TABLE @@ -74,7 +71,7 @@ CLASS="sect1" CLASS="sect1" ><A NAME="AEN955" ->5.2. Remote Mode Commands</A +>Remote Mode Commands</A ></H1 ><P > The following description of remote commands comes out of an @@ -96,9 +93,18 @@ CLASS="informalexample" ><A NAME="AEN959" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >ESC (R BC=8 00 R E M O T E 1</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -113,9 +119,18 @@ CLASS="informalexample" ><A NAME="AEN962" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >ESC 00 00 00</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -187,8 +202,8 @@ CLASS="varname" ></DT ><DD ><P -> On my 740, prints the following, probably “version - information”: +> On my 740, prints the following, probably “version + informationâ€: </P ><DIV CLASS="informalexample" @@ -197,9 +212,18 @@ CLASS="informalexample" ><A NAME="AEN989" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >W01286 I02382\r\n</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -214,7 +238,7 @@ CLASS="varname" ></DT ><DD ><P -> Prints a “printer ID”. On one 870, prints the +> Prints a “printer IDâ€. On one 870, prints the following: </P ><DIV @@ -224,9 +248,18 @@ CLASS="informalexample" ><A NAME="AEN997" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >51-51-50-51-49-48\r\n</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -488,9 +521,18 @@ CLASS="informalexample" ><A NAME="AEN1089" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >IQ:KKCCMMYY</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -504,9 +546,18 @@ CLASS="informalexample" ><A NAME="AEN1092" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >IQ:KKCCMMYYccmm</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -660,7 +711,7 @@ CLASS="varname" CLASS="constant" >00</CODE > selects - the “Feed paper sequence setting”. + the “Feed paper sequence settingâ€. <CODE CLASS="varname" >yy</CODE @@ -844,9 +895,9 @@ CLASS="constant" CLASS="constant" >1</CODE > is - used when printing on “plain paper”, - “360dpi ink jet paper” or “ink jet - transparencies”, and + used when printing on “plain paperâ€, + “360dpi ink jet paper†or “ink jet + transparenciesâ€, and <CODE CLASS="varname" >yy</CODE @@ -944,8 +995,8 @@ CLASS="constant" paper. <CODE CLASS="varname" >yy</CODE -> selects “paper path - number”. +> selects “paper path + numberâ€. </P ></DD ><DT @@ -1017,7 +1068,7 @@ CLASS="varname" CLASS="constant" >00</CODE > sets the - drying time “per scan” (per pass?); + drying time “per scan†(per pass?); <CODE CLASS="varname" >xx</CODE @@ -1219,9 +1270,9 @@ CLASS="varname" CLASS="constant" >0x10</CODE > (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 <TT CLASS="literal" @@ -1269,8 +1320,8 @@ CLASS="varname" <TT CLASS="literal" >ST</TT -> command as “Set printer - state reply”. If <CODE +> command as “Set printer + state replyâ€. If <CODE CLASS="varname" >xx</CODE > is @@ -1306,6 +1357,12 @@ CLASS="informalexample" ><A NAME="AEN1341" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >@BDC ST\r @@ -1318,6 +1375,9 @@ AI:CW:02kkccmmyy, MI:mm [TC:tttt;] INK:...; \f</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1705,7 +1765,7 @@ CLASS="constant" ></TD ><TD > Black ink low (Photo black on printers using - UltraChrome® ink) + UltraChrome® ink) </TD ></TR ><TR @@ -1879,12 +1939,21 @@ CLASS="informalexample" ><A NAME="AEN1556" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >@BDC PS\r\nST:<CODE CLASS="varname" >xx</CODE >;\f</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1943,9 +2012,18 @@ CLASS="informalexample" ><A NAME="AEN1574" ></A +><TABLE +BORDER="0" +BGCOLOR="#E0E0E0" +WIDTH="100%" +><TR +><TD ><PRE CLASS="screen" >@BDC PS\r\nST:xx;\f</PRE +></TD +></TR +></TABLE ><P ></P ></DIV @@ -1986,7 +2064,7 @@ CLASS="varname" <CODE CLASS="varname" >y</CODE ->[1] … +>[1] … <CODE CLASS="varname" >y</CODE @@ -2255,7 +2333,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" ><A -HREF="index.html" +HREF="book1.html" ACCESSKEY="H" >Home</A ></TD diff --git a/doc/gutenprint-options b/doc/gutenprint-options new file mode 100644 index 0000000..b40401c --- /dev/null +++ b/doc/gutenprint-options @@ -0,0 +1,935 @@ +Basic Printer Options + + These options control basic printer functions. + + Printer Model + + Select the printer to use. It must be supplied in all + cases. + + Page Size + + Select the paper (media) size to print to. Some + printers support custom paper sizes, while others only + support certain preset sizes. + + Note that this option refers to the actual size of the + media, not the printable area. For example, selecting + A4 refers to actual A4 paper, whatever the margins may + be. + + Double-Sided Printing + + Otherwise known as "duplex" printing, this is offered + for printers capable of printing on both sides of the + page. In addition to single-sided printing, there are + two modes of duplex operation: the page may be flipped + over its long edge (like a book), or over the short + edge (like a note pad; this is sometimes referred to + as Tumble). + + Media Type + + Select the kind of paper or other media being printed + to. This enables the printer and driver to be set up + appropriately for the kind of paper in use. + + It is important to set the Media Type to the correct + value if possible, or if not to a closely related + medium. The printer may need to know what kind of + media is in use to determine how to feed the paper + correctly; the driver needs to know in order to select + the right output settings. + + Media Source + + Select the source of the paper or other media. This + option is offered with printers that have multiple + feeds, for example multiple paper bins, manual feed, + printing directly to a CD, etc. + + Ink Set + + Select the kind of ink in use in the printer, for + printers offering different optional inks (for + example, ink designed for matte paper vs. ink designed + for glossy paper). + + Borderless + + Select whether to print with borders or not, for + printers with the capability to overprint the page. + This is otherwise known as "full bleed". + + Enhanced Gloss + + Some newer printers have a cartridge of "gloss + enhancer", which helps solve the problem of pigment + inks having an inconsistent "luster" on glossy paper. + Use this option to enable use of the gloss enhancer. + + +Advanced Printer Options + + These options control more advanced printer-specific behaviors. + Generally it's not necessary to adjust these options. + + Resolution + + Select the resolution to print at (dots per inch). In + general, higher resolutions produce better quality, at + the expense of additional time. + + As a general rule of thumb, on laser printers and + older inkjet printers resolutions of 300 DPI or + thereabouts provide draft quality; lower resolutions + provide economy draft quality and cannot produce solid + black. Resolutions of 600 or 720 DPI produce good + quality output; higher resolutions are useful for very + high quality image or graphic output. Newer inkjet + printers, with smaller ink drop sizes, typically + require higher resolutions to produce acceptable + output; in some cases even 1440x720 DPI does not + produce good quality. + + Users of Epson inkjet printers have another setting + available: the Quality option can be used to + indirectly control the printer resolution, among other + things. This offers a simpler way to control output + quality. + + Ink Type + + Select which subset of inks to use for printing. For + example, on a photo printer with additional light cyan + and light magenta inks, it's possible to print with + only the standard cyan, magenta, yellow, and black + inks. + + Normally there is no reason to use any setting other + than the default. Reasons why one might want to use + it include: + + 1) Some black inks are not compatible with certain + glossy papers. If the black ink smudges on your + paper, you may elect to use an option without black + ink (a "composite" setting). + + 2) Some inks or paper/ink combinations produce color + shifts when the light inks are used. If your + chosen combination produces unacceptable color + shifts or color casts, you may prefer to use the + Four Color Standard option, which will generally + yield more consistent color at the expense of + "grainier" output. + + Printing Direction + + Most inkjet printers can print either unidirectionally + (the head prints only when moving in one direction) or + bidirectionally (the head prints when moving in both + directions). Bidirectional printing is generally + faster, since the printer is printing at all times + rather than wasting much of the time returning the + head to the starting position. On many printers, + however, unidirectional printing produces better + quality output than bidirectional printing. + + The standard setting for this option adapts to the + printing resolution. + + Laminate Pattern + + Some dye sublimation printers are able achieve better + durability of output by covering it with transparent + laminate surface. This surface can be of different + patterns: common are matte, glossy or texture. + + +Specialized Printer Options + + These options control unusual printer features. They may be + useful in certain circumstances. + + CD Hub Size + + This setting may be used on printers with the + capability to print directly to a CD. Depending upon + your choice of media, you may be able to safely print + all the way to the inner hole of the CD, or you may + not be able to print any closer than the hub about an + inch from the center. + + CD Horizontal Fine Adjustment + CD Vertical Fine Adjustment + + These settings allow you to shift the position of the + print while printing to a CD. If you find that your + print is not centered on the CD surface, you may need + to adjust these setting to compensate. + + Interleave Method + + Most inkjet printers create the printed image using + multiple overlapping passes of the print head. On + many printers this function is performed within the + printer itself and cannot be adjusted, but with many + Epson inkjet printers (and some others), this is + performed by the driver or may be specified to the + printer. One advantage of the multiple overlapping + passes is that it can hide small differences between + the individual print head nozzles, which would + otherwise be visible as banding. The different + interleave methods are different strategies for + for performing this overlapping; some are better at + hiding the banding than others. They all require the + same amount of time to print. + + Generally it is not necessary to adjust this; in some + cases, depending upon your printer, you may find that + one pattern or another performs better. + + On Epson Stylus Pro printers, this option allows + specifying different overlap patterns within the + printer. In this case, the choice of overlap pattern + may affect both the printing time and the quality to a + significant degree. + + Adjust dot size as necessary + + This option is provided on many Epson inkjet printers + to allow you to use larger ink drops than those + normally used for the resolution chosen. This may be + necessary if you use certain kinds of media or for + some reason wish to use much more ink (higher density) + than the default. It should not be necessary to use + this option. + + +Basic Output Controls + + Output Type + + This option specifies whether to print in color or + black and white/grayscale (using only black inks). + Black and white printing is generally faster than + color printing, even if the item being printed is + entirely black and white. However, printing with only + black ink may yield a "grainy" appearance. + + Color Correction + + This selects the choice of color correction method + within Gutenprint. The following options are offered: + + * DEFAULT: Select a color correction mode appropriate + for the document type being printed. + + * HIGH ACCURACY: Apply optimum color correction to the + output to produce the best color quality. This + corrects the hue, brightness, and saturation + (brilliance of color). This is the normal setting + to use for printing photographs or graphics if you + are not using any external color management. + + * BRIGHT COLORS: Apply color correction to the output, + but generate more brilliant colors in some cases. + + * CORRECT HUE ONLY: Apply color correction to the + output, but correct only the hue. This option does + not correct brightness and saturation. + + * UNCORRECTED: Do not apply any color correction to + the output beyond generating linear output. This is + the best setting to use when utilizing external + color management; the high accuracy modes employ + correction algorithms that may not work well with + color management. + + Note that if you use color management you should use + profiles created with Gutenprint and with the exact + settings that you plan to print with. Profiles + provided by the printer vendor are calibrated for + the vendor's driver, which may not be identical to + Gutenprint's calibration. + + * DESATURATED: Print in pure grayscale, but using + color inks. The result is somewhat different from + printing in black and white using the Output Type + option -- the driver may use color ink, which + generates smoother output and may yield better + results on many papers. + + * THRESHOLD: Convert all colors to fully on or fully + off, eliminating all gradual tonal gradations. The + result is that the output will consist of all very + pure colors. + + * DENSITY: Correct only the amount of ink ("density"), + otherwise performing no correction at all, even for + linearity. Prints made with this option will + usually be very dark if no other color management is + used. This may be useful if you are printing in 16 + bit precision or are using your own linearization + curves. + + * RAW: Perform no correction at all, even for + density. Prints made with this option will be very + dark and may bleed (or even puddle!) ink if not used + with external color management and linearization. + This option may be useful if you are using external + color management and linearization to get extremely + saturated dark colors by using more ink in + individual channels. It should be used with extreme + caution, as it is very easy to damage the printer if + you are not careful. + + * PRE-DITHERED: Interpret each pixel as the actual + size of each drop to be printed. Legal values of + the drop sizes differ between printers; all printers + support 0 (no droplet) and 1 (the largest droplet). + Some printers support four levels (0, 1, 2, and 3). + + Image Type + + Specify the option that best describes your print job. + Your choice here will affect the processing of the + print job. Currently available settings are: + + * TEXT: Optimize the output for printing black text + with no graphics. This option results in crisp + output and is very fast, but will yield very poor + results with any color or grayscale graphics. + + * GRAPHICS: Optimize the output for printing color + graphics. This option will generate smooth, bright + output. + + * MIXED TEXT AND GRAPHICS: Optimize the output for + printing a mixture of text and graphics. + + * PHOTOGRAPH: Optimize the output for printing + photographs. This option will generate smooth + tones and high quality colors, but will be slower + than the other options. + + * LINE ART: Optimize the output for printing black and + white line art with intricate detail. + + * MANUAL CONTROL: Do not bias the output at all; use + only the settings specified by the user. + + Print Quality + + Specify the desired output quality using convenient + presets. Where this option is available, Gutenprint + will automatically adjust the printing resolution and + other options to generate the desired quality. + Settings chosen with this option may be overridden by + explicitly setting other settings, such as resolution. + Not all printers offer all of these options. + Currently available settings, in increasing order of + quality, include: + + * FAST ECONOMY: Use the fastest printing mode + available on the printer to print with a minimum + amount of ink. This option will produce very washed + out colors and grays, and will typically be + extremely grainy and streaky. + + * ECONOMY: Print very rapidly with a reduced amount of + ink. This option will produce washed out colors and + grays and will typically be quite grainy and + streaky. + + * DRAFT: Print low quality draft output quickly. This + option will typically produce acceptable colors with + some amount of grain on plain paper, but will + typically produce washed out and grainy output on + high quality papers. On some printers this may + employ a special draft mode to print especially + quickly at the expense of color fidelity. + + * STANDARD: Print at a normal quality level for text + or text/graphics on plain paper or basic inkjet + paper. This option will typically produce + acceptable colors, but on high quality papers the + output may be grainy or somewhat washed out. This + option may also be useful for printing draft copies + of photographs on coated inkjet paper. + + * HIGH: Print final copies of text or text/graphics on + plain paper or inkjet paper. This option will + typically produce good color quality, but the + quality may not be optimal for photographs on glossy + paper. This option may also be useful for printing + draft copies of photographs on glossy paper. + + * PHOTO: Print photographs on glossy paper or very + high quality text, text/graphics, or line art on + high quality paper. In the latter application this + will produce output close to laser printer quality. + On the highest quality premium papers the result may + still be a bit grainy. + + * SUPER PHOTO: Print photographs on glossy paper with + very high quality. This will generally yield very + good results on high quality premium paper but may + be overkill on other papers. This option is only + offered on printers capable of producing very high + quality output rivaling traditional photographic + printing. This option may also be appropriate for + very intricate line art, where the required + resolution may exceed the capabilities of laser + printers. + + * ULTRA PHOTO: Print photographs on premium papers + with extremely high quality. This option is only + offered on printers capable of producing extremely + high quality output matching or exceeding + traditional photographic printing. + + * BEST: Print with the best quality available on the + printer for the application chosen. This may be + equivalent to one of the other settings; on a very + few printers the resolution may exceed that of Ultra + Photo mode. + + * MANUAL CONTROL: Do not adjust the settings at all; + use only the settings specified by the user. + + +Basic Output Adjustments + + Saturation + + This option controls the vividness of the output + color; higher values produce more vivid colors. Very + low values produce muted colors; setting this to zero + produces gray. + + Contrast + + This controls the contrast of the output. Lower + values produce less tonal range in the midtones + (lighter colors become darker, and darker colors + become lighter), which may allow for more definition + in the highlights and shadows. Higher values do the + opposite: lighter colors become even lighter, while + darker colors become even darker. + + Brightness + + This control adjusts the general brightness of the + print; higher values produce generally lighter output, + while lower values produce generally darker output. + White and black are not changed; colors also retain + their hue and saturation. + + +Advanced Output Adjustments + + These controls adjust more specialized settings. + + Dither Algorithm + + Since inkjet printers have a very limited set of ink + colours, most colours have to be produced by mixing + the available inks. This is done by printing patterns + of very small dots, fooling the eye into seeing many + different shades. This process is called "dithering"; + several different patterns are available, with + trade-offs between speed and quality. The following + dither algorithms are currently available. If no + algorithm is selected, the package chooses an + appropriate one based on other option settings. The + following algorithms are currently available, + generally in increasing order of quality. + + * VERY FAST: This algorithm produces very rough, + patterned output, but is extremely fast. This + generally yields poor results on modern inkjet + printers, particularly models that offer multiple + drop sizes, but it can yield very good results on + laser printers. It is a good choice for printing + text or line art where no grayscale or color is + used, and also works very well when Threshold color + correction is used. + + * FAST: This algorithm also produces output with very + strong diagonal patterns. It is also quite fast. + It produces somewhat better results on modern inkjet + printers that offer multiple drop sizes, but offers + no advantages on laser printers or old (generally + pre-1999) inkjet printers. + + * ORDERED: This algorithm produces much smoother + output than Fast or Very Fast. It is somewhat + slower than those algorithms. It utilizes a fixed + pattern that is generally free of artifacts. It is + an excellent choice for printing draft copies of + business graphics or photographs (charts, etc.) due + to its lack of artifacts. + + * ADAPTIVE HYBRID: This algorithm produces slightly + smoother output than Ordered dithering, at some cost + in performance. It uses a fixed pattern in + highlights to avoid artifacts, and error diffusion + at higher densities to reduce noise (which looks + like roughness in texture). It is an excellent + choice for printing business graphics due to its + lack of artifacts and smooth texture in darker + tones. + + * EVEN TONE: This relatively new algorithm yields + excellent smoothness in all tones (light, midtone, + and shadow), but is considerably slower than most of + the other algorithms. It is somewhat prone to + artifacts, including "tearing", at sharp boundaries. + This algorithm is well-suited for printing + photographs, but is not as suitable for printing + solid-tone graphics. + + * HYBRID EVEN TONE: This algorithm combines Even Tone + and Ordered dithering to yield smooth results with + fewer artifacts than Even Tone dithering, but is + even slower than standard Even Tone. It uses the + fixed pattern of Ordered dithering to break up the + artifacts of Even Tone dithering. The result is not + quite as smooth as pure Even Tone, but the reduction + of artifacts makes this an excellent choice for + photographs or photographs mixed with other + graphics. + + * PREDITHERED: This is used in combination with + dithering performed outside of Gutenprint or with + printers that perform their own dithering. It + assumes that the output is already dithered and + generates the appropriate drops based only on the + values provided. + + Linear Contrast Adjustment + + The standard contrast control does not adjust the + black and white points of the output; black in the + input becomes black in the output, for example. The + result is that if contrast is reduced below 1, the + contrast in the highlights and shadows is actually + increased to keep the same total tonal range. + + Gimp-Print 4.2 used a different kind of contrast + control. In Gimp-Print 4.2, reducing the contrast + reduced the contrast throughout the tonal range, + resulting in white being printed as a light gray and + black as a dark gray (reducing the contrast all the + way to zero resulted in a uniform gray). If contrast + was increased, the contrast was stretched until the + output reached either black or white; anything lighter + always printed as white and anything darker as black. + + Turning this control on selects the old Gimp-Print 4.2 + behavior. This control is normally turned off. + + +Output Density Controls + + These controls adjust the amount of ink printed on the page. + These controls may be used to darken a solid, pure black, or + eliminate puddling (wet ink left on the paper that does not dry in + the printer) if needed. They may also be useful for adjusting the + behavior of non-standard inks. They should not be used to lighten + or darken the print if the black level is correct. + + These controls are adjustments -- they adjust the amount of ink + relative to the amount selected by the driver for the paper and + resolution chosen. + + Density Value + + This control adjusts the total amount of ink used in + all channels (ink colors). + + Black Density Value + Blue Density Value + Cyan Density Value + Magenta Density Value + Yellow Density Value + Red Density Value + + These controls adjust the amount of ink used by each + channel separately. They may be used to correct the + amount of ink if needed to strengthen or weaken + particular colors (e. g. if yellow is too strong or + too weak). They should not be used to correct gray + balance (to produce neutral gray) -- the gray balance + controls described below should be used for that + purpose. + + Ink Limit Value + + This control adjusts the maximum amount of ink that + the driver will use to print with. This may be used + if you want to use large amounts of particular inks to + achieve saturated dark colors, without using excessive + ink overall that will result in ink puddling or + spilling within the printer. This control should be + used only by people very experienced in inkjet + printing. + + +Gray Balance Controls + + These controls adjust the gray balance by changing the amount of + each color of ink used to produce gray. For example, if gray + prints somewhat greenish, it can be corrected by increasing the + magenta balance. + + Magenta Balance Value + Yellow Balance Value + Cyan Balance Value + + +Output Gamma Controls + + These controls permit adjusting the gamma (exponent) of the + transfer curves of the individual channels. On most printers, + using a linear ink scale (that is, the amount of ink is directly + proportional to the input value) will produce very dark + highlights, as even quite small amounts of ink produce very strong + colors or gray. Therefore, the driver uses less ink to produce + lighter colors. This does not affect the darkest tones. + + Setting these controls to larger values results in lighter + highlights and midtones. These controls are adjustments -- they + adjust the gamma relative to the gamma chosen by the driver by + multiplying them together. For example, if the driver uses a + gamma value of 2.0 for a particular printer, and you specify a + gamma of 0.75, the actual gamma used to print will be 1.5. + + Composite Gamma Value + + This control adjusts the gamma of all available ink + channels when printing in color. + + Black Gamma Value + + This control adjusts the gamma of the black channel + when printing in grayscale. + + Magenta Gamma Value + Yellow Gamma Value + Cyan Gamma Value + + These controls adjust the gamma of individual channels + when printing on printers that use cyan, magenta, and + yellow inks (all inkjet printers use CMY inks). These + gamma values are multiplied by the composite gamma + value and the gamma chosen by the driver. + + Note that the black gamma value is not used when + printing in color. That is because the amount of gray + is computed after the gamma transformation has been + applied to each channel, and the black channel is + synthesized from this value. The GCR Transition Value + serves as a gamma value for the black channel. In + addition, there are no gamma values for the special + channels for printers that offer additional inks (such + as red and blue) for similar reasons. + + Red Gamma Value + Green Gamma Value + Blue Gamma Value + + These controls adjust the gamma of individual channels + when printing on printers that use red, green, and + blue inks (Postscript printers and many dye + sublimation printers use red, green, and blue colors). + These gamma values are multiplied by the composite + gamma value and the gamma chosen by the driver. + + +Gray Generation Controls + + These controls adjust the conversion of gray into black ink and + composite (CMY) components. When printing in color, light grays + are often printed using composite inks rather than black ink to + reduce the speckling effect of dark black dots, while dark grays + and black are usually printed using black ink to achieve a darker + black. With some ink and paper combinations it is necessary to + use a mixture of black and composite components to achieve maximum + density and in some cases to achieve neutral grays (some pigment + black inks are actually brown). + + The effect of using too much or too little black ink varies. + Typically if too much black ink is used light colors and grays + will have noticeable speckling from the black drops, while if too + little black ink is used the midtones and dark tones will be + washed out and in some cases too much ink will be used leading to + puddles on the page. In some cases very large amounts of + composite ink cause color shifts (darker grays are not neutral). + Epson Premium Glossy Photo Paper seems to be particularly prone to + this problem, particularly with dye inks. + + In general, lower-quality papers require more black ink (composite + inks generally cannot create very dark tones), while higher + quality papers require less black ink (the composite inks can + create much darker grays, and the black dots appear much sharper). + + Setting these controls effectively requires a good understanding + of gray generation and a fair amount of experimentation. Normally + it's only necessary to set the paper type correctly to get good + results. + + GCR Lower Bound Value + + This control specifies the darkest shade of gray at + which no black ink will be used (i. e. any lighter + gray component will be printed using only composite + inks). Setting this control to zero means that some + amount of black ink will always be used; setting it to + 1 means that no black ink will ever be used. + + GCR Upper Bound Value + + This control specifies the lightest shade of gray at + which no composite CMY ink will be used (i. e. this + level of gray and higher will be printed using only + black ink). This control should never be set any + lower than the GCR Lower Bound Value. Setting this + control to zero means that only black ink is used to + print any gray value; setting this control to a value + greater than one means that some composite ink will be + used even when printing black. The upper limit for + this control is 5 (in which case black will be printed + with no more than 20% black ink). + + If you use an ink set requiring use of color inks to + produce neutral grayscale, you should set the GCR + Lower Bound Value to zero or a value very close to + zero and the GCR Upper Bound Value should be greater + than 1, along with a GCR Transition Value (below) of + 1. This will ensure that the proportion of black and + color inks will be close to constant throughout the + gray range. With this kind of inkset, it's often + possible to produce cool or warm toned grayscale + prints by selecting Desaturated color correction and + adjusting the GCR Upper Bound Value appropriately. + For example, if the black ink has a brown (warm) cast, + increasing the GCR Upper Bound Value will yield a + cooler tone (less black ink) while decreasing it will + yield a warmer tone (more black ink). + + GCR Transition Value + + This control specifies the gamma of the GCR transition + curve. Setting this control to a smaller value + results in less black ink being used in the lighter + portion of the transition region. This control is + useful if the black ink is much darker than the + composite inks in order to produce a smoother + transition. + + GCR Curve + + This control (only available through the Print plugin + for the GIMP or other Gutenprint-based applications + that provide curve capability) allows you to specify + the conversion curve from gray to black/composite + precisely. The horizontal axis of this curve + represents the gray level (between 0, or no gray at + all, and 1, or pure black); the vertical axis + represents the fraction of gray that is converted to + black (0 means only composite inks, and 1 means only + black ink). + + +Output Linearization Curves + + These controls permit adjusting the transfer (linearization) + curves of each channel precisely. They are only available through + the Print plugin for the GIMP or other Gutenprint-based + applications that provide curve capability. All of these controls + are considered to be for very advanced use only. + + Black Curve + Blue Curve + Cyan Curve + Magenta Curve + Yellow Curve + Red Curve + Green Curve + + +Detailed Color Correction Curves + + These controls permit adjusting precise characteristics of color + generation/correction. They are only available through the Print + plugin for the GIMP or other Gutenprint-based applications that + provide curve capability. All of these controls are considered to + be for very advanced use only. + + The horizontal axis of all of these curves represents the hue of + the output. Hue is measured as an angle, where 0 and 360 degrees + represent cyan (or red, if the output inks are RGB). + Conventionally, these angles are represented as a number between 0 + and 6 (each full number in this scale represents 60 degrees). The + specific hue angles for CMY and RGB outputs are as follows: + + \ Ink Type + Angle \ RGB CMY + ----- \ --- --- + 0 | Red Cyan + 1 | Yellow Blue + 2 | Green Magenta + 3 | Cyan Red + 4 | Blue Yellow + 5 | Magenta Green + 6 | Red Cyan + + Hue Adjustment Curve + Luminosity Adjustment Curve + Saturation Adjustment Curve + + These controls adjust the color correction in High + Accuracy, Bright Colors, and Correct Hue Only color + correction modes. These color correction modes work + by adjusting the hue, saturation, and luminosity (HSL) + of the output inks to achieve a more accurate color + than the color created by simply converting the red, + green, and blue inputs to cyan, magenta, and yellow + (or red, green, and blue) inks. Note that in this + printing context luminosity represents darkness + (amount of light subtracted) rather than brightness. + + The saturation and hue adjustments are first applied. + The luminosity correction operates on only the color + component of the output. Before this correction is + applied, any gray value is removed, and added back + after the correction is completed. + + The vertical axis of the Hue Adjustment Curve + represents an angular difference that is added to the + base hue value to generate the desired output. For + example, if the blue output is purple (too close to + magenta), adding a negative value to that range of the + output will bring the blue value more toward cyan + (less magenta). + + The vertical axis of the Saturation Adjustment Curve + represents an amount by which the saturation is + multiplied. At any given hue point it may take on any + value between 0 (eliminate all color saturation, which + is equivalent to converting to pure gray) and 4 + (dramatically boost the saturation). Therefore, this + adjustment may be used to tone down excessively + brilliant colors (e. g. if the reds are overly + brilliant) or brighten up dull colors (e. g. if the + greens are somewhat dull). This control has no effect + if Correct Hue Only is used. If the saturation value + is greater than 1, the effect differs depending upon + whether High Accuracy or Bright Colors mode is + selected: if Bright Colors is selected, the saturation + is simply multiplied by the desired value and then set + to 1 if it would exceed unity. If High Accuracy mode + is selected, the amount of saturation boost is + decreased if the starting saturation is high. + + The vertical axis of the Luminosity Adjustment Curve + represents an amount by which the luminosity is + multiplied. At any given hue point it may take on any + value between 0 (remove the color component + altogether) and 1 (leave it as is). Therefore, the + function of the Luminosity Adjustment Curve is to + lighten excessively dark colors rather than to darken + light colors. This control has no effect if Correct + Hue Only mode is used. + + Blue Map + Cyan Map + Magenta Map + Yellow Map + Red Map + + These curves control how the auxiliary red and blue + inks are used on the Epson Stylus Photo R800, Stylus + Photo R1800, and PictureMate family of printers. + These printers use auxiliary inks to achieve more + brilliance in the red and blue. Other printers in the + future may use other auxiliary channels, which will be + made available in similar fashion. + + The vertical axis of each of these controls specifies + the amount of each ink that should be used to print + colors of that hue. These curves are used only to + generate color; any gray component is removed prior to + the color generation and added back later. For + example, it is possible to specify that a certain + shade of purple is printed using .2 red ink, .6 + magenta ink, and .5 blue ink (hypothetically). + + +Specialized Output Controls + + These controls are used to modify the output in very + printer-specific ways. + + Gloss Level Value + + This control is provided on printers such as the Epson + Stylus Photo R800 and R1800 that offer a special gloss + enhancer to produce an even degree of gloss on glossy + papers regardless of the amount of ink used. On + certain glossy papers, areas with high ink coverage + are a lot glossier than areas with little ink coverage + (highlights); the gloss enhancer is basically a + transparent ink that increases the gloss of these + areas. This control specifies the desired total + amount of ink to be printed, including both the normal + color and black inks and the gloss enhancer. If the + amount of normal inks is less than this amount, gloss + enhancer is used to increase the total amount of ink + used. + + +Transition Controls + + These controls adjust the level at which light inks (such as the + light cyan and magenta inks used on many "photo printers") are + used in place of the dark inks. The light inks are used to + produce a smoother texture (less speckling); the light cyan + droplets, for example, are individually much less visible than the + normal dark cyan droplets. + + The ink substitution works by replacing a certain amount of ink by + a mixture of the light and dark inks. For example, the dark cyan + ink may be about 3 times as dark as the light cyan ink, so in + light areas the cyan may be replaced by 3 times as much light + cyan. However, this only works up to a certain point; beyond that + point, adding more light ink does not significantly increase the + darkness of the ink. These transition values adjust the limits at + which the ink substitution is done; the lower these limits are + set, the lighter the output at which dark ink is introduced. + Setting these values lower will generally yield more accurate + midtone colors at the expense of more speckling in the light + midtones and highlights. Generally these values need to be lower + on low-quality paper than on high quality glossy paper. + + Dark Yellow Transition Value + Light Gray Transition Value + Mid Gray Transition Value + Dark Gray Transition Value + Gray Transition Value + Light Cyan Transition Value + Light Magenta Transition Value + Light Yellow Transition Value + + +Foomatic-only options + + This control is available only when using the Foomatic interface. + It provides a collection of presets appropriate for various + printing tasks. It is similar in concept to (and provided the + inspiration for) the Print Quality and Image Type options provided + in Gutenprint. + + Printout Mode diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag index dede246..359a22e 100644 --- a/doc/gutenprint/gutenprint.tag +++ b/doc/gutenprint/gutenprint.tag @@ -2,324 +2,324 @@ <tagfile> <compound kind="file"> <name>array.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>array_8h</filename> <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes> <member kind="typedef"> <type>stp_array</type> <name>stp_array_t</name> <anchorfile>group__array.html</anchorfile> - <anchor>g69e0971771118ccea2a5dc72ba4fa73e</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_array_create</name> <anchorfile>group__array.html</anchorfile> - <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor> + <anchor>ga1</anchor> <arglist>(int x_size, int y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_destroy</name> <anchorfile>group__array.html</anchorfile> - <anchor>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor> + <anchor>ga2</anchor> <arglist>(stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_copy</name> <anchorfile>group__array.html</anchorfile> - <anchor>gab9b031be229d8762faf46a3ef9454ec</anchor> + <anchor>ga3</anchor> <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_array_create_copy</name> <anchorfile>group__array.html</anchorfile> - <anchor>g19370f7d4779013904be75bc3d97e024</anchor> + <anchor>ga4</anchor> <arglist>(const stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_set_size</name> <anchorfile>group__array.html</anchorfile> - <anchor>g698e51815f2ef3fd0709d6b32a2bb921</anchor> + <anchor>ga5</anchor> <arglist>(stp_array_t *array, int x_size, int y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_get_size</name> <anchorfile>group__array.html</anchorfile> - <anchor>g48e34b2673c2973884f0a403bafe7ea8</anchor> + <anchor>ga6</anchor> <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_set_data</name> <anchorfile>group__array.html</anchorfile> - <anchor>g0ca3891b4cde193cc65de63053e3f4fa</anchor> + <anchor>ga7</anchor> <arglist>(stp_array_t *array, const double *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_get_data</name> <anchorfile>group__array.html</anchorfile> - <anchor>g9e1c46379b5935ed3a939833bd9e68be</anchor> + <anchor>ga8</anchor> <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_array_set_point</name> <anchorfile>group__array.html</anchorfile> - <anchor>g4ab405205d678a3d9ae02a98103fbfea</anchor> + <anchor>ga9</anchor> <arglist>(stp_array_t *array, int x, int y, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_array_get_point</name> <anchorfile>group__array.html</anchorfile> - <anchor>gb9d53cf70f2c892dca82b8db2414fad2</anchor> + <anchor>ga10</anchor> <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist> </member> <member kind="function"> <type>const stp_sequence_t *</type> <name>stp_array_get_sequence</name> <anchorfile>group__array.html</anchorfile> - <anchor>g2051c3f4a1eaccb198744f8d7c76d649</anchor> + <anchor>ga11</anchor> <arglist>(const stp_array_t *array)</arglist> </member> </compound> <compound kind="file"> <name>bit-ops.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>bit-ops_8h</filename> <member kind="function"> <type>void</type> <name>stp_fold</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>ec711fffd61ebd40a6896d76d4c9327f</anchor> + <anchor>a0</anchor> <arglist>(const unsigned char *line, int single_height, unsigned char *outbuf)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_split_2</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>65a4f2dc6c49d8a80e1d0ca72a1f0ffd</anchor> + <anchor>a1</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_split_4</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>24f21e067782cbb1606f4109f7acaccb</anchor> + <anchor>a2</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unpack_2</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>9772ac792d8208e341d780fc756bf3cd</anchor> + <anchor>a3</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unpack_4</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>7fdd081b1a58cdc3648e61d23aefb744</anchor> + <anchor>a4</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unpack_8</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>534a4a10cda717aabaf212954cc2d891</anchor> + <anchor>a5</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unpack_16</name> <anchorfile>bit-ops_8h.html</anchorfile> - <anchor>d472146a7bdf6c1e95bcb102c4409515</anchor> + <anchor>a6</anchor> <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</arglist> </member> </compound> <compound kind="file"> <name>channel.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>channel_8h</filename> <member kind="function"> <type>void</type> <name>stp_channel_reset</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>dc5c0cc7cc331da0ab394b642a381363</anchor> + <anchor>a0</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_reset_channel</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>6a88eb8e1f968370b63326e517a34ec2</anchor> + <anchor>a1</anchor> <arglist>(stp_vars_t *v, int channel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_add</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>6a552629f3dddf6283f605e1961dd04f</anchor> + <anchor>a2</anchor> <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_channel_get_value</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>73265490d8c513de68604a982ec49e0a</anchor> + <anchor>a3</anchor> <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_density_adjustment</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>99f818da3b4944b328de9de860d04dbc</anchor> + <anchor>a4</anchor> <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_channel_get_density_adjustment</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>0cfa6ae42ced76291f96ff64fed6a823</anchor> + <anchor>a5</anchor> <arglist>(stp_vars_t *v, int color, int subchannel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_ink_limit</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>9351c3b60ed0f43e012bbd2906b0f0b4</anchor> + <anchor>a6</anchor> <arglist>(stp_vars_t *v, double limit)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_channel_get_ink_limit</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>f6423b74581fbf34918a9e45d22186b5</anchor> + <anchor>a7</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_cutoff_adjustment</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>4a04bbe68bd5c97d4b83cb1c1a147b48</anchor> + <anchor>a8</anchor> <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_channel_get_cutoff_adjustment</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>c868578c0a82a76d20160b23a9c9d603</anchor> + <anchor>a9</anchor> <arglist>(stp_vars_t *v, int color, int subchannel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_black_channel</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>6d315737ed90af4b0b9bff8c907381c3</anchor> + <anchor>a10</anchor> <arglist>(stp_vars_t *v, int channel)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_channel_get_black_channel</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>00bbe8c93cbe8da9f431824dbb1dadcd</anchor> + <anchor>a11</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_gloss_channel</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>38a09aeef9c53c039fa7d1124921a7c9</anchor> + <anchor>a12</anchor> <arglist>(stp_vars_t *v, int channel)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_channel_get_gloss_channel</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>a907ffda300039a00ae7ddb333038480</anchor> + <anchor>a13</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_gloss_limit</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>4349853a306208c7d98074a585991ef0</anchor> + <anchor>a14</anchor> <arglist>(stp_vars_t *v, double limit)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_channel_get_gloss_limit</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>e1702ed4a233cadce00e9bc87fd5ca45</anchor> + <anchor>a15</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_curve</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>42d1438e758951e81ff49fbf81e73d2b</anchor> + <anchor>a16</anchor> <arglist>(stp_vars_t *v, int channel, const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>const stp_curve_t *</type> <name>stp_channel_get_curve</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>619228b113312c73cdce75b15bb88313</anchor> + <anchor>a17</anchor> <arglist>(stp_vars_t *v, int channel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_set_gcr_curve</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>2ce95b47a5f1a6c146588e0fb49db2e4</anchor> + <anchor>a18</anchor> <arglist>(stp_vars_t *v, const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>const stp_curve_t *</type> <name>stp_channel_get_gcr_curve</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>0f1e6073d53036f6771a0cc69cf9e261</anchor> + <anchor>a19</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_initialize</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>00b63c73990babb75e5896ffd7022634</anchor> + <anchor>a20</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, int input_channel_count)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_channel_convert</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>cef9de964c7569983e1ff1d0550d3bd6</anchor> + <anchor>a21</anchor> <arglist>(const stp_vars_t *v, unsigned *zero_mask)</arglist> </member> <member kind="function"> <type>unsigned short *</type> <name>stp_channel_get_input</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>f5ef85fbc689b2f94c0be23c0b8b3765</anchor> + <anchor>a22</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>unsigned short *</type> <name>stp_channel_get_output</name> <anchorfile>channel_8h.html</anchorfile> - <anchor>9c4df56f4ad83b6232cf6ec17b6dc031</anchor> + <anchor>a23</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> </compound> <compound kind="file"> <name>color.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>color_8h</filename> <class kind="struct">stp_colorfuncs_t</class> <class kind="struct">stp_color</class> @@ -327,97 +327,97 @@ <type>stp_color</type> <name>stp_color_t</name> <anchorfile>group__color.html</anchorfile> - <anchor>gb711e2534c69bde47be7af3409c8ee2c</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_init</name> <anchorfile>group__color.html</anchorfile> - <anchor>g835bd7024477347a46ea0c14b46996c6</anchor> + <anchor>ga1</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_get_row</name> <anchorfile>group__color.html</anchorfile> - <anchor>gadf861820b3956ef7b18600dbf5da9da</anchor> + <anchor>ga2</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_color_list_parameters</name> <anchorfile>group__color.html</anchorfile> - <anchor>ge2e397268288111eaffd352cb0ff1b98</anchor> + <anchor>ga3</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_color_describe_parameter</name> <anchorfile>group__color.html</anchorfile> - <anchor>gc47fecc2c32115494ea364e53d9f1ff2</anchor> + <anchor>ga4</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_register</name> <anchorfile>group__color.html</anchorfile> - <anchor>ge3543409e331c5d1756c2c8fe927343b</anchor> + <anchor>ga5</anchor> <arglist>(const stp_color_t *color)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_unregister</name> <anchorfile>group__color.html</anchorfile> - <anchor>g3e0f2728d47e1701c00b06199bc5512d</anchor> + <anchor>ga6</anchor> <arglist>(const stp_color_t *color)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_count</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>g25d9ee3ceee6d6e9964007ad12f9900b</anchor> + <anchor>ga8</anchor> <arglist>(const char *name)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_index</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor> + <anchor>ga9</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_colorfuncs</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga92373d7aa315ab6e32a1bb0ac944b79</anchor> + <anchor>ga10</anchor> <arglist>(stp_colorfuncs_t *colorfuncs)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_color_get_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>g36d2d72d2cd967405a978b76a7a8c992</anchor> + <anchor>ga11</anchor> <arglist>(const stp_color_t *c)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_color_get_long_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga0559d7812bdcbebe4edc14fc05274d9</anchor> + <anchor>ga12</anchor> <arglist>(const stp_color_t *c)</arglist> </member> </compound> <compound kind="file"> <name>curve-cache.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>curve-cache_8h</filename> <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes> <class kind="struct">stp_cached_curve_t</class> @@ -425,97 +425,97 @@ <type>#define</type> <name>CURVE_CACHE_FAST_USHORT</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>c0763605d9b80d9889407dd340e357fd</anchor> + <anchor>a0</anchor> <arglist>(cache)</arglist> </member> <member kind="define"> <type>#define</type> <name>CURVE_CACHE_FAST_DOUBLE</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>b434b6a3a8ce63d95d11b2bce6360536</anchor> + <anchor>a1</anchor> <arglist>(cache)</arglist> </member> <member kind="define"> <type>#define</type> <name>CURVE_CACHE_FAST_COUNT</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>b8c3f0a2734a4bdb08989cc62761e8e7</anchor> + <anchor>a2</anchor> <arglist>(cache)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_free_curve_cache</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>3cef707d88b48136a52f733f80ae52dd</anchor> + <anchor>a3</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_cache_curve_data</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>5cb281dd07eecda913b168451b2d615b</anchor> + <anchor>a4</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_cache_get_curve</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>256ae4356b6205ba61fbc6b5e90c1762</anchor> + <anchor>a5</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_cache_curve_invalidate</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>7966337362f5e8fc0ed54edd8da645a2</anchor> + <anchor>a6</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_cache_set_curve</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>f775dcfafb717b24ff655cc801c14dfc</anchor> + <anchor>a7</anchor> <arglist>(stp_cached_curve_t *cache, stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_cache_set_curve_copy</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>33011bde2e051e0b222177b0db746da9</anchor> + <anchor>a8</anchor> <arglist>(stp_cached_curve_t *cache, const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_curve_cache_get_count</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>723301540e82db80f8ce9100ec832876</anchor> + <anchor>a9</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>const unsigned short *</type> <name>stp_curve_cache_get_ushort_data</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>6a318767b044ac996ae318771f715a01</anchor> + <anchor>a10</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>const double *</type> <name>stp_curve_cache_get_double_data</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>83788e3f9d421bdab139d92127a7e5e3</anchor> + <anchor>a11</anchor> <arglist>(stp_cached_curve_t *cache)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_cache_copy</name> <anchorfile>curve-cache_8h.html</anchorfile> - <anchor>6a8addcc359b8cfbc2fa5c8cec97643d</anchor> + <anchor>a12</anchor> <arglist>(stp_cached_curve_t *dest, const stp_cached_curve_t *src)</arglist> </member> </compound> <compound kind="file"> <name>curve.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>curve_8h</filename> <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes> <class kind="struct">stp_curve_point_t</class> @@ -523,405 +523,405 @@ <type>stp_curve</type> <name>stp_curve_t</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd5ce135b7af2c6e79bae493c7055461d</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_type_t</name> - <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor> + <anchor>ga47</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_TYPE_LINEAR</name> - <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor> + <anchor>gga47a1</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_TYPE_SPLINE</name> - <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor> + <anchor>gga47a2</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_wrap_mode_t</name> - <anchor>g1880ff988f772337e8892e791951337b</anchor> + <anchor>ga48</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_WRAP_NONE</name> - <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor> + <anchor>gga48a3</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_WRAP_AROUND</name> - <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor> + <anchor>gga48a4</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_compose_t</name> - <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor> + <anchor>ga49</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_ADD</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor> + <anchor>gga49a5</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_MULTIPLY</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor> + <anchor>gga49a6</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_EXPONENTIATE</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor> + <anchor>gga49a7</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_bounds_t</name> - <anchor>gd2b61113497bb142943d5131df3286ae</anchor> + <anchor>ga50</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_RESCALE</name> - <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor> + <anchor>gga50a8</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_CLIP</name> - <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor> + <anchor>gga50a9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_ERROR</name> - <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor> + <anchor>gga50a10</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor> + <anchor>ga1</anchor> <arglist>(stp_curve_wrap_mode_t wrap)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_copy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>ge76787e84f2fc3ba299de94f4ecc6d82</anchor> + <anchor>ga2</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_copy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gfdafb0a802f00063b00713dbd6d6bfc0</anchor> + <anchor>ga3</anchor> <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_destroy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g01bf94ed6a523f28dd909be054a69790</anchor> + <anchor>ga4</anchor> <arglist>(stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_bounds</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g5283a18fcc5db8e9f9384d54de50ba83</anchor> + <anchor>ga5</anchor> <arglist>(stp_curve_t *curve, double low, double high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_get_bounds</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g4d32e3000dd3a8f258b2eab94797731b</anchor> + <anchor>ga6</anchor> <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist> </member> <member kind="function"> <type>stp_curve_wrap_mode_t</type> <name>stp_curve_get_wrap</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd2aade6a22b516006ce0f897c5027f35</anchor> + <anchor>ga7</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_is_piecewise</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gdda4313c874170e0086d2000ed04c02f</anchor> + <anchor>ga8</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_get_range</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gaf8bad025ea7463067c9d7ab205af062</anchor> + <anchor>ga9</anchor> <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_curve_count_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g48d9023f28ae2d15975002f7a9d7f94e</anchor> + <anchor>ga10</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_interpolation_type</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g3175711d943e95fdf363d5124237a56e</anchor> + <anchor>ga11</anchor> <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist> </member> <member kind="function"> <type>stp_curve_type_t</type> <name>stp_curve_get_interpolation_type</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gca245aa6907c2fb95e150ce9a86ddb1a</anchor> + <anchor>ga12</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gba540befdbd82e705358b2175d5b92e8</anchor> + <anchor>ga13</anchor> <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_data_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gcbd01a2662edb48af0816930b40dc8ab</anchor> + <anchor>ga14</anchor> <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_float_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor> + <anchor>ga15</anchor> <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_long_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gaf770dcae26ce48d5ee50dd8217e2c14</anchor> + <anchor>ga16</anchor> <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_ulong_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g184e0e32892aae4b2c195c6fc880bace</anchor> + <anchor>ga17</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_int_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gbc9ae004e972c7d638336714f3112f9b</anchor> + <anchor>ga18</anchor> <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_uint_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g8a215d4981a74fb2b6e4a0c381314df0</anchor> + <anchor>ga19</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_short_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd23dcc9abefca9a98b3ecd9714227093</anchor> + <anchor>ga20</anchor> <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_ushort_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g4051de3e6be42f4499de78af67288616</anchor> + <anchor>ga21</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_get_subrange</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor> + <anchor>ga22</anchor> <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_subrange</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g0ba6753a8beeaca19719d047da25ecb5</anchor> + <anchor>ga23</anchor> <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist> </member> <member kind="function"> <type>const double *</type> <name>stp_curve_get_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g24b9486c45d68983e94dcc0fb19edacd</anchor> + <anchor>ga24</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const stp_curve_point_t *</type> <name>stp_curve_get_data_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd30e41654f1e0217aae3389b30cdffba</anchor> + <anchor>ga25</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const float *</type> <name>stp_curve_get_float_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf363a0f9686bcd6521671d531bc522d5</anchor> + <anchor>ga26</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const long *</type> <name>stp_curve_get_long_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g187af251d5a89853545c8be898a00cc1</anchor> + <anchor>ga27</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned long *</type> <name>stp_curve_get_ulong_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor> + <anchor>ga28</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const int *</type> <name>stp_curve_get_int_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g01bda0b947a6075d4a1ed373865744e6</anchor> + <anchor>ga29</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned int *</type> <name>stp_curve_get_uint_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gb874365285383f3eb35c1a32496a69b4</anchor> + <anchor>ga30</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const short *</type> <name>stp_curve_get_short_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g60767bb2143fe4d491d351a4c0abc3b1</anchor> + <anchor>ga31</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned short *</type> <name>stp_curve_get_ushort_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gb2312169172ec9789af9fd38279b3273</anchor> + <anchor>ga32</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const stp_sequence_t *</type> <name>stp_curve_get_sequence</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gee3cc69ab758b400838014df4742c28e</anchor> + <anchor>ga33</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_gamma</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor> + <anchor>ga34</anchor> <arglist>(stp_curve_t *curve, double f_gamma)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_curve_get_gamma</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gc9786b35c2b1a55d54b62bcc57481c82</anchor> + <anchor>ga35</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_point</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g9a05eae4f274f420418539cceb627556</anchor> + <anchor>ga36</anchor> <arglist>(stp_curve_t *curve, size_t where, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_get_point</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf9ff6f55ec0a0615608dc1baec6aff00</anchor> + <anchor>ga37</anchor> <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_interpolate_value</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g0fdfc2b27a8a464584589ef38a8e05c4</anchor> + <anchor>ga38</anchor> <arglist>(const stp_curve_t *curve, double where, double *result)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_resample</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf68cf2508ff4a14a0dbee6fc0001667e</anchor> + <anchor>ga39</anchor> <arglist>(stp_curve_t *curve, size_t points)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_rescale</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd440d8d448173adc2be6737963a6e999</anchor> + <anchor>ga40</anchor> <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_write</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor> + <anchor>ga41</anchor> <arglist>(FILE *file, const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_curve_write_string</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g21aa4497c58ebbb703dc3549560f084d</anchor> + <anchor>ga42</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_stream</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g650e49e1250dab5d9221ad747a627fc0</anchor> + <anchor>ga43</anchor> <arglist>(FILE *fp)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_file</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6ff03fcc2a47f297c48b683884e81924</anchor> + <anchor>ga44</anchor> <arglist>(const char *file)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_string</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g60dce8c741a9b6fde73ced2134305298</anchor> + <anchor>ga45</anchor> <arglist>(const char *string)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_compose</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor> + <anchor>ga46</anchor> <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist> </member> </compound> <compound kind="file"> <name>dither.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>dither_8h</filename> <class kind="struct">stp_dither_matrix_short</class> <class kind="struct">stp_dither_matrix_normal</class> @@ -933,408 +933,408 @@ <type>#define</type> <name>STP_ECOLOR_K</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>4faa7aec0dc7471ed5a7d1622991ac77</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_ECOLOR_C</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>575ca9b45d518b92177323e70295198a</anchor> + <anchor>a1</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_ECOLOR_M</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>c7f1f45ff56dfbaff0a36599c6bf822c</anchor> + <anchor>a2</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_ECOLOR_Y</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>e1492502d48a830e5dda11f1d7afb494</anchor> + <anchor>a3</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_NCOLORS</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>3e02bef38f178e66a4439df6ec61c503</anchor> + <anchor>a4</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_dither_matrix_short</type> <name>stp_dither_matrix_short_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>373f2efaf250ca412b5447b8bd4e7f51</anchor> + <anchor>a5</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_dither_matrix_normal</type> <name>stp_dither_matrix_normal_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>a7bbfbb8dd05a8c05a5c37143adc129a</anchor> + <anchor>a6</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_dither_matrix_generic</type> <name>stp_dither_matrix_generic_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>c81f99c36dbc48c619831897bac28224</anchor> + <anchor>a7</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>dither_matrix_impl</type> <name>stp_dither_matrix_impl_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>613c628e788dbef089fa32243500cd54</anchor> + <anchor>a8</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_dotsize</type> <name>stp_dotsize_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>0a4617ed6063c68c6c8675fb9e8e9d01</anchor> + <anchor>a9</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_shade</type> <name>stp_shade_t</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>737b4edb8992127d0616e78f6c0a4c14</anchor> + <anchor>a10</anchor> <arglist></arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_iterated_init</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>e79d2866600d79be412b660f036995f4</anchor> + <anchor>a11</anchor> <arglist>(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_shear</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>1c29e4d285f27f7fd300643f7023f305</anchor> + <anchor>a12</anchor> <arglist>(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_init</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>8346fdae0bfb7422f52c0a2eec3abd87</anchor> + <anchor>a13</anchor> <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_init_short</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>6a7a7142c53dd1cd70b3f7fb481e5564</anchor> + <anchor>a14</anchor> <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_dither_matrix_validate_array</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>05677f96e6de536ecf91a65ee0715998</anchor> + <anchor>a15</anchor> <arglist>(const stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_init_from_dither_array</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>a9efd9cefabdab92a8ce5fbf7aca8876</anchor> + <anchor>a16</anchor> <arglist>(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_destroy</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>361cf36b4875e8ef2c8152f66d4a9284</anchor> + <anchor>a17</anchor> <arglist>(stp_dither_matrix_impl_t *mat)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_clone</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>aaa6d937beb5f9bef6e7ec34fc776d54</anchor> + <anchor>a18</anchor> <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_copy</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>289ae89081129060bf67371d7ce9fcef</anchor> + <anchor>a19</anchor> <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_scale_exponentially</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>0d1f33cd934e13ed0b0f859d131efbc1</anchor> + <anchor>a20</anchor> <arglist>(stp_dither_matrix_impl_t *mat, double exponent)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_matrix_set_row</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>c329929a25c54355a7ed23f23616ced5</anchor> + <anchor>a21</anchor> <arglist>(stp_dither_matrix_impl_t *mat, int y)</arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_find_standard_dither_array</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>ef8ca9aa08ab848746e370100a4b20e2</anchor> + <anchor>a22</anchor> <arglist>(int x_aspect, int y_aspect)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_dither_list_parameters</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>9ad687cfc22956dd88495ae0a831c1b6</anchor> + <anchor>a23</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_describe_parameter</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>6daf654828bc5235bc785fceb8aebb89</anchor> + <anchor>a24</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_init</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>6d409bf6395231621a725a45fac8bb8e</anchor> + <anchor>a25</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_iterated_matrix</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>85eb5568b8a8036271e50794519c08e2</anchor> + <anchor>a26</anchor> <arglist>(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_matrix</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>25b3d76810fd0dcb0928edff37060409</anchor> + <anchor>a27</anchor> <arglist>(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_matrix_from_dither_array</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>ae5be944ec353d075ea17c32370270bd</anchor> + <anchor>a28</anchor> <arglist>(stp_vars_t *v, const stp_array_t *array, int transpose)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_transition</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>d7cd0b4e7bf474516b14d0a186b23b96</anchor> + <anchor>a29</anchor> <arglist>(stp_vars_t *v, double)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_randomizer</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>6d8fc8a344a764f92ee43ff8b959aace</anchor> + <anchor>a30</anchor> <arglist>(stp_vars_t *v, int color, double)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_ink_spread</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>744fa9a5d204da486f07a8f1b21c9ba3</anchor> + <anchor>a31</anchor> <arglist>(stp_vars_t *v, int spread)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_adaptive_limit</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>d261306c74a8affdf11ad2cc519e8bba</anchor> + <anchor>a32</anchor> <arglist>(stp_vars_t *v, double limit)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_dither_get_first_position</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>f113ac1043230813204db189e3fd84a8</anchor> + <anchor>a33</anchor> <arglist>(stp_vars_t *v, int color, int subchan)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_dither_get_last_position</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>e13f1c62835c48c5fb58b45c8ed35f32</anchor> + <anchor>a34</anchor> <arglist>(stp_vars_t *v, int color, int subchan)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_inks_simple</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>ffc1834e675956e79ae5a866895db39c</anchor> + <anchor>a35</anchor> <arglist>(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_inks_full</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>0aae5a947e8953323b097fbb79c93c68</anchor> + <anchor>a36</anchor> <arglist>(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_set_inks</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>fd1d75ef5cfb0e013601a4e084352786</anchor> + <anchor>a37</anchor> <arglist>(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_add_channel</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>28bb47c7e1436e2c4af3b0be87b5d1c6</anchor> + <anchor>a38</anchor> <arglist>(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)</arglist> </member> <member kind="function"> <type>unsigned char *</type> <name>stp_dither_get_channel</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>94da054fb7a3f42cf4c2937f4d37e528</anchor> + <anchor>a39</anchor> <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>a22b0e4fe00acaf11ce611e29f1b1ba3</anchor> + <anchor>a40</anchor> <arglist>(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dither_internal</name> <anchorfile>dither_8h.html</anchorfile> - <anchor>e1fe7fb65133dd6ffc227e6fcdd18fdd</anchor> + <anchor>a41</anchor> <arglist>(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist> </member> </compound> <compound kind="file"> <name>gutenprint-intl-internal.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>gutenprint-intl-internal_8h</filename> <member kind="define"> <type>#define</type> <name>textdomain</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor> + <anchor>ga0</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>gettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>geb8333d9b46653f2047c603034d26730</anchor> + <anchor>ga1</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>dgettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor> + <anchor>ga2</anchor> <arglist>(Domain, Message)</arglist> </member> <member kind="define"> <type>#define</type> <name>dcgettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor> + <anchor>ga3</anchor> <arglist>(Domain, Message, Type)</arglist> </member> <member kind="define"> <type>#define</type> <name>bindtextdomain</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gcf29daa2fef5f417c57be476054c695b</anchor> + <anchor>ga4</anchor> <arglist>(Domain, Directory)</arglist> </member> <member kind="define"> <type>#define</type> <name>_</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor> + <anchor>ga5</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>N_</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor> + <anchor>ga6</anchor> <arglist>(String)</arglist> </member> </compound> <compound kind="file"> <name>gutenprint-intl.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>gutenprint-intl_8h</filename> <member kind="define"> <type>#define</type> <name>textdomain</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor> + <anchor>ga0</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>gettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>geb8333d9b46653f2047c603034d26730</anchor> + <anchor>ga1</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>dgettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor> + <anchor>ga2</anchor> <arglist>(Domain, Message)</arglist> </member> <member kind="define"> <type>#define</type> <name>dcgettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor> + <anchor>ga3</anchor> <arglist>(Domain, Message, Type)</arglist> </member> <member kind="define"> <type>#define</type> <name>bindtextdomain</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gcf29daa2fef5f417c57be476054c695b</anchor> + <anchor>ga4</anchor> <arglist>(Domain, Directory)</arglist> </member> <member kind="define"> <type>#define</type> <name>_</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor> + <anchor>ga5</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>N_</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor> + <anchor>ga6</anchor> <arglist>(String)</arglist> </member> </compound> <compound kind="file"> <name>gutenprint-module.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>gutenprint-module_8h</filename> <includes id="gutenprint_8h" name="gutenprint.h" local="no" imported="no">gutenprint/gutenprint.h</includes> <includes id="bit-ops_8h" name="bit-ops.h" local="no" imported="no">gutenprint/bit-ops.h</includes> @@ -1350,116 +1350,116 @@ <type>#define</type> <name>STP_MODULE</name> <anchorfile>gutenprint-module_8h.html</anchorfile> - <anchor>47eb7c01a3f89d34af8ea0b2c9ca32a1</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> </compound> <compound kind="file"> <name>gutenprint-version.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>gutenprint-version_8h</filename> <member kind="define"> <type>#define</type> <name>STP_MAJOR_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g98b05dcc61492d413bb01421995f1421</anchor> + <anchor>ga7</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MINOR_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor> + <anchor>ga8</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MICRO_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor> + <anchor>ga9</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_CURRENT_INTERFACE</name> <anchorfile>group__version.html</anchorfile> - <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor> + <anchor>ga10</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_BINARY_AGE</name> <anchorfile>group__version.html</anchorfile> - <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor> + <anchor>ga11</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_INTERFACE_AGE</name> <anchorfile>group__version.html</anchorfile> - <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor> + <anchor>ga12</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_CHECK_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g26c662a55c391d11663052ca39458972</anchor> + <anchor>ga13</anchor> <arglist>(major, minor, micro)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_check_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g888f2f6268a658d1a6b71b5288299488</anchor> + <anchor>ga6</anchor> <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_major_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g19a4efe48689fb8f859d04e60bfe028f</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_minor_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g66def32167cee385762282e36b60d3b7</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_micro_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g24960731fb86305c31f0be5621ccb993</anchor> + <anchor>ga2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_current_interface</name> <anchorfile>group__version.html</anchorfile> - <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor> + <anchor>ga3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_binary_age</name> <anchorfile>group__version.html</anchorfile> - <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor> + <anchor>ga4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_interface_age</name> <anchorfile>group__version.html</anchorfile> - <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor> + <anchor>ga5</anchor> <arglist></arglist> </member> </compound> <compound kind="file"> <name>gutenprint.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>gutenprint_8h</filename> <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes> <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes> @@ -1474,320 +1474,320 @@ </compound> <compound kind="file"> <name>image.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>image_8h</filename> <class kind="struct">stp_image</class> <member kind="define"> <type>#define</type> <name>STP_CHANNEL_LIMIT</name> <anchorfile>group__image.html</anchorfile> - <anchor>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor> + <anchor>ga8</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_image</type> <name>stp_image_t</name> <anchorfile>group__image.html</anchorfile> - <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_image_status_t</name> - <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor> + <anchor>ga9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_IMAGE_STATUS_OK</name> - <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor> + <anchor>gga9a2</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_IMAGE_STATUS_ABORT</name> - <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor> + <anchor>gga9a3</anchor> <arglist></arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_init</name> <anchorfile>group__image.html</anchorfile> - <anchor>g74c2417d571861506be7209421a3b418</anchor> + <anchor>ga1</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_reset</name> <anchorfile>group__image.html</anchorfile> - <anchor>g69cd20ccb54500d0ee8cf38969db69a6</anchor> + <anchor>ga2</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_image_width</name> <anchorfile>group__image.html</anchorfile> - <anchor>g9ee4915d4a1007f2d9c730ddc96d931b</anchor> + <anchor>ga3</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_image_height</name> <anchorfile>group__image.html</anchorfile> - <anchor>g48a99a9a8493b75687ad0900664ca4cb</anchor> + <anchor>ga4</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>stp_image_status_t</type> <name>stp_image_get_row</name> <anchorfile>group__image.html</anchorfile> - <anchor>gfc93a7a3f6629f6826bf1f6f757f464e</anchor> + <anchor>ga5</anchor> <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_image_get_appname</name> <anchorfile>group__image.html</anchorfile> - <anchor>gd36123431e93e049d813894aa039c25c</anchor> + <anchor>ga6</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_conclude</name> <anchorfile>group__image.html</anchorfile> - <anchor>gd1017f2f9b91d7add73c2393d96f700a</anchor> + <anchor>ga7</anchor> <arglist>(stp_image_t *image)</arglist> </member> </compound> <compound kind="file"> <name>list.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>list_8h</filename> <member kind="typedef"> <type>stp_list_item</type> <name>stp_list_item_t</name> <anchorfile>group__list.html</anchorfile> - <anchor>g71c64aeca8ca0613215306f088b6a963</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_list</type> <name>stp_list_t</name> <anchorfile>group__list.html</anchorfile> - <anchor>g01be7c3ea8c46226978010d453016f22</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_node_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor> + <anchor>ga2</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>void *(*</type> <name>stp_node_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor> + <anchor>ga3</anchor> <arglist>)(const void *)</arglist> </member> <member kind="typedef"> <type>const char *(*</type> <name>stp_node_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor> + <anchor>ga4</anchor> <arglist>)(const void *)</arglist> </member> <member kind="typedef"> <type>int(*</type> <name>stp_node_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor> + <anchor>ga5</anchor> <arglist>)(const void *, const void *)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_node_free_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>gb357e17f729e41b4f96d6aada1be26b9</anchor> + <anchor>ga6</anchor> <arglist>(void *item)</arglist> </member> <member kind="function"> <type>stp_list_t *</type> <name>stp_list_create</name> <anchorfile>group__list.html</anchorfile> - <anchor>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_list_t *</type> <name>stp_list_copy</name> <anchorfile>group__list.html</anchorfile> - <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor> + <anchor>ga8</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_destroy</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1382e926901b5efa2356176826a96a1a</anchor> + <anchor>ga9</anchor> <arglist>(stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_start</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga67c8173f8c7b2c40e3d6dde6578faec</anchor> + <anchor>ga10</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_end</name> <anchorfile>group__list.html</anchorfile> - <anchor>g2ef0298e970fdb93955860e7ee3f878c</anchor> + <anchor>ga11</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_index</name> <anchorfile>group__list.html</anchorfile> - <anchor>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor> + <anchor>ga12</anchor> <arglist>(const stp_list_t *list, int idx)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_name</name> <anchorfile>group__list.html</anchorfile> - <anchor>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor> + <anchor>ga13</anchor> <arglist>(const stp_list_t *list, const char *name)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_long_name</name> <anchorfile>group__list.html</anchorfile> - <anchor>gdbf12ab6f47d68f2605f211023c4f520</anchor> + <anchor>ga14</anchor> <arglist>(const stp_list_t *list, const char *long_name)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_get_length</name> <anchorfile>group__list.html</anchorfile> - <anchor>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor> + <anchor>ga15</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gc103cb4ff8870b3a8d90b6ebcade2498</anchor> + <anchor>ga16</anchor> <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist> </member> <member kind="function"> <type>stp_node_freefunc</type> <name>stp_list_get_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g9d344e3c6874e6033f8fc71370678bcf</anchor> + <anchor>ga17</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gec59dd3b87efc811ef2b6303102ed279</anchor> + <anchor>ga18</anchor> <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist> </member> <member kind="function"> <type>stp_node_copyfunc</type> <name>stp_list_get_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g310dd79907494b07d9005fbf50b9eb0c</anchor> + <anchor>ga19</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g97d7c6d659aa7d05bc54a349a07e10c0</anchor> + <anchor>ga20</anchor> <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist> </member> <member kind="function"> <type>stp_node_namefunc</type> <name>stp_list_get_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor> + <anchor>ga21</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_long_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g42bdba5fcb861bdf8facb9135039d9b8</anchor> + <anchor>ga22</anchor> <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist> </member> <member kind="function"> <type>stp_node_namefunc</type> <name>stp_list_get_long_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga95d8ace9b6ec71388007024c51865cb</anchor> + <anchor>ga23</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gbad08ce8ef257dae054ea3816ae88fe7</anchor> + <anchor>ga24</anchor> <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist> </member> <member kind="function"> <type>stp_node_sortfunc</type> <name>stp_list_get_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor> + <anchor>ga25</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_create</name> <anchorfile>group__list.html</anchorfile> - <anchor>g50f49648801707436012cd5dc66b1f8c</anchor> + <anchor>ga26</anchor> <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_destroy</name> <anchorfile>group__list.html</anchorfile> - <anchor>gde2acf279e8ea067fdc1f3f951d0b373</anchor> + <anchor>ga27</anchor> <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_item_prev</name> <anchorfile>group__list.html</anchorfile> - <anchor>gcee23493eafdfcfce51e2ccf29ebbf54</anchor> + <anchor>ga28</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_item_next</name> <anchorfile>group__list.html</anchorfile> - <anchor>gea9c1b6daae518ebecd2981289c555f3</anchor> + <anchor>ga29</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_list_item_get_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>g5b7d8ffea5a806953a43aee961a60fe4</anchor> + <anchor>ga30</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_set_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1b5d2889a81d712c3ba024e53bfd0f38</anchor> + <anchor>ga31</anchor> <arglist>(stp_list_item_t *item, void *data)</arglist> </member> </compound> <compound kind="file"> <name>module.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>module_8h</filename> <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes> <class kind="struct">stp_module_version</class> @@ -1796,92 +1796,92 @@ <type>stp_module_version</type> <name>stp_module_version_t</name> <anchorfile>module_8h.html</anchorfile> - <anchor>a6058b6828d19e60a3e6c86b242da863</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_module</type> <name>stp_module_t</name> <anchorfile>module_8h.html</anchorfile> - <anchor>1bc0723b8b43547b333980913ea42965</anchor> + <anchor>a1</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_module_class_t</name> - <anchor>df2656b9a248237bdf28247c133a046d</anchor> + <anchor>a13</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MODULE_CLASS_INVALID</name> - <anchor>df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452</anchor> + <anchor>a13a2</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MODULE_CLASS_MISC</name> - <anchor>df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01</anchor> + <anchor>a13a3</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MODULE_CLASS_FAMILY</name> - <anchor>df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6</anchor> + <anchor>a13a4</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MODULE_CLASS_COLOR</name> - <anchor>df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0</anchor> + <anchor>a13a5</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MODULE_CLASS_DITHER</name> - <anchor>df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c</anchor> + <anchor>a13a6</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_module_load</name> <anchorfile>module_8h.html</anchorfile> - <anchor>b07deb48be35f70644fcc6013b4debd9</anchor> + <anchor>a7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_module_exit</name> <anchorfile>module_8h.html</anchorfile> - <anchor>a5bfe6fda569e476ad52024d31eca3c4</anchor> + <anchor>a8</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_module_open</name> <anchorfile>module_8h.html</anchorfile> - <anchor>401000da13e2a7aacab2738838bf1fb2</anchor> + <anchor>a9</anchor> <arglist>(const char *modulename)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_module_init</name> <anchorfile>module_8h.html</anchorfile> - <anchor>8d52ac8df2ff7c4a28900fbb598c4848</anchor> + <anchor>a10</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_module_close</name> <anchorfile>module_8h.html</anchorfile> - <anchor>8e114f6e561ea2a5c4186b31eea363ad</anchor> + <anchor>a11</anchor> <arglist>(stp_list_item_t *module)</arglist> </member> <member kind="function"> <type>stp_list_t *</type> <name>stp_module_get_class</name> <anchorfile>module_8h.html</anchorfile> - <anchor>60ee652d3ddc0bf99abc8155b4e35a01</anchor> + <anchor>a12</anchor> <arglist>(stp_module_class_t class)</arglist> </member> </compound> <compound kind="file"> <name>mxml.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>mxml_8h</filename> <class kind="struct">stp_mxml_attr_s</class> <class kind="struct">stp_mxml_value_s</class> @@ -1892,388 +1892,388 @@ <type>#define</type> <name>STP_MXML_WRAP</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>76508c60800b84b90acf4e0f8e04288e</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_TAB</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>24760270636887d4dbbccca15164f4eb</anchor> + <anchor>a1</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_NO_CALLBACK</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>70032c4eda848436305b71f40cf913f7</anchor> + <anchor>a2</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_NO_PARENT</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>934b8d5744f37ba24d529a86f6e5f2e7</anchor> + <anchor>a3</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_DESCEND</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>2ed08f4813ad57773f412970856517f5</anchor> + <anchor>a4</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_NO_DESCEND</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>42831d4e1a69e57461d655f610bb995a</anchor> + <anchor>a5</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_DESCEND_FIRST</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>2692b08783d224aa4f726b13c4a7da68</anchor> + <anchor>a6</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_WS_BEFORE_OPEN</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>85b05ecef2dd56e2d66b0c3057705a9b</anchor> + <anchor>a7</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_WS_AFTER_OPEN</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>312f2553f5c5e2f974ca8f238064dadd</anchor> + <anchor>a8</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_WS_BEFORE_CLOSE</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>5ef0809e92527718236cf91e591f1276</anchor> + <anchor>a9</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_WS_AFTER_CLOSE</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>1ffe9b0d18eb95e8b85da3d09b195aee</anchor> + <anchor>a10</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_ADD_BEFORE</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>7ac1110fe031c1c8274171dda7c65ee8</anchor> + <anchor>a11</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_ADD_AFTER</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>aef62f3dd5005be25edf46856ffd0e67</anchor> + <anchor>a12</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MXML_ADD_TO_PARENT</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>7183b4ceb133647a5b559de1549356d1</anchor> + <anchor>a13</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>enum stp_mxml_type_e</type> <name>stp_mxml_type_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>1ed6fadf477121e16a83bc1899c30d5c</anchor> + <anchor>a14</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_mxml_attr_s</type> <name>stp_mxml_attr_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>1ed814dbc1628ca237bed68e27043438</anchor> + <anchor>a15</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_mxml_value_s</type> <name>stp_mxml_element_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>504a90f35ed408a7f80f6dbdadf45ae4</anchor> + <anchor>a16</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_mxml_text_s</type> <name>stp_mxml_text_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>a2b9c7f1c79258abe63be05529b2a908</anchor> + <anchor>a17</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_mxml_value_u</type> <name>stp_mxml_value_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>d162e4b65493580e8bee75ef0c8c12b6</anchor> + <anchor>a18</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_mxml_node_s</type> <name>stp_mxml_node_t</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>1d1a605dff310b7538b297c8e63b1d88</anchor> + <anchor>a19</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_mxml_type_e</name> - <anchor>dc40006361fa674950bded00ecfe2af1</anchor> + <anchor>a43</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MXML_ELEMENT</name> - <anchor>dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0</anchor> + <anchor>a43a20</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MXML_INTEGER</name> - <anchor>dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092</anchor> + <anchor>a43a21</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MXML_OPAQUE</name> - <anchor>dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d</anchor> + <anchor>a43a22</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MXML_REAL</name> - <anchor>dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d</anchor> + <anchor>a43a23</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_MXML_TEXT</name> - <anchor>dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6</anchor> + <anchor>a43a24</anchor> <arglist></arglist> </member> <member kind="function"> <type>void</type> <name>stp_mxmlAdd</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>f5b1214c9e580debaf0350f31d03467d</anchor> + <anchor>a25</anchor> <arglist>(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_mxmlDelete</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>cbdf0579701e7776af87fbb3c2bf9469</anchor> + <anchor>a26</anchor> <arglist>(stp_mxml_node_t *node)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_mxmlElementGetAttr</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>23f0ed075c389d9681fb5ed3c2ecddb9</anchor> + <anchor>a27</anchor> <arglist>(stp_mxml_node_t *node, const char *name)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_mxmlElementSetAttr</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>eae678d773da3b4075f1feea1b14eb84</anchor> + <anchor>a28</anchor> <arglist>(stp_mxml_node_t *node, const char *name, const char *value)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlFindElement</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>7c0efd099878ce90b220bf4c51324cce</anchor> + <anchor>a29</anchor> <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlLoadFile</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>db392c4e623e72d2b1985058564abf5d</anchor> + <anchor>a30</anchor> <arglist>(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlLoadString</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>9e275680a5730ef159757b20e041723d</anchor> + <anchor>a31</anchor> <arglist>(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlNewElement</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>305b60c2a9554ac30bb195e42cc82e75</anchor> + <anchor>a32</anchor> <arglist>(stp_mxml_node_t *parent, const char *name)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlNewInteger</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>e65d5658c5271a9e26c5a21bc0cc2f20</anchor> + <anchor>a33</anchor> <arglist>(stp_mxml_node_t *parent, int integer)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlNewOpaque</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>533ea6ec53f37f8bdd2d89d667b0d10a</anchor> + <anchor>a34</anchor> <arglist>(stp_mxml_node_t *parent, const char *opaque)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlNewReal</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>7754bd0d9af2be6edaeac7edf9c89c93</anchor> + <anchor>a35</anchor> <arglist>(stp_mxml_node_t *parent, double real)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlNewText</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>41566f9adbe5fe307a4643e073e3d914</anchor> + <anchor>a36</anchor> <arglist>(stp_mxml_node_t *parent, int whitespace, const char *string)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_mxmlRemove</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>6abe55831d77332db6b94b6cc0caaf02</anchor> + <anchor>a37</anchor> <arglist>(stp_mxml_node_t *node)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_mxmlSaveAllocString</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>e3723cad1353a2142fc1abaee599380c</anchor> + <anchor>a38</anchor> <arglist>(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))</arglist> </member> <member kind="function"> <type>int</type> <name>stp_mxmlSaveFile</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>bfabbd9dfdce248edc2f47de1faee7c3</anchor> + <anchor>a39</anchor> <arglist>(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))</arglist> </member> <member kind="function"> <type>int</type> <name>stp_mxmlSaveString</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>18d0fb42d5adb6b4337df82e61116050</anchor> + <anchor>a40</anchor> <arglist>(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlWalkNext</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>be88dab827e68c48b822c6250731fc57</anchor> + <anchor>a41</anchor> <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_mxmlWalkPrev</name> <anchorfile>mxml_8h.html</anchorfile> - <anchor>112485e5f15808619af7dd558528323f</anchor> + <anchor>a42</anchor> <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist> </member> </compound> <compound kind="file"> <name>paper.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>paper_8h</filename> <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes> <class kind="struct">stp_papersize_t</class> <member kind="enumeration"> <name>stp_papersize_unit_t</name> - <anchor>gbb66a8f6ce85d70afd9fe42472b492d8</anchor> + <anchor>ga5</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_ENGLISH_STANDARD</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor> + <anchor>gga5a0</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_METRIC_STANDARD</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor> + <anchor>gga5a1</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_ENGLISH_EXTENDED</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor> + <anchor>gga5a2</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_METRIC_EXTENDED</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor> + <anchor>gga5a3</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_known_papersizes</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor> + <anchor>ga0</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_name</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g9d655e3de6954ad3c5933dc736d2509a</anchor> + <anchor>ga1</anchor> <arglist>(const char *name)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_size</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g0438b0e4729f37579900b591e801f8ce</anchor> + <anchor>ga2</anchor> <arglist>(int length, int width)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_index</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g08bb891f58a7decfee2b073c00715993</anchor> + <anchor>ga3</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_default_media_size</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor> + <anchor>ga4</anchor> <arglist>(const stp_vars_t *v, int *width, int *height)</arglist> </member> </compound> <compound kind="file"> <name>path.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>path_8h</filename> <member kind="function"> <type>stp_list_t *</type> <name>stp_path_search</name> <anchorfile>path_8h.html</anchorfile> - <anchor>8591072873a5ee644a6dd22538d84c55</anchor> + <anchor>a0</anchor> <arglist>(stp_list_t *dirlist, const char *suffix)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_path_split</name> <anchorfile>path_8h.html</anchorfile> - <anchor>bc40460305f1f4f972c08a439f406449</anchor> + <anchor>a1</anchor> <arglist>(stp_list_t *list, const char *path)</arglist> </member> </compound> <compound kind="file"> <name>printers.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>printers_8h</filename> <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes> <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes> @@ -2283,479 +2283,479 @@ <type>stp_printer</type> <name>stp_printer_t</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g1a68662b730d44c11de6fb8226a309f6</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_family</type> <name>stp_family_t</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_printer_model_count</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor> + <anchor>ga2</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_index</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g1286559c60d239563f9f15fdd27996e0</anchor> + <anchor>ga3</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_long_name</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc041944e528afcb9a795eb6ece3fc6ff</anchor> + <anchor>ga4</anchor> <arglist>(const char *long_name)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g947fa230e08f9c854ca2608e76bd0d58</anchor> + <anchor>ga5</anchor> <arglist>(const char *driver)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor> + <anchor>ga6</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_printer_index_by_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g6f32b0213b580bf081fc8752a3eb04a1</anchor> + <anchor>ga7</anchor> <arglist>(const char *driver)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_long_name</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g00182878bdc39935e6382d7e41d55294</anchor> + <anchor>ga8</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g6c6c426f86307660079277ab6e90ae3d</anchor> + <anchor>ga9</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_family</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor> + <anchor>ga10</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_manufacturer</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gfc0382fd32b49ea9d171e4ce8b750c62</anchor> + <anchor>ga11</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_printer_get_model</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g7ba104f0ea5ce4a88175486894010b71</anchor> + <anchor>ga12</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const stp_vars_t *</type> <name>stp_printer_get_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>ge67398e65540b835f5c5d073c5ea0ec1</anchor> + <anchor>ga13</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_printer_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc3d8cdb65382cb13ea6b01072e6240d5</anchor> + <anchor>ga14</anchor> <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_print</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g121125e6646c6f6d8965f1857450749e</anchor> + <anchor>ga15</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_start_job</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g9cf59fba866430dd47508bac6561ef67</anchor> + <anchor>ga16</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_end_job</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g40637834f08a166992325af09f6a6030</anchor> + <anchor>ga17</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_model_id</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc09e99e20c8a19a13a5fb6356742a92a</anchor> + <anchor>ga18</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_verify_printer_params</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gd91f8e7a622725f0d47196cf912ddd8d</anchor> + <anchor>ga19</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_family_register</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g82b22438444849bdedb4cfbe22f209e8</anchor> + <anchor>ga20</anchor> <arglist>(stp_list_t *family)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_family_unregister</name> <anchorfile>group__printer.html</anchorfile> - <anchor>ga2ab30a5e5442b7a552fc3b884e1511b</anchor> + <anchor>ga21</anchor> <arglist>(stp_list_t *family)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_initialize_printer_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc9aba62164667822fd9f110740bab570</anchor> + <anchor>ga22</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_printer_list_parameters</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g666486047edfe4405d003b5c3bbe4b49</anchor> + <anchor>ga23</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_printer_describe_parameter</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g806f00d4167762c7a3d467ec37c8430e</anchor> + <anchor>ga24</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_describe_output</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g950e2cd193926440ba250dbc184d8588</anchor> + <anchor>ga25</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> </compound> <compound kind="file"> <name>sequence.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>sequence_8h</filename> <member kind="typedef"> <type>stp_sequence</type> <name>stp_sequence_t</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gb3d4cae653c4303a6e5d26b516694c92</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_sequence_t *</type> <name>stp_sequence_create</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor> + <anchor>ga1</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_destroy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor> + <anchor>ga2</anchor> <arglist>(stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_copy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g5792d6f821525514199dd2d9b332ddd4</anchor> + <anchor>ga3</anchor> <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist> </member> <member kind="function"> <type>stp_sequence_t *</type> <name>stp_sequence_create_copy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd37eb66db88ac93b853ba6e02b9155bc</anchor> + <anchor>ga4</anchor> <arglist>(const stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_bounds</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd56df3112937c11431e033f2d9574b96</anchor> + <anchor>ga5</anchor> <arglist>(stp_sequence_t *sequence, double low, double high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_bounds</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g392e1da122d95d6fc07b6d73eff1d311</anchor> + <anchor>ga6</anchor> <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_range</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc2c70c539a3eced45be306d082faa3a6</anchor> + <anchor>ga7</anchor> <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_size</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g166e9a610bd53cb812e328d9e111f240</anchor> + <anchor>ga8</anchor> <arglist>(stp_sequence_t *sequence, size_t size)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_sequence_get_size</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g99292c5ba10bcf1574c3e71a593c3e5f</anchor> + <anchor>ga9</anchor> <arglist>(const stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g24024e771a50db02f2713b244212603e</anchor> + <anchor>ga10</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_subrange</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor> + <anchor>ga11</anchor> <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc33208fae031bd1111f8ceb4c1425199</anchor> + <anchor>ga12</anchor> <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_point</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gf7f49101192387e29399ded6d3166d13</anchor> + <anchor>ga13</anchor> <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_get_point</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g044210129f28c298152ce124371324d4</anchor> + <anchor>ga14</anchor> <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_float_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g34a526cb5e72b611ac8a98b559c24e2e</anchor> + <anchor>ga15</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_long_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd15e2cf350bb311da58f4b11240fa0f2</anchor> + <anchor>ga16</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_ulong_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gbc7ec322716d761436e4ad2d5d2f756f</anchor> + <anchor>ga17</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_int_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd4f058b2c690ad4e326970cc841d8f79</anchor> + <anchor>ga18</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_uint_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g40cd6256eb5bb72decd60edd1dc3be54</anchor> + <anchor>ga19</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_short_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>ge0d6719f863a10422dea23e7f4b4dd29</anchor> + <anchor>ga20</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_ushort_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g68aed44bbf6ede9ac49237091f2deb43</anchor> + <anchor>ga21</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist> </member> <member kind="function"> <type>const float *</type> <name>stp_sequence_get_float_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gf8cd9da688af479103cf8600e48f61c9</anchor> + <anchor>ga22</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const long *</type> <name>stp_sequence_get_long_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g864b55caa3a8c0e573031a36f57f7cc4</anchor> + <anchor>ga23</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned long *</type> <name>stp_sequence_get_ulong_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor> + <anchor>ga24</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const int *</type> <name>stp_sequence_get_int_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g4396baf0d338eec6f3bce3e2000da978</anchor> + <anchor>ga25</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned int *</type> <name>stp_sequence_get_uint_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g204f77e91c9283dc6ec6e742687bb0db</anchor> + <anchor>ga26</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const short *</type> <name>stp_sequence_get_short_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g91a68efd6b99150739c7706f65703a2f</anchor> + <anchor>ga27</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned short *</type> <name>stp_sequence_get_ushort_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g8bf46faeea891ac7ca699591df596bc1</anchor> + <anchor>ga28</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> </compound> <compound kind="file"> <name>string-list.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>string-list_8h</filename> <class kind="struct">stp_param_string_t</class> <member kind="typedef"> <type>stp_string_list</type> <name>stp_string_list_t</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>6ec7eafa9cb77e5c4c2502e19f1a3f5b</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_string_list_t *</type> <name>stp_string_list_create</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>65077aa7201209fcaa58553d904fbc34</anchor> + <anchor>a1</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_string_list_destroy</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>35638794468f0bb0dd7b912dac655bd5</anchor> + <anchor>a2</anchor> <arglist>(stp_string_list_t *list)</arglist> </member> <member kind="function"> <type>stp_param_string_t *</type> <name>stp_string_list_param</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>997c38e27e8ad480118b84a6fdca4d79</anchor> + <anchor>a3</anchor> <arglist>(const stp_string_list_t *list, size_t element)</arglist> </member> <member kind="function"> <type>stp_param_string_t *</type> <name>stp_string_list_find</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>25fd88ec425121519cc25d5279d29e6f</anchor> + <anchor>a4</anchor> <arglist>(const stp_string_list_t *list, const char *name)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_string_list_count</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>023eaab359b2f3c22d1a4fa7013e01ef</anchor> + <anchor>a5</anchor> <arglist>(const stp_string_list_t *list)</arglist> </member> <member kind="function"> <type>stp_string_list_t *</type> <name>stp_string_list_create_copy</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>e2f7a65ea28e02e39cc223898137127b</anchor> + <anchor>a6</anchor> <arglist>(const stp_string_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_string_list_add_string</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>b9e6a3a7944ca10102b1a30a3acc6767</anchor> + <anchor>a7</anchor> <arglist>(stp_string_list_t *list, const char *name, const char *text)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_string_list_remove_string</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>26d7d318ddcbe976df1c91134d1ab262</anchor> + <anchor>a8</anchor> <arglist>(stp_string_list_t *list, const char *name)</arglist> </member> <member kind="function"> <type>stp_string_list_t *</type> <name>stp_string_list_create_from_params</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>a4938d0cb58828f5d27086ae9c400857</anchor> + <anchor>a9</anchor> <arglist>(const stp_param_string_t *list, size_t count)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_string_list_is_present</name> <anchorfile>string-list_8h.html</anchorfile> - <anchor>333d878e45062e5f3ef5cf63602f4ce3</anchor> + <anchor>a10</anchor> <arglist>(const stp_string_list_t *list, const char *value)</arglist> </member> </compound> <compound kind="file"> <name>util.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>util_8h</filename> <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes> <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes> @@ -2763,391 +2763,391 @@ <type>#define</type> <name>STP_DBG_LUT</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9ef88b326f83d342849fa89c33c7e4a7</anchor> + <anchor>ga33</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_COLORFUNC</name> <anchorfile>group__util.html</anchorfile> - <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor> + <anchor>ga34</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_INK</name> <anchorfile>group__util.html</anchorfile> - <anchor>g328a4b66d0767134649ce30b243931c9</anchor> + <anchor>ga35</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g8d8211f97675b37f18bff822757d04b3</anchor> + <anchor>ga36</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PCL</name> <anchorfile>group__util.html</anchorfile> - <anchor>g30a9efd31b78debefd550d0b337ec795</anchor> + <anchor>ga37</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_ESCP2</name> <anchorfile>group__util.html</anchorfile> - <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor> + <anchor>ga38</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CANON</name> <anchorfile>group__util.html</anchorfile> - <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor> + <anchor>ga39</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_LEXMARK</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor> + <anchor>ga40</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_WEAVE_PARAMS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor> + <anchor>ga41</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_ROWS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb764d477ebf0db4957cc316badac70bd</anchor> + <anchor>ga42</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_MARK_FILE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor> + <anchor>ga43</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_LIST</name> <anchorfile>group__util.html</anchorfile> - <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor> + <anchor>ga44</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_MODULE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor> + <anchor>ga45</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PATH</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor> + <anchor>ga46</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PAPER</name> <anchorfile>group__util.html</anchorfile> - <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor> + <anchor>ga47</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PRINTERS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor> + <anchor>ga48</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_XML</name> <anchorfile>group__util.html</anchorfile> - <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor> + <anchor>ga49</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_VARS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g52844a51058ca29f975b5666743622ac</anchor> + <anchor>ga50</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_OLYMPUS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor> + <anchor>ga51</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CURVE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor> + <anchor>ga52</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CURVE_ERRORS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor> + <anchor>ga53</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_SAFE_FREE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor> + <anchor>ga54</anchor> <arglist>(x)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_init</name> <anchorfile>group__util.html</anchorfile> - <anchor>g69354e5830712093045a4ba290a298f8</anchor> + <anchor>ga0</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_set_output_codeset</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor> + <anchor>ga1</anchor> <arglist>(const char *codeset)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_read_and_compose_curves</name> <anchorfile>group__util.html</anchorfile> - <anchor>g21168356d466d278f11dab2be8d0016e</anchor> + <anchor>ga2</anchor> <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_abort</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor> + <anchor>ga3</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_prune_inactive_options</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor> + <anchor>ga4</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_zprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor> + <anchor>ga5</anchor> <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_zfwrite</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9135d4c8cac78593aff55b668d09b79c</anchor> + <anchor>ga6</anchor> <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_putc</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf07e31a63021b4d504cc5a410e1aeb08</anchor> + <anchor>ga7</anchor> <arglist>(int ch, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put16_le</name> <anchorfile>group__util.html</anchorfile> - <anchor>g01199dc1d5a3db973d22cc9db00a4f41</anchor> + <anchor>ga8</anchor> <arglist>(unsigned short sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put16_be</name> <anchorfile>group__util.html</anchorfile> - <anchor>g3c20beae37d9841e095b336d6f7dcc1d</anchor> + <anchor>ga9</anchor> <arglist>(unsigned short sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put32_le</name> <anchorfile>group__util.html</anchorfile> - <anchor>g0a445c531388afa31650ef4ccdac3ae1</anchor> + <anchor>ga10</anchor> <arglist>(unsigned int sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put32_be</name> <anchorfile>group__util.html</anchorfile> - <anchor>gbe0e31fbc0c4e6374903b25edc594f5e</anchor> + <anchor>ga11</anchor> <arglist>(unsigned int sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_puts</name> <anchorfile>group__util.html</anchorfile> - <anchor>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor> + <anchor>ga12</anchor> <arglist>(const char *s, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_send_command</name> <anchorfile>group__util.html</anchorfile> - <anchor>g23ee64de1ec6ef5a4941ab80ba609840</anchor> + <anchor>ga13</anchor> <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_erputc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g859b75eddde620338859121451096097</anchor> + <anchor>ga14</anchor> <arglist>(int ch)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_eprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g47c73485971132d9b41a33bdf572f670</anchor> + <anchor>ga15</anchor> <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_erprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g5f6389ed7d500f851cabe8425a158e4b</anchor> + <anchor>ga16</anchor> <arglist>(const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void</type> <name>stp_asprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g6bdd7099220fe310b228dcff5159b8d9</anchor> + <anchor>ga17</anchor> <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void void</type> <name>stp_catprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor> + <anchor>ga18</anchor> <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>unsigned long</type> <name>stp_get_debug_level</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9ab4c35dd4b6e142281ff36ecedee27e</anchor> + <anchor>ga19</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor> + <anchor>ga20</anchor> <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_deprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor> + <anchor>ga21</anchor> <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void</type> <name>stp_init_debug_messages</name> <anchorfile>group__util.html</anchorfile> - <anchor>g26a43ceec27ca34bc49f4806900b4618</anchor> + <anchor>ga22</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_flush_debug_messages</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf39c22b74843750ca74a6caccb263c7c</anchor> + <anchor>ga23</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_malloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor> + <anchor>ga24</anchor> <arglist>(size_t)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_zalloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor> + <anchor>ga25</anchor> <arglist>(size_t)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_realloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor> + <anchor>ga26</anchor> <arglist>(void *ptr, size_t)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_free</name> <anchorfile>group__util.html</anchorfile> - <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor> + <anchor>ga27</anchor> <arglist>(void *ptr)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_strlen</name> <anchorfile>group__util.html</anchorfile> - <anchor>g054943d301baecba82cdb78b7e454880</anchor> + <anchor>ga28</anchor> <arglist>(const char *s)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_strndup</name> <anchorfile>group__util.html</anchorfile> - <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor> + <anchor>ga29</anchor> <arglist>(const char *s, int n)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_strdup</name> <anchorfile>group__util.html</anchorfile> - <anchor>g2f861f4a98ad496ca8cd995147867f32</anchor> + <anchor>ga30</anchor> <arglist>(const char *s)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_version</name> <anchorfile>group__util.html</anchorfile> - <anchor>g77022a2cfde3a9ba9269f1bc3726175c</anchor> + <anchor>ga31</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_release_version</name> <anchorfile>group__util.html</anchorfile> - <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor> + <anchor>ga32</anchor> <arglist>(void)</arglist> </member> </compound> <compound kind="file"> <name>vars.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>vars_8h</filename> <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes> <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes> @@ -3160,1100 +3160,1100 @@ <type>stp_vars</type> <name>stp_vars_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gde33aeed00b53e4af71ee1f7c4326279</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void *</type> <name>stp_parameter_list_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>const void *</type> <name>stp_const_parameter_list_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor> + <anchor>ga2</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_outfunc_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd11be815334025415a8e2023e0cd44c5</anchor> + <anchor>ga3</anchor> <arglist>)(void *data, const char *buffer, size_t bytes)</arglist> </member> <member kind="typedef"> <type>void *(*</type> <name>stp_copy_data_func_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd31fc080a2bd980c6a05a541dc1612a3</anchor> + <anchor>ga4</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_free_data_func_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3f7233002f4db790a077e33c2661665c</anchor> + <anchor>ga5</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>stp_compdata</type> <name>compdata_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9ee295029ad2d072b4099dc390359900</anchor> + <anchor>ga6</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_type_t</name> - <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor> + <anchor>ga132</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_STRING_LIST</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor> + <anchor>gga132a7</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_INT</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor> + <anchor>gga132a8</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_BOOLEAN</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor> + <anchor>gga132a9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_DOUBLE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor> + <anchor>gga132a10</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_CURVE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor> + <anchor>gga132a11</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_FILE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor> + <anchor>gga132a12</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_RAW</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor> + <anchor>gga132a13</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_ARRAY</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor> + <anchor>gga132a14</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_DIMENSION</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor> + <anchor>gga132a15</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_INVALID</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor> + <anchor>gga132a16</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_class_t</name> - <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor> + <anchor>ga133</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_FEATURE</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor> + <anchor>gga133a17</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_OUTPUT</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor> + <anchor>gga133a18</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_CORE</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor> + <anchor>gga133a19</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_INVALID</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor> + <anchor>gga133a20</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_level_t</name> - <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor> + <anchor>ga134</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_BASIC</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor> + <anchor>gga134a21</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor> + <anchor>gga134a22</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED1</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor> + <anchor>gga134a23</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED2</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor> + <anchor>gga134a24</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED3</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor> + <anchor>gga134a25</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED4</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor> + <anchor>gga134a26</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_INTERNAL</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor> + <anchor>gga134a27</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_EXTERNAL</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor> + <anchor>gga134a28</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_INVALID</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor> + <anchor>gga134a29</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_activity_t</name> - <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor> + <anchor>ga135</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_INACTIVE</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor> + <anchor>gga135a30</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_DEFAULTED</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor> + <anchor>gga135a31</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_ACTIVE</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor> + <anchor>gga135a32</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_verify_t</name> - <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor> + <anchor>ga136</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_BAD</name> - <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor> + <anchor>gga136a33</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_OK</name> - <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor> + <anchor>gga136a34</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_INACTIVE</name> - <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor> + <anchor>gga136a35</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_vars_t *</type> <name>stp_vars_create</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_vars_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor> + <anchor>ga8</anchor> <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist> </member> <member kind="function"> <type>stp_vars_t *</type> <name>stp_vars_create_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3c6d765cc5a27b322289e9baa9d97098</anchor> + <anchor>ga9</anchor> <arglist>(const stp_vars_t *source)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_vars_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g78259fcaa881655a07ef0b2b457bdf70</anchor> + <anchor>ga10</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_driver</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga8d9dbb1e613cfe2b119668158e35a76</anchor> + <anchor>ga11</anchor> <arglist>(stp_vars_t *v, const char *val)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_driver_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge303a6ed77135b691ebbfd56cb577531</anchor> + <anchor>ga12</anchor> <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_driver</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcf8efdb6fd9847e41c85f9491a252f01</anchor> + <anchor>ga13</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_color_conversion</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g335e7eb264fa22343765146fb2318b31</anchor> + <anchor>ga14</anchor> <arglist>(stp_vars_t *v, const char *val)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_color_conversion_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3164aa99994dabb561d6c295eb647123</anchor> + <anchor>ga15</anchor> <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_color_conversion</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g087136342c500c138d73dbe0e2aad11a</anchor> + <anchor>ga16</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_left</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5d675ab9877df60ec467a20a0d62fcbc</anchor> + <anchor>ga17</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_left</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd3fbd778898c2b0fba19d0937fb939f5</anchor> + <anchor>ga18</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_top</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor> + <anchor>ga19</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_top</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor> + <anchor>ga20</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor> + <anchor>ga21</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor> + <anchor>ga22</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g68110f6d19b3987f6f66baee3926eb89</anchor> + <anchor>ga23</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7623276e130cb684670ecb153300ebaf</anchor> + <anchor>ga24</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_page_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g751759cdeb8feb061c00f35d37fea45c</anchor> + <anchor>ga25</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_page_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gea14f3cad139fc5b8d547a252deacff3</anchor> + <anchor>ga26</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_page_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g775714bf75f1fdbdd895f59edc9eca55</anchor> + <anchor>ga27</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_page_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g94d8cf912e3b036f67bc2d4c37d733ff</anchor> + <anchor>ga28</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_outfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g30d5438686c8ead9a092f98bf3c3d8ca</anchor> + <anchor>ga29</anchor> <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist> </member> <member kind="function"> <type>stp_outfunc_t</type> <name>stp_get_outfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g095834813ebbe8985d443e1fa78a0b98</anchor> + <anchor>ga30</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_errfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge89d8eb48e4a7a8107b87a44a4318064</anchor> + <anchor>ga31</anchor> <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist> </member> <member kind="function"> <type>stp_outfunc_t</type> <name>stp_get_errfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor> + <anchor>ga32</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_outdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8fef23ae01a368f4d16ad95813d97d6d</anchor> + <anchor>ga33</anchor> <arglist>(stp_vars_t *v, void *val)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_outdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g54e35f94578f346c07718587f18b049c</anchor> + <anchor>ga34</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_errdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7a006418c4dbb265be71f7b5a202455d</anchor> + <anchor>ga35</anchor> <arglist>(stp_vars_t *v, void *val)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_errdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor> + <anchor>ga36</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_merge_printvars</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc970fc314c6418d9193d93c787b908d9</anchor> + <anchor>ga37</anchor> <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_get_parameter_list</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g955b215a88b868cfc74d7a340de9b8f6</anchor> + <anchor>ga38</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_parameter_list_count</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf69f651a798e9f06c67baf06f0754228</anchor> + <anchor>ga39</anchor> <arglist>(stp_const_parameter_list_t list)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_find</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3dea1f995d40482b9f6470fedd994f95</anchor> + <anchor>ga40</anchor> <arglist>(stp_const_parameter_list_t list, const char *name)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_list_param</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g96fc73864dfc00ae418f14a81c72be26</anchor> + <anchor>ga41</anchor> <arglist>(stp_const_parameter_list_t list, size_t item)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd0f6c2b153638f551d7709780eb7276a</anchor> + <anchor>ga42</anchor> <arglist>(stp_parameter_list_t list)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_parameter_list_create</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3c1ddd3c10c367c0912fdd841576278f</anchor> + <anchor>ga43</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_add_param</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor> + <anchor>ga44</anchor> <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_parameter_list_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g62c6225b0721d5c80d889edc307f0b6b</anchor> + <anchor>ga45</anchor> <arglist>(stp_const_parameter_list_t list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_append</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf8aa1d7aba11de5fdee95b9cb339be61</anchor> + <anchor>ga46</anchor> <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_describe_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ged453c314365a3948b195e3175455a12</anchor> + <anchor>ga47</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_description_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc5a3eb0348d31acf60772265c3896542</anchor> + <anchor>ga48</anchor> <arglist>(stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_find_in_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g711cf3e5e52fd3434ef7a9d16654aea8</anchor> + <anchor>ga49</anchor> <arglist>(const stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22338d64a871a8b279fdee6fd83fff7f</anchor> + <anchor>ga50</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5182246d4e0653f73dfaa40b62d4285f</anchor> + <anchor>ga51</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8134e4dc36b063a7d7dd229b9df32726</anchor> + <anchor>ga52</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6e6c5474c253a452073eba25251a1481</anchor> + <anchor>ga53</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g82f7bbcf639c60678c1dc2aee24e8a24</anchor> + <anchor>ga54</anchor> <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor> + <anchor>ga55</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g778b0e43aad1e011012b8071b469c694</anchor> + <anchor>ga56</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8f67ed7dcee969e77374fb4daf468d58</anchor> + <anchor>ga57</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5f4adaadb80cd2d94569881d96cfa02e</anchor> + <anchor>ga58</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1f63514f8ffd8ea56f0beee69398ee01</anchor> + <anchor>ga59</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd40038a74fa7548da5fcaec6687c8787</anchor> + <anchor>ga60</anchor> <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_scale_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gec605c647cab13d61ab5e2822d9f7ead</anchor> + <anchor>ga61</anchor> <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g71306c3e3118d9a4545b0a3cefb863ea</anchor> + <anchor>ga62</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_string_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g65b18994af3384af04e2bf77e288f54f</anchor> + <anchor>ga63</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae28e4c640fba005a72e92af66327b50</anchor> + <anchor>ga64</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_file_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdeae102d1bd65147221f56e6095f35ef</anchor> + <anchor>ga65</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g59b79c779211a72de534fb9e61548f97</anchor> + <anchor>ga66</anchor> <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gbf1d9c938d364598414e9f15c41c1f08</anchor> + <anchor>ga67</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g18b8a4fb414245d2c30df9ee11057845</anchor> + <anchor>ga68</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd286782f691998858e30a202506bad74</anchor> + <anchor>ga69</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdd7769bfece8597cde869eced1239a1e</anchor> + <anchor>ga70</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga1620e4be3c7fb85262802338d3143f6</anchor> + <anchor>ga71</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf95184ecee86a92db2a7d3f050154a46</anchor> + <anchor>ga72</anchor> <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga59b141facb320c409d9071f469fdbc5</anchor> + <anchor>ga73</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5efb45e6883a2522fd7e78c6eb761c79</anchor> + <anchor>ga74</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_get_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g46195f69cc57bd18a4cde5756dd84601</anchor> + <anchor>ga75</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor> + <anchor>ga76</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb4121cba599314c929d04cce0e850473</anchor> + <anchor>ga77</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g4cc8b69619067f882035cca46e9ce0cd</anchor> + <anchor>ga78</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_curve_t *</type> <name>stp_get_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1a5a2746548465d681d00c6301a26100</anchor> + <anchor>ga79</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_array_t *</type> <name>stp_get_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb918206f9b70fff5d58a16a762295981</anchor> + <anchor>ga80</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_raw_t *</type> <name>stp_get_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor> + <anchor>ga81</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor> + <anchor>ga82</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7acde85eb361525f5cf481bafddbc1bd</anchor> + <anchor>ga83</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g740a5cab681f30b8cc5e4ca18197e472</anchor> + <anchor>ga84</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g4841e9250e4c7f38f2267355402ffcc1</anchor> + <anchor>ga85</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g28203d9250f232f9af290802cf2db881</anchor> + <anchor>ga86</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge5b7e3356b3c1c893620fdeeea486e48</anchor> + <anchor>ga87</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9e992f880bd74cd4097527a39aea7125</anchor> + <anchor>ga88</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb9df68cbf9973203adfca5e1293b300a</anchor> + <anchor>ga89</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga79b051578077beca548be224062705c</anchor> + <anchor>ga90</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g44793f2cf64b11917b8943d20ee43b9d</anchor> + <anchor>ga91</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8c04ab4487623a41e0b2600d466a88ad</anchor> + <anchor>ga92</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_float_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor> + <anchor>ga93</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_int_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1c724bc85737bf8c698a08bc2d441b3e</anchor> + <anchor>ga94</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_dimension_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6fa1953ee96051566a261f3391da3857</anchor> + <anchor>ga95</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_boolean_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor> + <anchor>ga96</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_curve_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g160150a3a39d66f5a807d1c750a57890</anchor> + <anchor>ga97</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_array_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf2aada3c00f9b00bc6a65014da87e250</anchor> + <anchor>ga98</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_raw_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9fe388535a67f8360ab21f58233c0e17</anchor> + <anchor>ga99</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae6b21f76f675516e9189c47444e17cf</anchor> + <anchor>ga100</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor> + <anchor>ga101</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g2deea3612965e28cd0d513c5850ca074</anchor> + <anchor>ga102</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g056b021334fe812aa14bbbfd60aafba8</anchor> + <anchor>ga103</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcdfa2f747081721c03b10484a832a535</anchor> + <anchor>ga104</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gadfd66825dd58fb8e0851d493445c4e4</anchor> + <anchor>ga105</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>geecfc1f1fdc97ea165ae35b64de95178</anchor> + <anchor>ga106</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdf6c305c48d012bc138db025c9bd63df</anchor> + <anchor>ga107</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5bd30b408d6ec16b3999dce5e540a5fa</anchor> + <anchor>ga108</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_string_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gda8dd20ab17a9b403c68b4cd86fb529c</anchor> + <anchor>ga109</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_file_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g0f09e85b570ffee4a4d94853bb22bcb3</anchor> + <anchor>ga110</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_float_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g28d01beda4b54cec395654847dbbc301</anchor> + <anchor>ga111</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_int_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor> + <anchor>ga112</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_dimension_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8125d08f90002e654f2e45427e2f0251</anchor> + <anchor>ga113</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_boolean_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor> + <anchor>ga114</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_curve_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb686075ecbdf349387c356826b432191</anchor> + <anchor>ga115</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_array_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g64e5f74483ffb7bd4412f4eefeb22250</anchor> + <anchor>ga116</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_raw_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g57abcfb2fa58e743f9d30f579481845a</anchor> + <anchor>ga117</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_media_size</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge690d9171bcdb0fedf981804bb923fac</anchor> + <anchor>ga118</anchor> <arglist>(const stp_vars_t *v, int *width, int *height)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_imageable_area</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gebcb03afca6bb0d94e71bdf570d09af9</anchor> + <anchor>ga119</anchor> <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_size_limit</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor> + <anchor>ga120</anchor> <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_describe_resolution</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5735451225c2a355cb11c165e011637d</anchor> + <anchor>ga121</anchor> <arglist>(const stp_vars_t *v, int *x, int *y)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_verify</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge28b0d78641811b1625a52971a2d11fa</anchor> + <anchor>ga122</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>const stp_vars_t *</type> <name>stp_default_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9f897908b19f5f0cdaf75b483d46e041</anchor> + <anchor>ga123</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_allocate_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor> + <anchor>ga124</anchor> <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_destroy_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g089f9a34f26f700f43858ba3959d8f13</anchor> + <anchor>ga125</anchor> <arglist>(stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8eea0724106ea7174b808026ae8d1a5c</anchor> + <anchor>ga126</anchor> <arglist>(const stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>stp_parameter_verify_t</type> <name>stp_verify_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf64e586fca554f2dd65157a76eaad34a</anchor> + <anchor>ga127</anchor> <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_verified</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga1b826f02f84aa038c6862575770b629</anchor> + <anchor>ga128</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_verified</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8a2924dd6393431e994d22c704ec25fc</anchor> + <anchor>ga129</anchor> <arglist>(stp_vars_t *v, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_copy_options</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor> + <anchor>ga130</anchor> <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_fill_parameter_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6a08746f33133e8873236b35eb1e7a62</anchor> + <anchor>ga131</anchor> <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist> </member> </compound> <compound kind="file"> <name>weave.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>weave_8h</filename> <class kind="struct">stp_weave_t</class> <class kind="struct">stp_pass_t</class> @@ -4266,335 +4266,335 @@ <type>#define</type> <name>STP_MAX_WEAVE</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>46ee59dd8e65c35e69ba8cfa94e90786</anchor> + <anchor>a0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>int</type> <name>stp_packfunc</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>ebd02297dfdf36f818d0ff48c900f561</anchor> + <anchor>a1</anchor> <arglist>(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</arglist> </member> <member kind="typedef"> <type>void</type> <name>stp_fillfunc</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>910269f43cbcff87ce004bb20b659d9e</anchor> + <anchor>a2</anchor> <arglist>(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)</arglist> </member> <member kind="typedef"> <type>void</type> <name>stp_flushfunc</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>76c426b3b4c3b2503c54f2c2a013768a</anchor> + <anchor>a3</anchor> <arglist>(stp_vars_t *v, int passno, int vertical_subpass)</arglist> </member> <member kind="typedef"> <type>int</type> <name>stp_compute_linewidth_func</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>520099a705f78fd503d204665ee21d5d</anchor> + <anchor>a4</anchor> <arglist>(stp_vars_t *v, int n)</arglist> </member> <member kind="enumeration"> <name>stp_weave_strategy_t</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce027</anchor> + <anchor>a26</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_ZIGZAG</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc</anchor> + <anchor>a26a11</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_ASCENDING</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d</anchor> + <anchor>a26a12</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_DESCENDING</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f</anchor> + <anchor>a26a13</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_ASCENDING_2X</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12</anchor> + <anchor>a26a14</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_STAGGERED</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501</anchor> + <anchor>a26a15</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_WEAVE_ASCENDING_3X</name> - <anchor>6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b</anchor> + <anchor>a26a16</anchor> <arglist></arglist> </member> <member kind="function"> <type>void</type> <name>stp_initialize_weave</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>9b72df98be9b9e25b42aca6ef5901d35</anchor> + <anchor>a17</anchor> <arglist>(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_flush_all</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>5b0aac599abc4859e2d208db7185cdbf</anchor> + <anchor>a18</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_write_weave</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>b021ec20fafa48e57495123df1533b62</anchor> + <anchor>a19</anchor> <arglist>(stp_vars_t *v, unsigned char *const cols[])</arglist> </member> <member kind="function"> <type>stp_lineoff_t *</type> <name>stp_get_lineoffsets_by_pass</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>816c57bb673bebebaa42576b3e452206</anchor> + <anchor>a20</anchor> <arglist>(const stp_vars_t *v, int pass)</arglist> </member> <member kind="function"> <type>stp_lineactive_t *</type> <name>stp_get_lineactive_by_pass</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>14c1a0f43a0353f7771632d3a0356cea</anchor> + <anchor>a21</anchor> <arglist>(const stp_vars_t *v, int pass)</arglist> </member> <member kind="function"> <type>stp_linecount_t *</type> <name>stp_get_linecount_by_pass</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>46dacaec8d953a33f6c15299f3a91046</anchor> + <anchor>a22</anchor> <arglist>(const stp_vars_t *v, int pass)</arglist> </member> <member kind="function"> <type>const stp_linebufs_t *</type> <name>stp_get_linebases_by_pass</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>207eac262dceb86f20fe32b048b257ad</anchor> + <anchor>a23</anchor> <arglist>(const stp_vars_t *v, int pass)</arglist> </member> <member kind="function"> <type>stp_pass_t *</type> <name>stp_get_pass_by_pass</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>129f77403ade9f504dd38185a7ab6209</anchor> + <anchor>a24</anchor> <arglist>(const stp_vars_t *v, int pass)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_weave_parameters_by_row</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>3dbb20fd24c73c2982819b1f184b7ee3</anchor> + <anchor>a25</anchor> <arglist>(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)</arglist> </member> <member kind="variable"> <type>stp_packfunc</type> <name>stp_pack_tiff</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>27cae2ded3a9434dd6f332dbf6721f71</anchor> + <anchor>a5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_packfunc</type> <name>stp_pack_uncompressed</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>b81173e35f655b1a8f0047cbadce5391</anchor> + <anchor>a6</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_fillfunc</type> <name>stp_fill_tiff</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>6c47bead0399664b9041a6d5687b091e</anchor> + <anchor>a7</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_fillfunc</type> <name>stp_fill_uncompressed</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>fb161f053574d9cd4a47b613b614b0f3</anchor> + <anchor>a8</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_compute_linewidth_func</type> <name>stp_compute_tiff_linewidth</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>a6df061ed81c1a6ecb8854b6eab4e276</anchor> + <anchor>a9</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_compute_linewidth_func</type> <name>stp_compute_uncompressed_linewidth</name> <anchorfile>weave_8h.html</anchorfile> - <anchor>f6c7a76f229fdc0be020a53a15a4a5f5</anchor> + <anchor>a10</anchor> <arglist></arglist> </member> </compound> <compound kind="file"> <name>xml.h</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> <filename>xml_8h</filename> <includes id="mxml_8h" name="mxml.h" local="no" imported="no">gutenprint/mxml.h</includes> <member kind="typedef"> <type>int(*</type> <name>stp_xml_parse_func</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>ec3dca5a8c562175532452b7a055200f</anchor> + <anchor>a0</anchor> <arglist>)(stp_mxml_node_t *node, const char *file)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_register_xml_parser</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>3258e11973b45c04e9ec1810789cface</anchor> + <anchor>a1</anchor> <arglist>(const char *name, stp_xml_parse_func parse_func)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unregister_xml_parser</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>bdff70654d8ca31445e0957cfad68816</anchor> + <anchor>a2</anchor> <arglist>(const char *name)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_register_xml_preload</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>0377f341fce4c764d695b851cf90125c</anchor> + <anchor>a3</anchor> <arglist>(const char *filename)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_unregister_xml_preload</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>f9605dfeaf5ba8c41b42aba2c09b4f20</anchor> + <anchor>a4</anchor> <arglist>(const char *filename)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_xml_init_defaults</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>9e2620e798edcd889cd80454374a0a1d</anchor> + <anchor>a5</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_xml_parse_file</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>477e8c523df78a068e98be5e929d6825</anchor> + <anchor>a6</anchor> <arglist>(const char *file)</arglist> </member> <member kind="function"> <type>long</type> <name>stp_xmlstrtol</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>56885d576d38f8fbffce10834e892117</anchor> + <anchor>a7</anchor> <arglist>(const char *value)</arglist> </member> <member kind="function"> <type>unsigned long</type> <name>stp_xmlstrtoul</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>9d7f6cba6d4f5b8b01b6d3c192d10596</anchor> + <anchor>a8</anchor> <arglist>(const char *value)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_xmlstrtod</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>666632a9a3cb7f802fd5478d68d57166</anchor> + <anchor>a9</anchor> <arglist>(const char *textval)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_xml_init</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>e279cdb2639cb00884563204c586e34a</anchor> + <anchor>a10</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_xml_exit</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>d35445001b4f0ff02b45cf411b056cb2</anchor> + <anchor>a11</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_xml_get_node</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>acec0c2b6d806a70b74c2c9efb5ca895</anchor> + <anchor>a12</anchor> <arglist>(stp_mxml_node_t *xmlroot,...)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_xmldoc_create_generic</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>d698808efae24e1f0002243256171fc0</anchor> + <anchor>a13</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_xml_preinit</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>e2aeb50ec9bffd4cc7ff4b8756ce503a</anchor> + <anchor>a14</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_sequence_t *</type> <name>stp_sequence_create_from_xmltree</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>174add090763cd3d8a019da75257e9c5</anchor> + <anchor>a15</anchor> <arglist>(stp_mxml_node_t *da)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_xmltree_create_from_sequence</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>134d8ffe83aa1bc29ca65869af337479</anchor> + <anchor>a16</anchor> <arglist>(const stp_sequence_t *seq)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_xmltree</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>4b39835d489b183bdf939551f7b6871b</anchor> + <anchor>a17</anchor> <arglist>(stp_mxml_node_t *da)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_xmltree_create_from_curve</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>286050c77ae8ee255a7b6035b88d5fb4</anchor> + <anchor>a18</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_array_create_from_xmltree</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>301d2355b8bb9986a7bc4f84cc6c9d40</anchor> + <anchor>a19</anchor> <arglist>(stp_mxml_node_t *array)</arglist> </member> <member kind="function"> <type>stp_mxml_node_t *</type> <name>stp_xmltree_create_from_array</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>90e7cdadf10d6492082fd008b79853b0</anchor> + <anchor>a20</anchor> <arglist>(const stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_xml_parse_file_named</name> <anchorfile>xml_8h.html</anchorfile> - <anchor>2ff6722b18cd21c91e60e7ef1cedc0d4</anchor> + <anchor>a21</anchor> <arglist>(const char *name)</arglist> </member> </compound> @@ -4605,105 +4605,105 @@ <type>int</type> <name>base</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>593616de15330c0fb2d55e55410bf994</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>exp</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>b0ab0254bd58eb87eaee3172ba49fefb</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>x_size</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>f0ed41c0ec21ebf3f06c1a1ec9d04456</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>y_size</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>6f8a30ff8882b910eb6092965bff1166</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>total_size</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>2cd6b347ff013dd494370a9938344885</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>last_x</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>94f66fddf2c8dd22340220c82f6115fd</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>last_x_mod</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>f1cbd20a4cb7668e3b450ae3c7879fb2</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>last_y</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>dcf093deead926d5e89cdf4cf72068cf</anchor> + <anchor>o7</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>last_y_mod</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>ea9a91cee135cee3ba2750f2875cf610</anchor> + <anchor>o8</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>index</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>6a992d5529f459a44fee58c733255e86</anchor> + <anchor>o9</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>i_own</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>618931f210c709ac7c0a44ed090aef93</anchor> + <anchor>o10</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>x_offset</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>80997876f6afba983eaec918e58ecc0d</anchor> + <anchor>o11</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>y_offset</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>6055652d6d84e1c46e19438c923113ff</anchor> + <anchor>o12</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>fast_mask</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>31acd511b5ec97637395c849e2089e00</anchor> + <anchor>o13</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned *</type> <name>matrix</name> <anchorfile>structdither__matrix__impl.html</anchorfile> - <anchor>21b72c0b7adc5c7b4a50ffcb90d92dd6</anchor> + <anchor>o14</anchor> <arglist></arglist> </member> </compound> @@ -4714,28 +4714,28 @@ <type>stp_curve_t *</type> <name>curve</name> <anchorfile>structstp__cached__curve__t.html</anchorfile> - <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const double *</type> <name>d_cache</name> <anchorfile>structstp__cached__curve__t.html</anchorfile> - <anchor>f7e3e9aa11a7dd4199647af2e87a3bab</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned short *</type> <name>s_cache</name> <anchorfile>structstp__cached__curve__t.html</anchorfile> - <anchor>9c9886e8af38f75727d2b354afa8f218</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>size_t</type> <name>count</name> <anchorfile>structstp__cached__curve__t.html</anchorfile> - <anchor>e2942a04780e223b215eb8b663cf5353</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> </compound> @@ -4746,21 +4746,21 @@ <type>const char *</type> <name>short_name</name> <anchorfile>structstp__color.html</anchorfile> - <anchor>4698bac7fdbf14511adbe13aeefe80b8</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const char *</type> <name>long_name</name> <anchorfile>structstp__color.html</anchorfile> - <anchor>2fc6351aa4209f68fb16e85c6104f96c</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const stp_colorfuncs_t *</type> <name>colorfuncs</name> <anchorfile>structstp__color.html</anchorfile> - <anchor>a3f019e45920da0adf4ce2eec4cc2e7c</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> </compound> @@ -4771,28 +4771,28 @@ <type>int(*</type> <name>init</name> <anchorfile>structstp__colorfuncs__t.html</anchorfile> - <anchor>5aafc0d83b487b1d0a8db5c1f1cd227d</anchor> + <anchor>o0</anchor> <arglist>)(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>get_row</name> <anchorfile>structstp__colorfuncs__t.html</anchorfile> - <anchor>1130ff4ca5f70a5f951b69fa41ef8016</anchor> + <anchor>o1</anchor> <arglist>)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist> </member> <member kind="variable"> <type>stp_parameter_list_t(*</type> <name>list_parameters</name> <anchorfile>structstp__colorfuncs__t.html</anchorfile> - <anchor>54879ee9c7f05b72f24bab4bce932970</anchor> + <anchor>o2</anchor> <arglist>)(const stp_vars_t *v)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>describe_parameter</name> <anchorfile>structstp__colorfuncs__t.html</anchorfile> - <anchor>358435dd7c4c3dba226ba7016dba0cad</anchor> + <anchor>o3</anchor> <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> </compound> @@ -4803,14 +4803,14 @@ <type>double</type> <name>x</name> <anchorfile>structstp__curve__point__t.html</anchorfile> - <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>double</type> <name>y</name> <anchorfile>structstp__curve__point__t.html</anchorfile> - <anchor>415290769594460e2e485922904f345d</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -4821,35 +4821,35 @@ <type>int</type> <name>x</name> <anchorfile>structstp__dither__matrix__generic.html</anchorfile> - <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>y</name> <anchorfile>structstp__dither__matrix__generic.html</anchorfile> - <anchor>415290769594460e2e485922904f345d</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>bytes</name> <anchorfile>structstp__dither__matrix__generic.html</anchorfile> - <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>prescaled</name> <anchorfile>structstp__dither__matrix__generic.html</anchorfile> - <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const void *</type> <name>data</name> <anchorfile>structstp__dither__matrix__generic.html</anchorfile> - <anchor>8d777f385d3dfec8815d20f7496026dc</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> </compound> @@ -4860,35 +4860,35 @@ <type>int</type> <name>x</name> <anchorfile>structstp__dither__matrix__normal.html</anchorfile> - <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>y</name> <anchorfile>structstp__dither__matrix__normal.html</anchorfile> - <anchor>415290769594460e2e485922904f345d</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>bytes</name> <anchorfile>structstp__dither__matrix__normal.html</anchorfile> - <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>prescaled</name> <anchorfile>structstp__dither__matrix__normal.html</anchorfile> - <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned *</type> <name>data</name> <anchorfile>structstp__dither__matrix__normal.html</anchorfile> - <anchor>8d777f385d3dfec8815d20f7496026dc</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> </compound> @@ -4899,35 +4899,35 @@ <type>int</type> <name>x</name> <anchorfile>structstp__dither__matrix__short.html</anchorfile> - <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>y</name> <anchorfile>structstp__dither__matrix__short.html</anchorfile> - <anchor>415290769594460e2e485922904f345d</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>bytes</name> <anchorfile>structstp__dither__matrix__short.html</anchorfile> - <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>prescaled</name> <anchorfile>structstp__dither__matrix__short.html</anchorfile> - <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned short *</type> <name>data</name> <anchorfile>structstp__dither__matrix__short.html</anchorfile> - <anchor>8d777f385d3dfec8815d20f7496026dc</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> </compound> @@ -4938,32 +4938,32 @@ <type>unsigned</type> <name>bit_pattern</name> <anchorfile>structstp__dotsize.html</anchorfile> - <anchor>67b7bfbc0ce2bbedbf5837e91f8773cd</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>double</type> <name>value</name> <anchorfile>structstp__dotsize.html</anchorfile> - <anchor>2063c1608d6e0baf80249c42e2be5804</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> <compound kind="struct"> <name>stp_double_bound_t</name> <filename>structstp__double__bound__t.html</filename> - <member kind="typedef"> + <member kind="variable"> <type>double</type> <name>lower</name> <anchorfile>structstp__double__bound__t.html</anchorfile> - <anchor>81e073b428b50247daba38531dcf412a</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>double</type> <name>upper</name> <anchorfile>structstp__double__bound__t.html</anchorfile> - <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -4974,14 +4974,14 @@ <type>const stp_printfuncs_t *</type> <name>printfuncs</name> <anchorfile>structstp__family.html</anchorfile> - <anchor>c0c2f50561daa16ae61c455b0861718a</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_list_t *</type> <name>printer_list</name> <anchorfile>structstp__family.html</anchorfile> - <anchor>505045dc6abce739a39cbc650ad05535</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -4992,74 +4992,74 @@ <type>void(*</type> <name>init</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>9aebe24f43e2fe0d4342495a64026baa</anchor> + <anchor>o0</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>reset</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>edae63ed1524916fdef45cb652d7275e</anchor> + <anchor>o1</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>width</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>85ce2739e10b7c073f108a82b3e5d717</anchor> + <anchor>o2</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>height</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>36cffb4418960b12743fc547902e35a6</anchor> + <anchor>o3</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>stp_image_status_t(*</type> <name>get_row</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>e2681945ea918b7082ba78751d084347</anchor> + <anchor>o4</anchor> <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist> </member> <member kind="variable"> <type>const char *(*</type> <name>get_appname</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>e9495dba1df955709ebbd651c1a526e6</anchor> + <anchor>o5</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>conclude</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>6af9f0bf8a602f4a937c6e207a03ec01</anchor> + <anchor>o6</anchor> <arglist>)(struct stp_image *image)</arglist> </member> <member kind="variable"> <type>void *</type> <name>rep</name> <anchorfile>structstp__image.html</anchorfile> - <anchor>75a384057459ae8e69fb9a98a249b4f4</anchor> + <anchor>o7</anchor> <arglist></arglist> </member> </compound> <compound kind="struct"> <name>stp_int_bound_t</name> <filename>structstp__int__bound__t.html</filename> - <member kind="typedef"> + <member kind="variable"> <type>int</type> <name>lower</name> <anchorfile>structstp__int__bound__t.html</anchorfile> - <anchor>81e073b428b50247daba38531dcf412a</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>int</type> <name>upper</name> <anchorfile>structstp__int__bound__t.html</anchorfile> - <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5070,14 +5070,14 @@ <type>int</type> <name>ncolors</name> <anchorfile>structstp__lineactive__t.html</anchorfile> - <anchor>7e65a932280df4e01f60294f031fb97e</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>v</name> <anchorfile>structstp__lineactive__t.html</anchorfile> - <anchor>9e3669d19b675bd57058fd4664205d2a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5088,21 +5088,21 @@ <type>int</type> <name>ncolors</name> <anchorfile>structstp__linebounds__t.html</anchorfile> - <anchor>7e65a932280df4e01f60294f031fb97e</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int *</type> <name>start_pos</name> <anchorfile>structstp__linebounds__t.html</anchorfile> - <anchor>8fb0bcdadf14357992c7faea15fb9497</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int *</type> <name>end_pos</name> <anchorfile>structstp__linebounds__t.html</anchorfile> - <anchor>1f90fb291292e9a933aa6aac4a9c857e</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> </compound> @@ -5113,14 +5113,14 @@ <type>int</type> <name>ncolors</name> <anchorfile>structstp__linebufs__t.html</anchorfile> - <anchor>7e65a932280df4e01f60294f031fb97e</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned char **</type> <name>v</name> <anchorfile>structstp__linebufs__t.html</anchorfile> - <anchor>9e3669d19b675bd57058fd4664205d2a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5131,14 +5131,14 @@ <type>int</type> <name>ncolors</name> <anchorfile>structstp__linecount__t.html</anchorfile> - <anchor>7e65a932280df4e01f60294f031fb97e</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int *</type> <name>v</name> <anchorfile>structstp__linecount__t.html</anchorfile> - <anchor>9e3669d19b675bd57058fd4664205d2a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5149,14 +5149,14 @@ <type>int</type> <name>ncolors</name> <anchorfile>structstp__lineoff__t.html</anchorfile> - <anchor>7e65a932280df4e01f60294f031fb97e</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned long *</type> <name>v</name> <anchorfile>structstp__lineoff__t.html</anchorfile> - <anchor>9e3669d19b675bd57058fd4664205d2a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5167,56 +5167,56 @@ <type>const char *</type> <name>name</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const char *</type> <name>version</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>2af72f100c356273d46284f6fd1dfc08</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const char *</type> <name>comment</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_module_class_t</type> <name>class</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>a2f2ed4f8ebc2cbb4c21a29dc40ab61d</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>void *</type> <name>handle</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>e1260894f59eeae98c8440899de4df8d</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int(*</type> <name>init</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>e410d3c31d3473619bad7812df075dd9</anchor> + <anchor>o5</anchor> <arglist>)(void)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>fini</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>b5296150c31e6581161fc46595a06b78</anchor> + <anchor>o6</anchor> <arglist>)(void)</arglist> </member> <member kind="variable"> <type>void *</type> <name>syms</name> <anchorfile>structstp__module.html</anchorfile> - <anchor>928a1fa51ea5f2eaae90429c74743ced</anchor> + <anchor>o7</anchor> <arglist></arglist> </member> </compound> @@ -5227,14 +5227,14 @@ <type>int</type> <name>major</name> <anchorfile>structstp__module__version.html</anchorfile> - <anchor>f1425da40a9f2d21ab702a1c7feae026</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>minor</name> <anchorfile>structstp__module__version.html</anchorfile> - <anchor>ab846c0e3717a3e7d14af45cab70b44a</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5245,14 +5245,14 @@ <type>char *</type> <name>name</name> <anchorfile>structstp__mxml__attr__s.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>value</name> <anchorfile>structstp__mxml__attr__s.html</anchorfile> - <anchor>2063c1608d6e0baf80249c42e2be5804</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5263,49 +5263,49 @@ <type>stp_mxml_type_t</type> <name>type</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>599dcce2998a6b40b1e38e8c6006cb0a</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_node_t *</type> <name>next</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>d0cab90d8d20d57e2f2b9be52f7dd25d</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_node_t *</type> <name>prev</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>fcb08b164ac83e09964deb24f2d2e80b</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_node_t *</type> <name>parent</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>d0e45878043844ffc41aac437e86b602</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_node_t *</type> <name>child</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>1b7d5726533ab525a8760351e9b5e415</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_node_t *</type> <name>last_child</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>683657fb65ef37f597bddef3847a3eff</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_value_t</type> <name>value</name> <anchorfile>structstp__mxml__node__s.html</anchorfile> - <anchor>2063c1608d6e0baf80249c42e2be5804</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> </compound> @@ -5316,14 +5316,14 @@ <type>int</type> <name>whitespace</name> <anchorfile>structstp__mxml__text__s.html</anchorfile> - <anchor>67b8601a11e47a9ee3bf08ddfd0b79ba</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>string</name> <anchorfile>structstp__mxml__text__s.html</anchorfile> - <anchor>b45cffe084dd3d20d928bee85e7b0f21</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5334,21 +5334,21 @@ <type>char *</type> <name>name</name> <anchorfile>structstp__mxml__value__s.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>num_attrs</name> <anchorfile>structstp__mxml__value__s.html</anchorfile> - <anchor>30f1579a824317cbe2b6837454cd0ef1</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_attr_t *</type> <name>attrs</name> <anchorfile>structstp__mxml__value__s.html</anchorfile> - <anchor>425ce871530e0633c917f98d8e9b1bc7</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> </compound> @@ -5359,35 +5359,35 @@ <type>stp_mxml_element_t</type> <name>element</name> <anchorfile>unionstp__mxml__value__u.html</anchorfile> - <anchor>8e2dcfd7e7e24b1ca76c1193f645902b</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>integer</name> <anchorfile>unionstp__mxml__value__u.html</anchorfile> - <anchor>157db7df530023575515d366c9b672e8</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>opaque</name> <anchorfile>unionstp__mxml__value__u.html</anchorfile> - <anchor>94619f8a70068b2591c2eed622525b0e</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>double</type> <name>real</name> <anchorfile>unionstp__mxml__value__u.html</anchorfile> - <anchor>4bca24304861acde5770fdbe3cc2503b</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_mxml_text_t</type> <name>text</name> <anchorfile>unionstp__mxml__value__u.html</anchorfile> - <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> </compound> @@ -5398,70 +5398,70 @@ <type>char *</type> <name>name</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>text</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>char *</type> <name>comment</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>width</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>eaae26a6fb20ed3ef54fb23bfa0b1fcc</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>height</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>b435e227d5dd201e1768b2bcb2e0aa81</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>top</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>b28354b543375bfa94dabaeda722927f</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>left</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>811882fecd5c7618d7099ebbd39ea254</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>bottom</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>71f262d796bed1ab30e8a2d5a8ddee6f</anchor> + <anchor>o7</anchor> <arglist></arglist> </member> <member kind="variable"> <type>unsigned</type> <name>right</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>7c4f29407893c334a6cb7a87bf045c0d</anchor> + <anchor>o8</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_papersize_unit_t</type> <name>paper_unit</name> <anchorfile>structstp__papersize__t.html</anchorfile> - <anchor>00a9745ae8b0126b5763ba88daba837b</anchor> + <anchor>o9</anchor> <arglist></arglist> </member> </compound> @@ -5472,207 +5472,207 @@ <type>const char *</type> <name>name</name> <anchorfile>structstp__param__string__t.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const char *</type> <name>text</name> <anchorfile>structstp__param__string__t.html</anchorfile> - <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> <compound kind="struct"> <name>stp_parameter_t</name> <filename>structstp__parameter__t.html</filename> - <member kind="typedef"> + <member kind="variable"> <type>const char *</type> <name>name</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>b068931cc450442b63f5b3d276ea4297</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>const char *</type> <name>text</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>const char *</type> <name>category</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>c4ef352f74e502ef5e7bc98e6f4e493d</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>const char *</type> <name>help</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>657f8b8da628ef83cf69101b6817150a</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>stp_parameter_type_t</type> <name>p_type</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>ee532d298de9538e682d9a1eaea12378</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>stp_parameter_class_t</type> <name>p_class</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>8112bb5792909f9417d1f6d2ab36863a</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>stp_parameter_level_t</type> <name>p_level</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>c52b547d5a185fa1e792e175f90d24fc</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>unsigned char</type> <name>is_mandatory</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>c261f1bf67a23fb36eadbb2c644c162f</anchor> + <anchor>o7</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>unsigned char</type> <name>is_active</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>4264c638e0098acb172519b0436db099</anchor> + <anchor>o8</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>unsigned char</type> <name>channel</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>c485d2ed5cc4ce64fcccca710c7a0bb7</anchor> + <anchor>o9</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>unsigned char</type> <name>verify_this_parameter</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>f07c856ac0ac425e65f87fff7a12b34d</anchor> + <anchor>o10</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>unsigned char</type> <name>read_only</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>befe72871b2de8f4f0e20108517e31fe</anchor> + <anchor>o11</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_parameter_t::@0</type> <name>bounds</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>eb49194cccc646fc8e93a368301834ea</anchor> + <anchor>o18</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_curve_t *</type> <name>curve</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_double_bound_t</type> <name>dbl</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>365b8373d0bf6dc9e3450af670cc1d35</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_int_bound_t</type> <name>integer</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>157db7df530023575515d366c9b672e8</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_int_bound_t</type> <name>dimension</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>c4cf4802b30127a6ae42a1a1798c51b3</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_string_list_t *</type> <name>str</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>341be97d9aff90c9978347f66f945b77</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_array_t *</type> <name>array</name> <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile> - <anchor>f1f713c9e000f5d3f280adbd124df4f5</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_parameter_t::@1</type> <name>deflt</name> <anchorfile>structstp__parameter__t.html</anchorfile> - <anchor>1ae03ed771e3171fae03ed917b22ceff</anchor> + <anchor>o26</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_curve_t *</type> <name>curve</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>double</type> <name>dbl</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>365b8373d0bf6dc9e3450af670cc1d35</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>dimension</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>c4cf4802b30127a6ae42a1a1798c51b3</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>integer</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>157db7df530023575515d366c9b672e8</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>boolean</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>84e2c64f38f78ba3ea5c905ab5a2da27</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const char *</type> <name>str</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>341be97d9aff90c9978347f66f945b77</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>stp_array_t *</type> <name>array</name> <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile> - <anchor>f1f713c9e000f5d3f280adbd124df4f5</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> </compound> @@ -5683,42 +5683,42 @@ <type>int</type> <name>pass</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>missingstartrows</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>6b75dc88fe75f396206e0c5862d61543</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>logicalpassstart</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>da94ad894675e9119f2c647a94e21605</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>physpassstart</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>13436ac9693968e5601e30fd01451a02</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>physpassend</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>102875318f07394cc762ba839e0b5231</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>subpass</name> <anchorfile>structstp__pass__t.html</anchorfile> - <anchor>769ff675e6c6adb86faf4316c1aa0ba3</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> </compound> @@ -5729,95 +5729,95 @@ <type>stp_parameter_list_t(*</type> <name>list_parameters</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>54879ee9c7f05b72f24bab4bce932970</anchor> + <anchor>o0</anchor> <arglist>)(const stp_vars_t *v)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>parameters</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>622ce298c6fc93028618fed494c284e9</anchor> + <anchor>o1</anchor> <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>media_size</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>0893788b2db9b714e8185a0d5bc54c65</anchor> + <anchor>o2</anchor> <arglist>)(const stp_vars_t *v, int *width, int *height)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>imageable_area</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>d910d40510a98935f74705e1e0c53b6d</anchor> + <anchor>o3</anchor> <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>limit</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>6e40367cc4c593d8c68138abdc46e4ef</anchor> + <anchor>o4</anchor> <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>print</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>4ba23f8d414bf8d9305fe670b5e7ae94</anchor> + <anchor>o5</anchor> <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="variable"> <type>void(*</type> <name>describe_resolution</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>b11ae31fa8984f09a03acc5d284f53f8</anchor> + <anchor>o6</anchor> <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist> </member> <member kind="variable"> <type>const char *(*</type> <name>describe_output</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>92224ef5b74a148faa0459a1ff6edd6c</anchor> + <anchor>o7</anchor> <arglist>)(const stp_vars_t *v)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>verify</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>7cc301b263aa0c00e3b8d67b79b9949e</anchor> + <anchor>o8</anchor> <arglist>)(stp_vars_t *v)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>start_job</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>fd889d531bf42b215023ed01d74fecab</anchor> + <anchor>o9</anchor> <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="variable"> <type>int(*</type> <name>end_job</name> <anchorfile>structstp__printfuncs__t.html</anchorfile> - <anchor>f553a87427ad77ead7b8e6bb7f4a2efa</anchor> + <anchor>o10</anchor> <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist> </member> </compound> <compound kind="struct"> <name>stp_raw_t</name> <filename>structstp__raw__t.html</filename> - <member kind="typedef"> + <member kind="variable"> <type>size_t</type> <name>bytes</name> <anchorfile>structstp__raw__t.html</anchorfile> - <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> - <member kind="typedef"> + <member kind="variable"> <type>const void *</type> <name>data</name> <anchorfile>structstp__raw__t.html</anchorfile> - <anchor>8d777f385d3dfec8815d20f7496026dc</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> </compound> @@ -5828,21 +5828,21 @@ <type>double</type> <name>value</name> <anchorfile>structstp__shade.html</anchorfile> - <anchor>2063c1608d6e0baf80249c42e2be5804</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>numsizes</name> <anchorfile>structstp__shade.html</anchorfile> - <anchor>adae9e852b659d0d064b746f5cc85ee4</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const stp_dotsize_t *</type> <name>dot_sizes</name> <anchorfile>structstp__shade.html</anchorfile> - <anchor>c4b0221c67b0895782c9c5984cc2578e</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> </compound> @@ -5853,49 +5853,49 @@ <type>int</type> <name>row</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>f1965a857bc285d26fe22023aa5ab50d</anchor> + <anchor>o0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>pass</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor> + <anchor>o1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>jet</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>564f60a2dd82ea24bfa3f2f615348f7c</anchor> + <anchor>o2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>missingstartrows</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>6b75dc88fe75f396206e0c5862d61543</anchor> + <anchor>o3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>logicalpassstart</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>da94ad894675e9119f2c647a94e21605</anchor> + <anchor>o4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>physpassstart</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>13436ac9693968e5601e30fd01451a02</anchor> + <anchor>o5</anchor> <arglist></arglist> </member> <member kind="variable"> <type>int</type> <name>physpassend</name> <anchorfile>structstp__weave__t.html</anchorfile> - <anchor>102875318f07394cc762ba839e0b5231</anchor> + <anchor>o6</anchor> <arglist></arglist> </member> </compound> @@ -5907,84 +5907,84 @@ <type>stp_array</type> <name>stp_array_t</name> <anchorfile>group__array.html</anchorfile> - <anchor>g69e0971771118ccea2a5dc72ba4fa73e</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_array_create</name> <anchorfile>group__array.html</anchorfile> - <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor> + <anchor>ga1</anchor> <arglist>(int x_size, int y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_destroy</name> <anchorfile>group__array.html</anchorfile> - <anchor>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor> + <anchor>ga2</anchor> <arglist>(stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_copy</name> <anchorfile>group__array.html</anchorfile> - <anchor>gab9b031be229d8762faf46a3ef9454ec</anchor> + <anchor>ga3</anchor> <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist> </member> <member kind="function"> <type>stp_array_t *</type> <name>stp_array_create_copy</name> <anchorfile>group__array.html</anchorfile> - <anchor>g19370f7d4779013904be75bc3d97e024</anchor> + <anchor>ga4</anchor> <arglist>(const stp_array_t *array)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_set_size</name> <anchorfile>group__array.html</anchorfile> - <anchor>g698e51815f2ef3fd0709d6b32a2bb921</anchor> + <anchor>ga5</anchor> <arglist>(stp_array_t *array, int x_size, int y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_get_size</name> <anchorfile>group__array.html</anchorfile> - <anchor>g48e34b2673c2973884f0a403bafe7ea8</anchor> + <anchor>ga6</anchor> <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_set_data</name> <anchorfile>group__array.html</anchorfile> - <anchor>g0ca3891b4cde193cc65de63053e3f4fa</anchor> + <anchor>ga7</anchor> <arglist>(stp_array_t *array, const double *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_array_get_data</name> <anchorfile>group__array.html</anchorfile> - <anchor>g9e1c46379b5935ed3a939833bd9e68be</anchor> + <anchor>ga8</anchor> <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_array_set_point</name> <anchorfile>group__array.html</anchorfile> - <anchor>g4ab405205d678a3d9ae02a98103fbfea</anchor> + <anchor>ga9</anchor> <arglist>(stp_array_t *array, int x, int y, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_array_get_point</name> <anchorfile>group__array.html</anchorfile> - <anchor>gb9d53cf70f2c892dca82b8db2414fad2</anchor> + <anchor>ga10</anchor> <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist> </member> <member kind="function"> <type>const stp_sequence_t *</type> <name>stp_array_get_sequence</name> <anchorfile>group__array.html</anchorfile> - <anchor>g2051c3f4a1eaccb198744f8d7c76d649</anchor> + <anchor>ga11</anchor> <arglist>(const stp_array_t *array)</arglist> </member> </compound> @@ -5998,91 +5998,91 @@ <type>stp_color</type> <name>stp_color_t</name> <anchorfile>group__color.html</anchorfile> - <anchor>gb711e2534c69bde47be7af3409c8ee2c</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_init</name> <anchorfile>group__color.html</anchorfile> - <anchor>g835bd7024477347a46ea0c14b46996c6</anchor> + <anchor>ga1</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_get_row</name> <anchorfile>group__color.html</anchorfile> - <anchor>gadf861820b3956ef7b18600dbf5da9da</anchor> + <anchor>ga2</anchor> <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_color_list_parameters</name> <anchorfile>group__color.html</anchorfile> - <anchor>ge2e397268288111eaffd352cb0ff1b98</anchor> + <anchor>ga3</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_color_describe_parameter</name> <anchorfile>group__color.html</anchorfile> - <anchor>gc47fecc2c32115494ea364e53d9f1ff2</anchor> + <anchor>ga4</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_register</name> <anchorfile>group__color.html</anchorfile> - <anchor>ge3543409e331c5d1756c2c8fe927343b</anchor> + <anchor>ga5</anchor> <arglist>(const stp_color_t *color)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_unregister</name> <anchorfile>group__color.html</anchorfile> - <anchor>g3e0f2728d47e1701c00b06199bc5512d</anchor> + <anchor>ga6</anchor> <arglist>(const stp_color_t *color)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_color_count</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>g25d9ee3ceee6d6e9964007ad12f9900b</anchor> + <anchor>ga8</anchor> <arglist>(const char *name)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_index</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor> + <anchor>ga9</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>const stp_color_t *</type> <name>stp_get_color_by_colorfuncs</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga92373d7aa315ab6e32a1bb0ac944b79</anchor> + <anchor>ga10</anchor> <arglist>(stp_colorfuncs_t *colorfuncs)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_color_get_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>g36d2d72d2cd967405a978b76a7a8c992</anchor> + <anchor>ga11</anchor> <arglist>(const stp_color_t *c)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_color_get_long_name</name> <anchorfile>group__color.html</anchorfile> - <anchor>ga0559d7812bdcbebe4edc14fc05274d9</anchor> + <anchor>ga12</anchor> <arglist>(const stp_color_t *c)</arglist> </member> </compound> @@ -6095,399 +6095,399 @@ <type>stp_curve</type> <name>stp_curve_t</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd5ce135b7af2c6e79bae493c7055461d</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_type_t</name> - <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor> + <anchor>ga47</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_TYPE_LINEAR</name> - <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor> + <anchor>gga47a1</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_TYPE_SPLINE</name> - <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor> + <anchor>gga47a2</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_wrap_mode_t</name> - <anchor>g1880ff988f772337e8892e791951337b</anchor> + <anchor>ga48</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_WRAP_NONE</name> - <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor> + <anchor>gga48a3</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_WRAP_AROUND</name> - <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor> + <anchor>gga48a4</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_compose_t</name> - <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor> + <anchor>ga49</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_ADD</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor> + <anchor>gga49a5</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_MULTIPLY</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor> + <anchor>gga49a6</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_COMPOSE_EXPONENTIATE</name> - <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor> + <anchor>gga49a7</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_curve_bounds_t</name> - <anchor>gd2b61113497bb142943d5131df3286ae</anchor> + <anchor>ga50</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_RESCALE</name> - <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor> + <anchor>gga50a8</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_CLIP</name> - <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor> + <anchor>gga50a9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_CURVE_BOUNDS_ERROR</name> - <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor> + <anchor>gga50a10</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor> + <anchor>ga1</anchor> <arglist>(stp_curve_wrap_mode_t wrap)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_copy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>ge76787e84f2fc3ba299de94f4ecc6d82</anchor> + <anchor>ga2</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_copy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gfdafb0a802f00063b00713dbd6d6bfc0</anchor> + <anchor>ga3</anchor> <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_destroy</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g01bf94ed6a523f28dd909be054a69790</anchor> + <anchor>ga4</anchor> <arglist>(stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_bounds</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g5283a18fcc5db8e9f9384d54de50ba83</anchor> + <anchor>ga5</anchor> <arglist>(stp_curve_t *curve, double low, double high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_get_bounds</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g4d32e3000dd3a8f258b2eab94797731b</anchor> + <anchor>ga6</anchor> <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist> </member> <member kind="function"> <type>stp_curve_wrap_mode_t</type> <name>stp_curve_get_wrap</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd2aade6a22b516006ce0f897c5027f35</anchor> + <anchor>ga7</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_is_piecewise</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gdda4313c874170e0086d2000ed04c02f</anchor> + <anchor>ga8</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_curve_get_range</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gaf8bad025ea7463067c9d7ab205af062</anchor> + <anchor>ga9</anchor> <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_curve_count_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g48d9023f28ae2d15975002f7a9d7f94e</anchor> + <anchor>ga10</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_interpolation_type</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g3175711d943e95fdf363d5124237a56e</anchor> + <anchor>ga11</anchor> <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist> </member> <member kind="function"> <type>stp_curve_type_t</type> <name>stp_curve_get_interpolation_type</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gca245aa6907c2fb95e150ce9a86ddb1a</anchor> + <anchor>ga12</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gba540befdbd82e705358b2175d5b92e8</anchor> + <anchor>ga13</anchor> <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_data_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gcbd01a2662edb48af0816930b40dc8ab</anchor> + <anchor>ga14</anchor> <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_float_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor> + <anchor>ga15</anchor> <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_long_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gaf770dcae26ce48d5ee50dd8217e2c14</anchor> + <anchor>ga16</anchor> <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_ulong_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g184e0e32892aae4b2c195c6fc880bace</anchor> + <anchor>ga17</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_int_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gbc9ae004e972c7d638336714f3112f9b</anchor> + <anchor>ga18</anchor> <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_uint_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g8a215d4981a74fb2b6e4a0c381314df0</anchor> + <anchor>ga19</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_short_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd23dcc9abefca9a98b3ecd9714227093</anchor> + <anchor>ga20</anchor> <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_ushort_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g4051de3e6be42f4499de78af67288616</anchor> + <anchor>ga21</anchor> <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_get_subrange</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor> + <anchor>ga22</anchor> <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_subrange</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g0ba6753a8beeaca19719d047da25ecb5</anchor> + <anchor>ga23</anchor> <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist> </member> <member kind="function"> <type>const double *</type> <name>stp_curve_get_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g24b9486c45d68983e94dcc0fb19edacd</anchor> + <anchor>ga24</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const stp_curve_point_t *</type> <name>stp_curve_get_data_points</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd30e41654f1e0217aae3389b30cdffba</anchor> + <anchor>ga25</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const float *</type> <name>stp_curve_get_float_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf363a0f9686bcd6521671d531bc522d5</anchor> + <anchor>ga26</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const long *</type> <name>stp_curve_get_long_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g187af251d5a89853545c8be898a00cc1</anchor> + <anchor>ga27</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned long *</type> <name>stp_curve_get_ulong_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor> + <anchor>ga28</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const int *</type> <name>stp_curve_get_int_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g01bda0b947a6075d4a1ed373865744e6</anchor> + <anchor>ga29</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned int *</type> <name>stp_curve_get_uint_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gb874365285383f3eb35c1a32496a69b4</anchor> + <anchor>ga30</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const short *</type> <name>stp_curve_get_short_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g60767bb2143fe4d491d351a4c0abc3b1</anchor> + <anchor>ga31</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned short *</type> <name>stp_curve_get_ushort_data</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gb2312169172ec9789af9fd38279b3273</anchor> + <anchor>ga32</anchor> <arglist>(const stp_curve_t *curve, size_t *count)</arglist> </member> <member kind="function"> <type>const stp_sequence_t *</type> <name>stp_curve_get_sequence</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gee3cc69ab758b400838014df4742c28e</anchor> + <anchor>ga33</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_gamma</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor> + <anchor>ga34</anchor> <arglist>(stp_curve_t *curve, double f_gamma)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_curve_get_gamma</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gc9786b35c2b1a55d54b62bcc57481c82</anchor> + <anchor>ga35</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_set_point</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g9a05eae4f274f420418539cceb627556</anchor> + <anchor>ga36</anchor> <arglist>(stp_curve_t *curve, size_t where, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_get_point</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf9ff6f55ec0a0615608dc1baec6aff00</anchor> + <anchor>ga37</anchor> <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_interpolate_value</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g0fdfc2b27a8a464584589ef38a8e05c4</anchor> + <anchor>ga38</anchor> <arglist>(const stp_curve_t *curve, double where, double *result)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_resample</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gf68cf2508ff4a14a0dbee6fc0001667e</anchor> + <anchor>ga39</anchor> <arglist>(stp_curve_t *curve, size_t points)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_rescale</name> <anchorfile>group__curve.html</anchorfile> - <anchor>gd440d8d448173adc2be6737963a6e999</anchor> + <anchor>ga40</anchor> <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_write</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor> + <anchor>ga41</anchor> <arglist>(FILE *file, const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_curve_write_string</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g21aa4497c58ebbb703dc3549560f084d</anchor> + <anchor>ga42</anchor> <arglist>(const stp_curve_t *curve)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_stream</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g650e49e1250dab5d9221ad747a627fc0</anchor> + <anchor>ga43</anchor> <arglist>(FILE *fp)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_file</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g6ff03fcc2a47f297c48b683884e81924</anchor> + <anchor>ga44</anchor> <arglist>(const char *file)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_curve_create_from_string</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g60dce8c741a9b6fde73ced2134305298</anchor> + <anchor>ga45</anchor> <arglist>(const char *string)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_curve_compose</name> <anchorfile>group__curve.html</anchorfile> - <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor> + <anchor>ga46</anchor> <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist> </member> </compound> @@ -6499,49 +6499,49 @@ <type>#define</type> <name>textdomain</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor> + <anchor>ga0</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>gettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>geb8333d9b46653f2047c603034d26730</anchor> + <anchor>ga1</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>dgettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor> + <anchor>ga2</anchor> <arglist>(Domain, Message)</arglist> </member> <member kind="define"> <type>#define</type> <name>dcgettext</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor> + <anchor>ga3</anchor> <arglist>(Domain, Message, Type)</arglist> </member> <member kind="define"> <type>#define</type> <name>bindtextdomain</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gcf29daa2fef5f417c57be476054c695b</anchor> + <anchor>ga4</anchor> <arglist>(Domain, Directory)</arglist> </member> <member kind="define"> <type>#define</type> <name>_</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor> + <anchor>ga5</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>N_</name> <anchorfile>group__intl__internal.html</anchorfile> - <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor> + <anchor>ga6</anchor> <arglist>(String)</arglist> </member> </compound> @@ -6553,49 +6553,49 @@ <type>#define</type> <name>textdomain</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor> + <anchor>ga0</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>gettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>geb8333d9b46653f2047c603034d26730</anchor> + <anchor>ga1</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>dgettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor> + <anchor>ga2</anchor> <arglist>(Domain, Message)</arglist> </member> <member kind="define"> <type>#define</type> <name>dcgettext</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor> + <anchor>ga3</anchor> <arglist>(Domain, Message, Type)</arglist> </member> <member kind="define"> <type>#define</type> <name>bindtextdomain</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gcf29daa2fef5f417c57be476054c695b</anchor> + <anchor>ga4</anchor> <arglist>(Domain, Directory)</arglist> </member> <member kind="define"> <type>#define</type> <name>_</name> <anchorfile>group__intl.html</anchorfile> - <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor> + <anchor>ga5</anchor> <arglist>(String)</arglist> </member> <member kind="define"> <type>#define</type> <name>N_</name> <anchorfile>group__intl.html</anchorfile> - <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor> + <anchor>ga6</anchor> <arglist>(String)</arglist> </member> </compound> @@ -6607,98 +6607,98 @@ <type>#define</type> <name>STP_MAJOR_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g98b05dcc61492d413bb01421995f1421</anchor> + <anchor>ga7</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MINOR_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor> + <anchor>ga8</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_MICRO_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor> + <anchor>ga9</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_CURRENT_INTERFACE</name> <anchorfile>group__version.html</anchorfile> - <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor> + <anchor>ga10</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_BINARY_AGE</name> <anchorfile>group__version.html</anchorfile> - <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor> + <anchor>ga11</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_INTERFACE_AGE</name> <anchorfile>group__version.html</anchorfile> - <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor> + <anchor>ga12</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_CHECK_VERSION</name> <anchorfile>group__version.html</anchorfile> - <anchor>g26c662a55c391d11663052ca39458972</anchor> + <anchor>ga13</anchor> <arglist>(major, minor, micro)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_check_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g888f2f6268a658d1a6b71b5288299488</anchor> + <anchor>ga6</anchor> <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_major_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g19a4efe48689fb8f859d04e60bfe028f</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_minor_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g66def32167cee385762282e36b60d3b7</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_micro_version</name> <anchorfile>group__version.html</anchorfile> - <anchor>g24960731fb86305c31f0be5621ccb993</anchor> + <anchor>ga2</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_current_interface</name> <anchorfile>group__version.html</anchorfile> - <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor> + <anchor>ga3</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_binary_age</name> <anchorfile>group__version.html</anchorfile> - <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor> + <anchor>ga4</anchor> <arglist></arglist> </member> <member kind="variable"> <type>const unsigned int</type> <name>stp_interface_age</name> <anchorfile>group__version.html</anchorfile> - <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor> + <anchor>ga5</anchor> <arglist></arglist> </member> </compound> @@ -6711,78 +6711,78 @@ <type>#define</type> <name>STP_CHANNEL_LIMIT</name> <anchorfile>group__image.html</anchorfile> - <anchor>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor> + <anchor>ga8</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_image</type> <name>stp_image_t</name> <anchorfile>group__image.html</anchorfile> - <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_image_status_t</name> - <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor> + <anchor>ga9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_IMAGE_STATUS_OK</name> - <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor> + <anchor>gga9a2</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_IMAGE_STATUS_ABORT</name> - <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor> + <anchor>gga9a3</anchor> <arglist></arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_init</name> <anchorfile>group__image.html</anchorfile> - <anchor>g74c2417d571861506be7209421a3b418</anchor> + <anchor>ga1</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_reset</name> <anchorfile>group__image.html</anchorfile> - <anchor>g69cd20ccb54500d0ee8cf38969db69a6</anchor> + <anchor>ga2</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_image_width</name> <anchorfile>group__image.html</anchorfile> - <anchor>g9ee4915d4a1007f2d9c730ddc96d931b</anchor> + <anchor>ga3</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_image_height</name> <anchorfile>group__image.html</anchorfile> - <anchor>g48a99a9a8493b75687ad0900664ca4cb</anchor> + <anchor>ga4</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>stp_image_status_t</type> <name>stp_image_get_row</name> <anchorfile>group__image.html</anchorfile> - <anchor>gfc93a7a3f6629f6826bf1f6f757f464e</anchor> + <anchor>ga5</anchor> <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_image_get_appname</name> <anchorfile>group__image.html</anchorfile> - <anchor>gd36123431e93e049d813894aa039c25c</anchor> + <anchor>ga6</anchor> <arglist>(stp_image_t *image)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_image_conclude</name> <anchorfile>group__image.html</anchorfile> - <anchor>gd1017f2f9b91d7add73c2393d96f700a</anchor> + <anchor>ga7</anchor> <arglist>(stp_image_t *image)</arglist> </member> </compound> @@ -6794,224 +6794,224 @@ <type>stp_list_item</type> <name>stp_list_item_t</name> <anchorfile>group__list.html</anchorfile> - <anchor>g71c64aeca8ca0613215306f088b6a963</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_list</type> <name>stp_list_t</name> <anchorfile>group__list.html</anchorfile> - <anchor>g01be7c3ea8c46226978010d453016f22</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_node_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor> + <anchor>ga2</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>void *(*</type> <name>stp_node_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor> + <anchor>ga3</anchor> <arglist>)(const void *)</arglist> </member> <member kind="typedef"> <type>const char *(*</type> <name>stp_node_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor> + <anchor>ga4</anchor> <arglist>)(const void *)</arglist> </member> <member kind="typedef"> <type>int(*</type> <name>stp_node_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor> + <anchor>ga5</anchor> <arglist>)(const void *, const void *)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_node_free_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>gb357e17f729e41b4f96d6aada1be26b9</anchor> + <anchor>ga6</anchor> <arglist>(void *item)</arglist> </member> <member kind="function"> <type>stp_list_t *</type> <name>stp_list_create</name> <anchorfile>group__list.html</anchorfile> - <anchor>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_list_t *</type> <name>stp_list_copy</name> <anchorfile>group__list.html</anchorfile> - <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor> + <anchor>ga8</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_destroy</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1382e926901b5efa2356176826a96a1a</anchor> + <anchor>ga9</anchor> <arglist>(stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_start</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga67c8173f8c7b2c40e3d6dde6578faec</anchor> + <anchor>ga10</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_end</name> <anchorfile>group__list.html</anchorfile> - <anchor>g2ef0298e970fdb93955860e7ee3f878c</anchor> + <anchor>ga11</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_index</name> <anchorfile>group__list.html</anchorfile> - <anchor>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor> + <anchor>ga12</anchor> <arglist>(const stp_list_t *list, int idx)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_name</name> <anchorfile>group__list.html</anchorfile> - <anchor>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor> + <anchor>ga13</anchor> <arglist>(const stp_list_t *list, const char *name)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_get_item_by_long_name</name> <anchorfile>group__list.html</anchorfile> - <anchor>gdbf12ab6f47d68f2605f211023c4f520</anchor> + <anchor>ga14</anchor> <arglist>(const stp_list_t *list, const char *long_name)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_get_length</name> <anchorfile>group__list.html</anchorfile> - <anchor>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor> + <anchor>ga15</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gc103cb4ff8870b3a8d90b6ebcade2498</anchor> + <anchor>ga16</anchor> <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist> </member> <member kind="function"> <type>stp_node_freefunc</type> <name>stp_list_get_freefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g9d344e3c6874e6033f8fc71370678bcf</anchor> + <anchor>ga17</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gec59dd3b87efc811ef2b6303102ed279</anchor> + <anchor>ga18</anchor> <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist> </member> <member kind="function"> <type>stp_node_copyfunc</type> <name>stp_list_get_copyfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g310dd79907494b07d9005fbf50b9eb0c</anchor> + <anchor>ga19</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g97d7c6d659aa7d05bc54a349a07e10c0</anchor> + <anchor>ga20</anchor> <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist> </member> <member kind="function"> <type>stp_node_namefunc</type> <name>stp_list_get_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor> + <anchor>ga21</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_long_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>g42bdba5fcb861bdf8facb9135039d9b8</anchor> + <anchor>ga22</anchor> <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist> </member> <member kind="function"> <type>stp_node_namefunc</type> <name>stp_list_get_long_namefunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga95d8ace9b6ec71388007024c51865cb</anchor> + <anchor>ga23</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_list_set_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>gbad08ce8ef257dae054ea3816ae88fe7</anchor> + <anchor>ga24</anchor> <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist> </member> <member kind="function"> <type>stp_node_sortfunc</type> <name>stp_list_get_sortfunc</name> <anchorfile>group__list.html</anchorfile> - <anchor>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor> + <anchor>ga25</anchor> <arglist>(const stp_list_t *list)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_create</name> <anchorfile>group__list.html</anchorfile> - <anchor>g50f49648801707436012cd5dc66b1f8c</anchor> + <anchor>ga26</anchor> <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_destroy</name> <anchorfile>group__list.html</anchorfile> - <anchor>gde2acf279e8ea067fdc1f3f951d0b373</anchor> + <anchor>ga27</anchor> <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_item_prev</name> <anchorfile>group__list.html</anchorfile> - <anchor>gcee23493eafdfcfce51e2ccf29ebbf54</anchor> + <anchor>ga28</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>stp_list_item_t *</type> <name>stp_list_item_next</name> <anchorfile>group__list.html</anchorfile> - <anchor>gea9c1b6daae518ebecd2981289c555f3</anchor> + <anchor>ga29</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_list_item_get_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>g5b7d8ffea5a806953a43aee961a60fe4</anchor> + <anchor>ga30</anchor> <arglist>(const stp_list_item_t *item)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_list_item_set_data</name> <anchorfile>group__list.html</anchorfile> - <anchor>g1b5d2889a81d712c3ba024e53bfd0f38</anchor> + <anchor>ga31</anchor> <arglist>(stp_list_item_t *item, void *data)</arglist> </member> </compound> @@ -7022,62 +7022,62 @@ <class kind="struct">stp_papersize_t</class> <member kind="enumeration"> <name>stp_papersize_unit_t</name> - <anchor>gbb66a8f6ce85d70afd9fe42472b492d8</anchor> + <anchor>ga5</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_ENGLISH_STANDARD</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor> + <anchor>gga5a0</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_METRIC_STANDARD</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor> + <anchor>gga5a1</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_ENGLISH_EXTENDED</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor> + <anchor>gga5a2</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PAPERSIZE_METRIC_EXTENDED</name> - <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor> + <anchor>gga5a3</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_known_papersizes</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor> + <anchor>ga0</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_name</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g9d655e3de6954ad3c5933dc736d2509a</anchor> + <anchor>ga1</anchor> <arglist>(const char *name)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_size</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g0438b0e4729f37579900b591e801f8ce</anchor> + <anchor>ga2</anchor> <arglist>(int length, int width)</arglist> </member> <member kind="function"> <type>const stp_papersize_t *</type> <name>stp_get_papersize_by_index</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g08bb891f58a7decfee2b073c00715993</anchor> + <anchor>ga3</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_default_media_size</name> <anchorfile>group__papersize.html</anchorfile> - <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor> + <anchor>ga4</anchor> <arglist>(const stp_vars_t *v, int *width, int *height)</arglist> </member> </compound> @@ -7091,182 +7091,182 @@ <type>stp_printer</type> <name>stp_printer_t</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g1a68662b730d44c11de6fb8226a309f6</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>stp_family</type> <name>stp_family_t</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="function"> <type>int</type> <name>stp_printer_model_count</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor> + <anchor>ga2</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_index</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g1286559c60d239563f9f15fdd27996e0</anchor> + <anchor>ga3</anchor> <arglist>(int idx)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_long_name</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc041944e528afcb9a795eb6ece3fc6ff</anchor> + <anchor>ga4</anchor> <arglist>(const char *long_name)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer_by_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g947fa230e08f9c854ca2608e76bd0d58</anchor> + <anchor>ga5</anchor> <arglist>(const char *driver)</arglist> </member> <member kind="function"> <type>const stp_printer_t *</type> <name>stp_get_printer</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor> + <anchor>ga6</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_printer_index_by_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g6f32b0213b580bf081fc8752a3eb04a1</anchor> + <anchor>ga7</anchor> <arglist>(const char *driver)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_long_name</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g00182878bdc39935e6382d7e41d55294</anchor> + <anchor>ga8</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_driver</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g6c6c426f86307660079277ab6e90ae3d</anchor> + <anchor>ga9</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_family</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor> + <anchor>ga10</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_printer_get_manufacturer</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gfc0382fd32b49ea9d171e4ce8b750c62</anchor> + <anchor>ga11</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_printer_get_model</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g7ba104f0ea5ce4a88175486894010b71</anchor> + <anchor>ga12</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>const stp_vars_t *</type> <name>stp_printer_get_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>ge67398e65540b835f5c5d073c5ea0ec1</anchor> + <anchor>ga13</anchor> <arglist>(const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_printer_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc3d8cdb65382cb13ea6b01072e6240d5</anchor> + <anchor>ga14</anchor> <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_print</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g121125e6646c6f6d8965f1857450749e</anchor> + <anchor>ga15</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_start_job</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g9cf59fba866430dd47508bac6561ef67</anchor> + <anchor>ga16</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_end_job</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g40637834f08a166992325af09f6a6030</anchor> + <anchor>ga17</anchor> <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_model_id</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc09e99e20c8a19a13a5fb6356742a92a</anchor> + <anchor>ga18</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_verify_printer_params</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gd91f8e7a622725f0d47196cf912ddd8d</anchor> + <anchor>ga19</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_family_register</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g82b22438444849bdedb4cfbe22f209e8</anchor> + <anchor>ga20</anchor> <arglist>(stp_list_t *family)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_family_unregister</name> <anchorfile>group__printer.html</anchorfile> - <anchor>ga2ab30a5e5442b7a552fc3b884e1511b</anchor> + <anchor>ga21</anchor> <arglist>(stp_list_t *family)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_initialize_printer_defaults</name> <anchorfile>group__printer.html</anchorfile> - <anchor>gc9aba62164667822fd9f110740bab570</anchor> + <anchor>ga22</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_printer_list_parameters</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g666486047edfe4405d003b5c3bbe4b49</anchor> + <anchor>ga23</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_printer_describe_parameter</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g806f00d4167762c7a3d467ec37c8430e</anchor> + <anchor>ga24</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_describe_output</name> <anchorfile>group__printer.html</anchorfile> - <anchor>g950e2cd193926440ba250dbc184d8588</anchor> + <anchor>ga25</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> </compound> @@ -7278,203 +7278,203 @@ <type>stp_sequence</type> <name>stp_sequence_t</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gb3d4cae653c4303a6e5d26b516694c92</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_sequence_t *</type> <name>stp_sequence_create</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor> + <anchor>ga1</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_destroy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor> + <anchor>ga2</anchor> <arglist>(stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_copy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g5792d6f821525514199dd2d9b332ddd4</anchor> + <anchor>ga3</anchor> <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist> </member> <member kind="function"> <type>stp_sequence_t *</type> <name>stp_sequence_create_copy</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd37eb66db88ac93b853ba6e02b9155bc</anchor> + <anchor>ga4</anchor> <arglist>(const stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_bounds</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd56df3112937c11431e033f2d9574b96</anchor> + <anchor>ga5</anchor> <arglist>(stp_sequence_t *sequence, double low, double high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_bounds</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g392e1da122d95d6fc07b6d73eff1d311</anchor> + <anchor>ga6</anchor> <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_range</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc2c70c539a3eced45be306d082faa3a6</anchor> + <anchor>ga7</anchor> <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_size</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g166e9a610bd53cb812e328d9e111f240</anchor> + <anchor>ga8</anchor> <arglist>(stp_sequence_t *sequence, size_t size)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_sequence_get_size</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g99292c5ba10bcf1574c3e71a593c3e5f</anchor> + <anchor>ga9</anchor> <arglist>(const stp_sequence_t *sequence)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g24024e771a50db02f2713b244212603e</anchor> + <anchor>ga10</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_subrange</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor> + <anchor>ga11</anchor> <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_sequence_get_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc33208fae031bd1111f8ceb4c1425199</anchor> + <anchor>ga12</anchor> <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_point</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gf7f49101192387e29399ded6d3166d13</anchor> + <anchor>ga13</anchor> <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_get_point</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g044210129f28c298152ce124371324d4</anchor> + <anchor>ga14</anchor> <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_float_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g34a526cb5e72b611ac8a98b559c24e2e</anchor> + <anchor>ga15</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_long_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd15e2cf350bb311da58f4b11240fa0f2</anchor> + <anchor>ga16</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_ulong_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gbc7ec322716d761436e4ad2d5d2f756f</anchor> + <anchor>ga17</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_int_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gd4f058b2c690ad4e326970cc841d8f79</anchor> + <anchor>ga18</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_uint_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g40cd6256eb5bb72decd60edd1dc3be54</anchor> + <anchor>ga19</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_short_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>ge0d6719f863a10422dea23e7f4b4dd29</anchor> + <anchor>ga20</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_sequence_set_ushort_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g68aed44bbf6ede9ac49237091f2deb43</anchor> + <anchor>ga21</anchor> <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist> </member> <member kind="function"> <type>const float *</type> <name>stp_sequence_get_float_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gf8cd9da688af479103cf8600e48f61c9</anchor> + <anchor>ga22</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const long *</type> <name>stp_sequence_get_long_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g864b55caa3a8c0e573031a36f57f7cc4</anchor> + <anchor>ga23</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned long *</type> <name>stp_sequence_get_ulong_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor> + <anchor>ga24</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const int *</type> <name>stp_sequence_get_int_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g4396baf0d338eec6f3bce3e2000da978</anchor> + <anchor>ga25</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned int *</type> <name>stp_sequence_get_uint_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g204f77e91c9283dc6ec6e742687bb0db</anchor> + <anchor>ga26</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const short *</type> <name>stp_sequence_get_short_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g91a68efd6b99150739c7706f65703a2f</anchor> + <anchor>ga27</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> <member kind="function"> <type>const unsigned short *</type> <name>stp_sequence_get_ushort_data</name> <anchorfile>group__sequence.html</anchorfile> - <anchor>g8bf46faeea891ac7ca699591df596bc1</anchor> + <anchor>ga28</anchor> <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist> </member> </compound> @@ -7486,385 +7486,385 @@ <type>#define</type> <name>STP_DBG_LUT</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9ef88b326f83d342849fa89c33c7e4a7</anchor> + <anchor>ga33</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_COLORFUNC</name> <anchorfile>group__util.html</anchorfile> - <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor> + <anchor>ga34</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_INK</name> <anchorfile>group__util.html</anchorfile> - <anchor>g328a4b66d0767134649ce30b243931c9</anchor> + <anchor>ga35</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g8d8211f97675b37f18bff822757d04b3</anchor> + <anchor>ga36</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PCL</name> <anchorfile>group__util.html</anchorfile> - <anchor>g30a9efd31b78debefd550d0b337ec795</anchor> + <anchor>ga37</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_ESCP2</name> <anchorfile>group__util.html</anchorfile> - <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor> + <anchor>ga38</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CANON</name> <anchorfile>group__util.html</anchorfile> - <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor> + <anchor>ga39</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_LEXMARK</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor> + <anchor>ga40</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_WEAVE_PARAMS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor> + <anchor>ga41</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_ROWS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb764d477ebf0db4957cc316badac70bd</anchor> + <anchor>ga42</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_MARK_FILE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor> + <anchor>ga43</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_LIST</name> <anchorfile>group__util.html</anchorfile> - <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor> + <anchor>ga44</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_MODULE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor> + <anchor>ga45</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PATH</name> <anchorfile>group__util.html</anchorfile> - <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor> + <anchor>ga46</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PAPER</name> <anchorfile>group__util.html</anchorfile> - <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor> + <anchor>ga47</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_PRINTERS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor> + <anchor>ga48</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_XML</name> <anchorfile>group__util.html</anchorfile> - <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor> + <anchor>ga49</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_VARS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g52844a51058ca29f975b5666743622ac</anchor> + <anchor>ga50</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_OLYMPUS</name> <anchorfile>group__util.html</anchorfile> - <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor> + <anchor>ga51</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CURVE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor> + <anchor>ga52</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_DBG_CURVE_ERRORS</name> <anchorfile>group__util.html</anchorfile> - <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor> + <anchor>ga53</anchor> <arglist></arglist> </member> <member kind="define"> <type>#define</type> <name>STP_SAFE_FREE</name> <anchorfile>group__util.html</anchorfile> - <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor> + <anchor>ga54</anchor> <arglist>(x)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_init</name> <anchorfile>group__util.html</anchorfile> - <anchor>g69354e5830712093045a4ba290a298f8</anchor> + <anchor>ga0</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_set_output_codeset</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor> + <anchor>ga1</anchor> <arglist>(const char *codeset)</arglist> </member> <member kind="function"> <type>stp_curve_t *</type> <name>stp_read_and_compose_curves</name> <anchorfile>group__util.html</anchorfile> - <anchor>g21168356d466d278f11dab2be8d0016e</anchor> + <anchor>ga2</anchor> <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_abort</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor> + <anchor>ga3</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_prune_inactive_options</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor> + <anchor>ga4</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_zprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor> + <anchor>ga5</anchor> <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_zfwrite</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9135d4c8cac78593aff55b668d09b79c</anchor> + <anchor>ga6</anchor> <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_putc</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf07e31a63021b4d504cc5a410e1aeb08</anchor> + <anchor>ga7</anchor> <arglist>(int ch, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put16_le</name> <anchorfile>group__util.html</anchorfile> - <anchor>g01199dc1d5a3db973d22cc9db00a4f41</anchor> + <anchor>ga8</anchor> <arglist>(unsigned short sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put16_be</name> <anchorfile>group__util.html</anchorfile> - <anchor>g3c20beae37d9841e095b336d6f7dcc1d</anchor> + <anchor>ga9</anchor> <arglist>(unsigned short sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put32_le</name> <anchorfile>group__util.html</anchorfile> - <anchor>g0a445c531388afa31650ef4ccdac3ae1</anchor> + <anchor>ga10</anchor> <arglist>(unsigned int sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_put32_be</name> <anchorfile>group__util.html</anchorfile> - <anchor>gbe0e31fbc0c4e6374903b25edc594f5e</anchor> + <anchor>ga11</anchor> <arglist>(unsigned int sh, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_puts</name> <anchorfile>group__util.html</anchorfile> - <anchor>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor> + <anchor>ga12</anchor> <arglist>(const char *s, const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_send_command</name> <anchorfile>group__util.html</anchorfile> - <anchor>g23ee64de1ec6ef5a4941ab80ba609840</anchor> + <anchor>ga13</anchor> <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_erputc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g859b75eddde620338859121451096097</anchor> + <anchor>ga14</anchor> <arglist>(int ch)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_eprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g47c73485971132d9b41a33bdf572f670</anchor> + <anchor>ga15</anchor> <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_erprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g5f6389ed7d500f851cabe8425a158e4b</anchor> + <anchor>ga16</anchor> <arglist>(const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void</type> <name>stp_asprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g6bdd7099220fe310b228dcff5159b8d9</anchor> + <anchor>ga17</anchor> <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void void</type> <name>stp_catprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor> + <anchor>ga18</anchor> <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>unsigned long</type> <name>stp_get_debug_level</name> <anchorfile>group__util.html</anchorfile> - <anchor>g9ab4c35dd4b6e142281ff36ecedee27e</anchor> + <anchor>ga19</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_dprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor> + <anchor>ga20</anchor> <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void</type> <name>stp_deprintf</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor> + <anchor>ga21</anchor> <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist> </member> <member kind="function"> <type>void void void</type> <name>stp_init_debug_messages</name> <anchorfile>group__util.html</anchorfile> - <anchor>g26a43ceec27ca34bc49f4806900b4618</anchor> + <anchor>ga22</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_flush_debug_messages</name> <anchorfile>group__util.html</anchorfile> - <anchor>gf39c22b74843750ca74a6caccb263c7c</anchor> + <anchor>ga23</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_malloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor> + <anchor>ga24</anchor> <arglist>(size_t)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_zalloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor> + <anchor>ga25</anchor> <arglist>(size_t)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_realloc</name> <anchorfile>group__util.html</anchorfile> - <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor> + <anchor>ga26</anchor> <arglist>(void *ptr, size_t)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_free</name> <anchorfile>group__util.html</anchorfile> - <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor> + <anchor>ga27</anchor> <arglist>(void *ptr)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_strlen</name> <anchorfile>group__util.html</anchorfile> - <anchor>g054943d301baecba82cdb78b7e454880</anchor> + <anchor>ga28</anchor> <arglist>(const char *s)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_strndup</name> <anchorfile>group__util.html</anchorfile> - <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor> + <anchor>ga29</anchor> <arglist>(const char *s, int n)</arglist> </member> <member kind="function"> <type>char *</type> <name>stp_strdup</name> <anchorfile>group__util.html</anchorfile> - <anchor>g2f861f4a98ad496ca8cd995147867f32</anchor> + <anchor>ga30</anchor> <arglist>(const char *s)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_version</name> <anchorfile>group__util.html</anchorfile> - <anchor>g77022a2cfde3a9ba9269f1bc3726175c</anchor> + <anchor>ga31</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_release_version</name> <anchorfile>group__util.html</anchorfile> - <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor> + <anchor>ga32</anchor> <arglist>(void)</arglist> </member> </compound> @@ -7880,1101 +7880,1101 @@ <type>stp_vars</type> <name>stp_vars_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gde33aeed00b53e4af71ee1f7c4326279</anchor> + <anchor>ga0</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void *</type> <name>stp_parameter_list_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor> + <anchor>ga1</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>const void *</type> <name>stp_const_parameter_list_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor> + <anchor>ga2</anchor> <arglist></arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_outfunc_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd11be815334025415a8e2023e0cd44c5</anchor> + <anchor>ga3</anchor> <arglist>)(void *data, const char *buffer, size_t bytes)</arglist> </member> <member kind="typedef"> <type>void *(*</type> <name>stp_copy_data_func_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd31fc080a2bd980c6a05a541dc1612a3</anchor> + <anchor>ga4</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>void(*</type> <name>stp_free_data_func_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3f7233002f4db790a077e33c2661665c</anchor> + <anchor>ga5</anchor> <arglist>)(void *)</arglist> </member> <member kind="typedef"> <type>stp_compdata</type> <name>compdata_t</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9ee295029ad2d072b4099dc390359900</anchor> + <anchor>ga6</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_type_t</name> - <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor> + <anchor>ga132</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_STRING_LIST</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor> + <anchor>gga132a7</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_INT</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor> + <anchor>gga132a8</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_BOOLEAN</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor> + <anchor>gga132a9</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_DOUBLE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor> + <anchor>gga132a10</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_CURVE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor> + <anchor>gga132a11</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_FILE</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor> + <anchor>gga132a12</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_RAW</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor> + <anchor>gga132a13</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_ARRAY</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor> + <anchor>gga132a14</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_DIMENSION</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor> + <anchor>gga132a15</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_TYPE_INVALID</name> - <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor> + <anchor>gga132a16</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_class_t</name> - <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor> + <anchor>ga133</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_FEATURE</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor> + <anchor>gga133a17</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_OUTPUT</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor> + <anchor>gga133a18</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_CORE</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor> + <anchor>gga133a19</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_CLASS_INVALID</name> - <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor> + <anchor>gga133a20</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_level_t</name> - <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor> + <anchor>ga134</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_BASIC</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor> + <anchor>gga134a21</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor> + <anchor>gga134a22</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED1</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor> + <anchor>gga134a23</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED2</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor> + <anchor>gga134a24</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED3</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor> + <anchor>gga134a25</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_ADVANCED4</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor> + <anchor>gga134a26</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_INTERNAL</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor> + <anchor>gga134a27</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_EXTERNAL</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor> + <anchor>gga134a28</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_LEVEL_INVALID</name> - <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor> + <anchor>gga134a29</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_activity_t</name> - <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor> + <anchor>ga135</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_INACTIVE</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor> + <anchor>gga135a30</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_DEFAULTED</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor> + <anchor>gga135a31</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>STP_PARAMETER_ACTIVE</name> - <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor> + <anchor>gga135a32</anchor> <arglist></arglist> </member> <member kind="enumeration"> <name>stp_parameter_verify_t</name> - <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor> + <anchor>ga136</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_BAD</name> - <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor> + <anchor>gga136a33</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_OK</name> - <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor> + <anchor>gga136a34</anchor> <arglist></arglist> </member> <member kind="enumvalue"> <name>PARAMETER_INACTIVE</name> - <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor> + <anchor>gga136a35</anchor> <arglist></arglist> </member> <member kind="function"> <type>stp_vars_t *</type> <name>stp_vars_create</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor> + <anchor>ga7</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_vars_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor> + <anchor>ga8</anchor> <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist> </member> <member kind="function"> <type>stp_vars_t *</type> <name>stp_vars_create_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3c6d765cc5a27b322289e9baa9d97098</anchor> + <anchor>ga9</anchor> <arglist>(const stp_vars_t *source)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_vars_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g78259fcaa881655a07ef0b2b457bdf70</anchor> + <anchor>ga10</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_driver</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga8d9dbb1e613cfe2b119668158e35a76</anchor> + <anchor>ga11</anchor> <arglist>(stp_vars_t *v, const char *val)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_driver_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge303a6ed77135b691ebbfd56cb577531</anchor> + <anchor>ga12</anchor> <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_driver</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcf8efdb6fd9847e41c85f9491a252f01</anchor> + <anchor>ga13</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_color_conversion</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g335e7eb264fa22343765146fb2318b31</anchor> + <anchor>ga14</anchor> <arglist>(stp_vars_t *v, const char *val)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_color_conversion_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3164aa99994dabb561d6c295eb647123</anchor> + <anchor>ga15</anchor> <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_color_conversion</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g087136342c500c138d73dbe0e2aad11a</anchor> + <anchor>ga16</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_left</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5d675ab9877df60ec467a20a0d62fcbc</anchor> + <anchor>ga17</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_left</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd3fbd778898c2b0fba19d0937fb939f5</anchor> + <anchor>ga18</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_top</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor> + <anchor>ga19</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_top</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor> + <anchor>ga20</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor> + <anchor>ga21</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor> + <anchor>ga22</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g68110f6d19b3987f6f66baee3926eb89</anchor> + <anchor>ga23</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7623276e130cb684670ecb153300ebaf</anchor> + <anchor>ga24</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_page_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g751759cdeb8feb061c00f35d37fea45c</anchor> + <anchor>ga25</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_page_width</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gea14f3cad139fc5b8d547a252deacff3</anchor> + <anchor>ga26</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_page_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g775714bf75f1fdbdd895f59edc9eca55</anchor> + <anchor>ga27</anchor> <arglist>(stp_vars_t *v, int val)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_page_height</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g94d8cf912e3b036f67bc2d4c37d733ff</anchor> + <anchor>ga28</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_outfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g30d5438686c8ead9a092f98bf3c3d8ca</anchor> + <anchor>ga29</anchor> <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist> </member> <member kind="function"> <type>stp_outfunc_t</type> <name>stp_get_outfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g095834813ebbe8985d443e1fa78a0b98</anchor> + <anchor>ga30</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_errfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge89d8eb48e4a7a8107b87a44a4318064</anchor> + <anchor>ga31</anchor> <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist> </member> <member kind="function"> <type>stp_outfunc_t</type> <name>stp_get_errfunc</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor> + <anchor>ga32</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_outdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8fef23ae01a368f4d16ad95813d97d6d</anchor> + <anchor>ga33</anchor> <arglist>(stp_vars_t *v, void *val)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_outdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g54e35f94578f346c07718587f18b049c</anchor> + <anchor>ga34</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_errdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7a006418c4dbb265be71f7b5a202455d</anchor> + <anchor>ga35</anchor> <arglist>(stp_vars_t *v, void *val)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_errdata</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor> + <anchor>ga36</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_merge_printvars</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc970fc314c6418d9193d93c787b908d9</anchor> + <anchor>ga37</anchor> <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_get_parameter_list</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g955b215a88b868cfc74d7a340de9b8f6</anchor> + <anchor>ga38</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>size_t</type> <name>stp_parameter_list_count</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf69f651a798e9f06c67baf06f0754228</anchor> + <anchor>ga39</anchor> <arglist>(stp_const_parameter_list_t list)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_find</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3dea1f995d40482b9f6470fedd994f95</anchor> + <anchor>ga40</anchor> <arglist>(stp_const_parameter_list_t list, const char *name)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_list_param</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g96fc73864dfc00ae418f14a81c72be26</anchor> + <anchor>ga41</anchor> <arglist>(stp_const_parameter_list_t list, size_t item)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd0f6c2b153638f551d7709780eb7276a</anchor> + <anchor>ga42</anchor> <arglist>(stp_parameter_list_t list)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_parameter_list_create</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g3c1ddd3c10c367c0912fdd841576278f</anchor> + <anchor>ga43</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_add_param</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor> + <anchor>ga44</anchor> <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist> </member> <member kind="function"> <type>stp_parameter_list_t</type> <name>stp_parameter_list_copy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g62c6225b0721d5c80d889edc307f0b6b</anchor> + <anchor>ga45</anchor> <arglist>(stp_const_parameter_list_t list)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_list_append</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf8aa1d7aba11de5fdee95b9cb339be61</anchor> + <anchor>ga46</anchor> <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_describe_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ged453c314365a3948b195e3175455a12</anchor> + <anchor>ga47</anchor> <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_parameter_description_destroy</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc5a3eb0348d31acf60772265c3896542</anchor> + <anchor>ga48</anchor> <arglist>(stp_parameter_t *description)</arglist> </member> <member kind="function"> <type>const stp_parameter_t *</type> <name>stp_parameter_find_in_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g711cf3e5e52fd3434ef7a9d16654aea8</anchor> + <anchor>ga49</anchor> <arglist>(const stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22338d64a871a8b279fdee6fd83fff7f</anchor> + <anchor>ga50</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5182246d4e0653f73dfaa40b62d4285f</anchor> + <anchor>ga51</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8134e4dc36b063a7d7dd229b9df32726</anchor> + <anchor>ga52</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6e6c5474c253a452073eba25251a1481</anchor> + <anchor>ga53</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g82f7bbcf639c60678c1dc2aee24e8a24</anchor> + <anchor>ga54</anchor> <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor> + <anchor>ga55</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g778b0e43aad1e011012b8071b469c694</anchor> + <anchor>ga56</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8f67ed7dcee969e77374fb4daf468d58</anchor> + <anchor>ga57</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5f4adaadb80cd2d94569881d96cfa02e</anchor> + <anchor>ga58</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1f63514f8ffd8ea56f0beee69398ee01</anchor> + <anchor>ga59</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd40038a74fa7548da5fcaec6687c8787</anchor> + <anchor>ga60</anchor> <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_scale_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gec605c647cab13d61ab5e2822d9f7ead</anchor> + <anchor>ga61</anchor> <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g71306c3e3118d9a4545b0a3cefb863ea</anchor> + <anchor>ga62</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_string_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g65b18994af3384af04e2bf77e288f54f</anchor> + <anchor>ga63</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae28e4c640fba005a72e92af66327b50</anchor> + <anchor>ga64</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_file_parameter_n</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdeae102d1bd65147221f56e6095f35ef</anchor> + <anchor>ga65</anchor> <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g59b79c779211a72de534fb9e61548f97</anchor> + <anchor>ga66</anchor> <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gbf1d9c938d364598414e9f15c41c1f08</anchor> + <anchor>ga67</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g18b8a4fb414245d2c30df9ee11057845</anchor> + <anchor>ga68</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gd286782f691998858e30a202506bad74</anchor> + <anchor>ga69</anchor> <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdd7769bfece8597cde869eced1239a1e</anchor> + <anchor>ga70</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga1620e4be3c7fb85262802338d3143f6</anchor> + <anchor>ga71</anchor> <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_default_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf95184ecee86a92db2a7d3f050154a46</anchor> + <anchor>ga72</anchor> <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga59b141facb320c409d9071f469fdbc5</anchor> + <anchor>ga73</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const char *</type> <name>stp_get_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5efb45e6883a2522fd7e78c6eb761c79</anchor> + <anchor>ga74</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>double</type> <name>stp_get_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g46195f69cc57bd18a4cde5756dd84601</anchor> + <anchor>ga75</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor> + <anchor>ga76</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb4121cba599314c929d04cce0e850473</anchor> + <anchor>ga77</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g4cc8b69619067f882035cca46e9ce0cd</anchor> + <anchor>ga78</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_curve_t *</type> <name>stp_get_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1a5a2746548465d681d00c6301a26100</anchor> + <anchor>ga79</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_array_t *</type> <name>stp_get_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb918206f9b70fff5d58a16a762295981</anchor> + <anchor>ga80</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>const stp_raw_t *</type> <name>stp_get_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor> + <anchor>ga81</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor> + <anchor>ga82</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g7acde85eb361525f5cf481bafddbc1bd</anchor> + <anchor>ga83</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g740a5cab681f30b8cc5e4ca18197e472</anchor> + <anchor>ga84</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g4841e9250e4c7f38f2267355402ffcc1</anchor> + <anchor>ga85</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g28203d9250f232f9af290802cf2db881</anchor> + <anchor>ga86</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge5b7e3356b3c1c893620fdeeea486e48</anchor> + <anchor>ga87</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9e992f880bd74cd4097527a39aea7125</anchor> + <anchor>ga88</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb9df68cbf9973203adfca5e1293b300a</anchor> + <anchor>ga89</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_clear_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga79b051578077beca548be224062705c</anchor> + <anchor>ga90</anchor> <arglist>(stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_string_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g44793f2cf64b11917b8943d20ee43b9d</anchor> + <anchor>ga91</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_file_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8c04ab4487623a41e0b2600d466a88ad</anchor> + <anchor>ga92</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_float_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor> + <anchor>ga93</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_int_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g1c724bc85737bf8c698a08bc2d441b3e</anchor> + <anchor>ga94</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_dimension_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6fa1953ee96051566a261f3391da3857</anchor> + <anchor>ga95</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_boolean_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor> + <anchor>ga96</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_curve_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g160150a3a39d66f5a807d1c750a57890</anchor> + <anchor>ga97</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_array_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf2aada3c00f9b00bc6a65014da87e250</anchor> + <anchor>ga98</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_raw_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9fe388535a67f8360ab21f58233c0e17</anchor> + <anchor>ga99</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_string_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gae6b21f76f675516e9189c47444e17cf</anchor> + <anchor>ga100</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_file_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor> + <anchor>ga101</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_float_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g2deea3612965e28cd0d513c5850ca074</anchor> + <anchor>ga102</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_int_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g056b021334fe812aa14bbbfd60aafba8</anchor> + <anchor>ga103</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_dimension_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gcdfa2f747081721c03b10484a832a535</anchor> + <anchor>ga104</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_boolean_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gadfd66825dd58fb8e0851d493445c4e4</anchor> + <anchor>ga105</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_curve_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>geecfc1f1fdc97ea165ae35b64de95178</anchor> + <anchor>ga106</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_array_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gdf6c305c48d012bc138db025c9bd63df</anchor> + <anchor>ga107</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_check_raw_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5bd30b408d6ec16b3999dce5e540a5fa</anchor> + <anchor>ga108</anchor> <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_string_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gda8dd20ab17a9b403c68b4cd86fb529c</anchor> + <anchor>ga109</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_file_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g0f09e85b570ffee4a4d94853bb22bcb3</anchor> + <anchor>ga110</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_float_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g28d01beda4b54cec395654847dbbc301</anchor> + <anchor>ga111</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_int_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor> + <anchor>ga112</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_dimension_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8125d08f90002e654f2e45427e2f0251</anchor> + <anchor>ga113</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_boolean_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor> + <anchor>ga114</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_curve_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gb686075ecbdf349387c356826b432191</anchor> + <anchor>ga115</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_array_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g64e5f74483ffb7bd4412f4eefeb22250</anchor> + <anchor>ga116</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>stp_parameter_activity_t</type> <name>stp_get_raw_parameter_active</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g57abcfb2fa58e743f9d30f579481845a</anchor> + <anchor>ga117</anchor> <arglist>(const stp_vars_t *v, const char *parameter)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_media_size</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge690d9171bcdb0fedf981804bb923fac</anchor> + <anchor>ga118</anchor> <arglist>(const stp_vars_t *v, int *width, int *height)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_imageable_area</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gebcb03afca6bb0d94e71bdf570d09af9</anchor> + <anchor>ga119</anchor> <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_get_size_limit</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor> + <anchor>ga120</anchor> <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_describe_resolution</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g5735451225c2a355cb11c165e011637d</anchor> + <anchor>ga121</anchor> <arglist>(const stp_vars_t *v, int *x, int *y)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_verify</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ge28b0d78641811b1625a52971a2d11fa</anchor> + <anchor>ga122</anchor> <arglist>(stp_vars_t *v)</arglist> </member> <member kind="function"> <type>const stp_vars_t *</type> <name>stp_default_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g9f897908b19f5f0cdaf75b483d46e041</anchor> + <anchor>ga123</anchor> <arglist>(void)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_allocate_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor> + <anchor>ga124</anchor> <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_destroy_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g089f9a34f26f700f43858ba3959d8f13</anchor> + <anchor>ga125</anchor> <arglist>(stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>void *</type> <name>stp_get_component_data</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8eea0724106ea7174b808026ae8d1a5c</anchor> + <anchor>ga126</anchor> <arglist>(const stp_vars_t *v, const char *name)</arglist> </member> <member kind="function"> <type>stp_parameter_verify_t</type> <name>stp_verify_parameter</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gf64e586fca554f2dd65157a76eaad34a</anchor> + <anchor>ga127</anchor> <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist> </member> <member kind="function"> <type>int</type> <name>stp_get_verified</name> <anchorfile>group__vars.html</anchorfile> - <anchor>ga1b826f02f84aa038c6862575770b629</anchor> + <anchor>ga128</anchor> <arglist>(const stp_vars_t *v)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_set_verified</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g8a2924dd6393431e994d22c704ec25fc</anchor> + <anchor>ga129</anchor> <arglist>(stp_vars_t *v, int value)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_copy_options</name> <anchorfile>group__vars.html</anchorfile> - <anchor>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor> + <anchor>ga130</anchor> <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist> </member> <member kind="function"> <type>void</type> <name>stp_fill_parameter_settings</name> <anchorfile>group__vars.html</anchorfile> - <anchor>g6a08746f33133e8873236b35eb1e7a62</anchor> + <anchor>ga131</anchor> <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist> </member> </compound> <compound kind="dir"> <name>include/gutenprint/</name> - <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path> - <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html</filename> + <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path> + <filename>dir_000001.html</filename> <file>array.h</file> <file>bit-ops.h</file> <file>channel.h</file> @@ -9003,8 +9003,8 @@ </compound> <compound kind="dir"> <name>include/</name> - <path>/home/rleigh/gutenprint-debian-dist/include/</path> - <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html</filename> + <path>/home/rlk/sandbox/print-4.3/include/</path> + <filename>dir_000000.html</filename> <dir>include/gutenprint/</dir> </compound> </tagfile> diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html index b7fcba2..0ea0f62 100644 --- a/doc/gutenprint/html/annotated.html +++ b/doc/gutenprint/html/annotated.html @@ -2,24 +2,9 @@ <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> <title>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: @@ -55,8 +40,8 @@
dither_matrix_impl
stp_cached_curve_t
stp_shade
stp_weave_t
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html index 39913b1..b571c08 100644 --- a/doc/gutenprint/html/array_8h.html +++ b/doc/gutenprint/html/array_8h.html @@ -2,74 +2,60 @@ 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
+include » gutenprint

array.h File Reference

Array functions. More...

#include <gutenprint/sequence.h>
- + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

Typedefs

typedef stp_array stp_array_t
typedef stp_array stp_array_t
 The array opaque data type.
 The array opaque data type.

Functions

stp_array_t * stp_array_create (int x_size, int y_size)
stp_array_t * stp_array_create (int x_size, int y_size)
 Create a new array.
void stp_array_destroy (stp_array_t *array)
 Create a new array.
void stp_array_destroy (stp_array_t *array)
 Destroy an array.
void stp_array_copy (stp_array_t *dest, const stp_array_t *source)
 Destroy an array.
void stp_array_copy (stp_array_t *dest, const stp_array_t *source)
 Copy an array.
stp_array_t * stp_array_create_copy (const stp_array_t *array)
 Copy an array.
stp_array_t * stp_array_create_copy (const stp_array_t *array)
 Copy and allocate an array.
void stp_array_set_size (stp_array_t *array, int x_size, int y_size)
 Copy and allocate an array.
void stp_array_set_size (stp_array_t *array, int x_size, int y_size)
 Resize an array.
void stp_array_get_size (const stp_array_t *array, int *x_size, int *y_size)
 Resize an array.
void stp_array_get_size (const stp_array_t *array, int *x_size, int *y_size)
 Get the size of an array.
void stp_array_set_data (stp_array_t *array, const double *data)
 Get the size of an array.
void stp_array_set_data (stp_array_t *array, const double *data)
 Set the data in an array.
void stp_array_get_data (const stp_array_t *array, size_t *size, const double **data)
 Set the data in an array.
void stp_array_get_data (const stp_array_t *array, size_t *size, const double **data)
 Get the data in an array.
int stp_array_set_point (stp_array_t *array, int x, int y, double data)
 Get the data in an array.
int stp_array_set_point (stp_array_t *array, int x, int y, double data)
 Set the data at a single point in the array.
int stp_array_get_point (const stp_array_t *array, int x, int y, double *data)
 Set the data at a single point in the array.
int stp_array_get_point (const stp_array_t *array, int x, int y, double *data)
 Get the data at a single point in the array.
const stp_sequence_t * stp_array_get_sequence (const stp_array_t *array)
 Get the data at a single point in the array.
const stp_sequence_t * stp_array_get_sequence (const stp_array_t *array)
 Get the underlying stp_sequence_t.
 Get the underlying stp_sequence_t.

Detailed Description

Array functions.

-

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html index b4bf8b5..8d33a81 100644 --- a/doc/gutenprint/html/bit-ops_8h.html +++ b/doc/gutenprint/html/bit-ops_8h.html @@ -2,50 +2,36 @@ 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
+include » gutenprint

bit-ops.h File Reference

Bit operations. More...

- + - + - + - + - + - + - +

Functions

void stp_fold (const unsigned char *line, int single_height, unsigned char *outbuf)
void stp_fold (const unsigned char *line, int single_height, unsigned char *outbuf)
void stp_split_2 (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)
void stp_split_2 (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)
void stp_split_4 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)
void stp_split_4 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)
void stp_unpack_2 (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)
void stp_unpack_2 (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)
void stp_unpack_4 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)
void stp_unpack_4 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)
void stp_unpack_8 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)
void stp_unpack_8 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)
void stp_unpack_16 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)
void stp_unpack_16 (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)

Detailed Description

Bit operations.

Function Documentation

-

+

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

+

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

+

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

+

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

+

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

+

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

+

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

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html index a13da05..1816ca9 100644 --- a/doc/gutenprint/html/channel_8h.html +++ b/doc/gutenprint/html/channel_8h.html @@ -2,84 +2,70 @@ 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
+include » gutenprint

channel.h File Reference

Channel functions. More...

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

Functions

void stp_channel_reset (stp_vars_t *v)
void stp_channel_reset (stp_vars_t *v)
void stp_channel_reset_channel (stp_vars_t *v, int channel)
void stp_channel_reset_channel (stp_vars_t *v, int channel)
void stp_channel_add (stp_vars_t *v, unsigned channel, unsigned subchannel, double value)
void stp_channel_add (stp_vars_t *v, unsigned channel, unsigned subchannel, double value)
double stp_channel_get_value (stp_vars_t *v, unsigned channel, unsigned subchannel)
double stp_channel_get_value (stp_vars_t *v, unsigned channel, unsigned subchannel)
void stp_channel_set_density_adjustment (stp_vars_t *v, int color, int subchannel, double adjustment)
void stp_channel_set_density_adjustment (stp_vars_t *v, int color, int subchannel, double adjustment)
double stp_channel_get_density_adjustment (stp_vars_t *v, int color, int subchannel)
double stp_channel_get_density_adjustment (stp_vars_t *v, int color, int subchannel)
void stp_channel_set_ink_limit (stp_vars_t *v, double limit)
void stp_channel_set_ink_limit (stp_vars_t *v, double limit)
double stp_channel_get_ink_limit (stp_vars_t *v)
double stp_channel_get_ink_limit (stp_vars_t *v)
void stp_channel_set_cutoff_adjustment (stp_vars_t *v, int color, int subchannel, double adjustment)
void stp_channel_set_cutoff_adjustment (stp_vars_t *v, int color, int subchannel, double adjustment)
double stp_channel_get_cutoff_adjustment (stp_vars_t *v, int color, int subchannel)
double stp_channel_get_cutoff_adjustment (stp_vars_t *v, int color, int subchannel)
void stp_channel_set_black_channel (stp_vars_t *v, int channel)
void stp_channel_set_black_channel (stp_vars_t *v, int channel)
int stp_channel_get_black_channel (stp_vars_t *v)
int stp_channel_get_black_channel (stp_vars_t *v)
void stp_channel_set_gloss_channel (stp_vars_t *v, int channel)
void stp_channel_set_gloss_channel (stp_vars_t *v, int channel)
int stp_channel_get_gloss_channel (stp_vars_t *v)
int stp_channel_get_gloss_channel (stp_vars_t *v)
void stp_channel_set_gloss_limit (stp_vars_t *v, double limit)
void stp_channel_set_gloss_limit (stp_vars_t *v, double limit)
double stp_channel_get_gloss_limit (stp_vars_t *v)
double stp_channel_get_gloss_limit (stp_vars_t *v)
void stp_channel_set_curve (stp_vars_t *v, int channel, const stp_curve_t *curve)
void stp_channel_set_curve (stp_vars_t *v, int channel, const stp_curve_t *curve)
const stp_curve_t * stp_channel_get_curve (stp_vars_t *v, int channel)
const stp_curve_t * stp_channel_get_curve (stp_vars_t *v, int channel)
void stp_channel_set_gcr_curve (stp_vars_t *v, const stp_curve_t *curve)
void stp_channel_set_gcr_curve (stp_vars_t *v, const stp_curve_t *curve)
const stp_curve_t * stp_channel_get_gcr_curve (stp_vars_t *v)
const stp_curve_t * stp_channel_get_gcr_curve (stp_vars_t *v)
void stp_channel_initialize (stp_vars_t *v, stp_image_t *image, int input_channel_count)
void stp_channel_initialize (stp_vars_t *v, stp_image_t *image, int input_channel_count)
void stp_channel_convert (const stp_vars_t *v, unsigned *zero_mask)
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_input (const stp_vars_t *v)
unsigned short * stp_channel_get_output (const stp_vars_t *v)
unsigned short * stp_channel_get_output (const stp_vars_t *v)

Detailed Description

Channel functions.

Function Documentation

-

+

- + @@ -128,7 +114,7 @@ Channel functions.
@@ -87,7 +73,7 @@ Channel functions.
void stp_channel_add ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -165,7 +151,7 @@ Channel functions.
@@ -136,7 +122,7 @@ Channel functions.
void stp_channel_convert ( const stp_vars_t * const stp_vars_t *  v,
-

+

- + @@ -193,15 +179,15 @@ Channel functions.
@@ -173,7 +159,7 @@ Channel functions.
int stp_channel_get_black_channel ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + - + @@ -230,7 +216,7 @@ Channel functions.
const stp_curve_t* stp_channel_get_curve const stp_curve_t* stp_channel_get_curve ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -273,7 +259,7 @@ Channel functions.
@@ -238,7 +224,7 @@ Channel functions.
double stp_channel_get_cutoff_adjustment ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -316,15 +302,15 @@ Channel functions.
@@ -281,7 +267,7 @@ Channel functions.
double stp_channel_get_density_adjustment ( stp_vars_t * stp_vars_t *  v,
-

+

- + - + - + - + - + - + - + - + - + - + - + - + - +
- + - + @@ -344,7 +330,7 @@ Channel functions.
const stp_curve_t* stp_channel_get_gcr_curve const stp_curve_t* stp_channel_get_gcr_curve ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + @@ -372,7 +358,7 @@ Channel functions.
@@ -352,7 +338,7 @@ Channel functions.
int stp_channel_get_gloss_channel ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + @@ -400,7 +386,7 @@ Channel functions.
@@ -380,7 +366,7 @@ Channel functions.
double stp_channel_get_gloss_limit ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + @@ -428,7 +414,7 @@ Channel functions.
@@ -408,7 +394,7 @@ Channel functions.
double stp_channel_get_ink_limit ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + @@ -456,7 +442,7 @@ Channel functions.
@@ -436,7 +422,7 @@ Channel functions.
unsigned short* stp_channel_get_input ( const stp_vars_t * const stp_vars_t *  v  ) 
-

+

- + @@ -484,7 +470,7 @@ Channel functions.
@@ -464,7 +450,7 @@ Channel functions.
unsigned short* stp_channel_get_output ( const stp_vars_t * const stp_vars_t *  v  ) 
-

+

- + @@ -527,7 +513,7 @@ Channel functions.
@@ -492,7 +478,7 @@ Channel functions.
double stp_channel_get_value ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -570,7 +556,7 @@ Channel functions.
@@ -535,7 +521,7 @@ Channel functions.
void stp_channel_initialize ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -598,7 +584,7 @@ Channel functions.
@@ -578,7 +564,7 @@ Channel functions.
void stp_channel_reset ( stp_vars_t * stp_vars_t *  v  ) 
-

+

- + @@ -635,7 +621,7 @@ Channel functions.
@@ -606,7 +592,7 @@ Channel functions.
void stp_channel_reset_channel ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -672,7 +658,7 @@ Channel functions.
@@ -643,7 +629,7 @@ Channel functions.
void stp_channel_set_black_channel ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -692,7 +678,7 @@ Channel functions. - + @@ -715,7 +701,7 @@ Channel functions.
@@ -680,7 +666,7 @@ Channel functions.
void stp_channel_set_curve ( stp_vars_t * stp_vars_t *  v,
const stp_curve_t * const stp_curve_t *  curve
-

+

- + @@ -764,7 +750,7 @@ Channel functions.
@@ -723,7 +709,7 @@ Channel functions.
void stp_channel_set_cutoff_adjustment ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -813,7 +799,7 @@ Channel functions.
@@ -772,7 +758,7 @@ Channel functions.
void stp_channel_set_density_adjustment ( stp_vars_t * stp_vars_t *  v,
-

+

- + - + @@ -850,7 +836,7 @@ Channel functions.
@@ -821,13 +807,13 @@ Channel functions.
void stp_channel_set_gcr_curve ( stp_vars_t * stp_vars_t *  v,
const stp_curve_t * const stp_curve_t *  curve
-

+

- + @@ -887,7 +873,7 @@ Channel functions.
@@ -858,7 +844,7 @@ Channel functions.
void stp_channel_set_gloss_channel ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -924,7 +910,7 @@ Channel functions.
@@ -895,7 +881,7 @@ Channel functions.
void stp_channel_set_gloss_limit ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -961,8 +947,8 @@ Channel functions.
@@ -932,7 +918,7 @@ Channel functions.
void stp_channel_set_ink_limit ( stp_vars_t * stp_vars_t *  v,
-

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html index 7693064..1d86119 100644 --- a/doc/gutenprint/html/classes.html +++ b/doc/gutenprint/html/classes.html @@ -2,31 +2,16 @@ 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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html index 31f7f3b..9dd0774 100644 --- a/doc/gutenprint/html/color_8h.html +++ b/doc/gutenprint/html/color_8h.html @@ -2,25 +2,11 @@ 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
+include » gutenprint

color.h File Reference

Color functions. More...

@@ -31,44 +17,44 @@ - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - +
struct  stp_color

Typedefs

typedef stp_color stp_color_t
typedef stp_color stp_color_t

Functions

int stp_color_init (stp_vars_t *v, stp_image_t *image, size_t steps)
int stp_color_init (stp_vars_t *v, stp_image_t *image, size_t steps)
int stp_color_get_row (stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
int stp_color_get_row (stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
stp_parameter_list_t stp_color_list_parameters (const stp_vars_t *v)
stp_parameter_list_t stp_color_list_parameters (const stp_vars_t *v)
void stp_color_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
void stp_color_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
int stp_color_register (const stp_color_t *color)
int stp_color_register (const stp_color_t *color)
int stp_color_unregister (const stp_color_t *color)
int stp_color_unregister (const stp_color_t *color)
int stp_color_count (void)
int stp_color_count (void)
 Get the number of available color modules.
const stp_color_t * stp_get_color_by_name (const char *name)
 Get the number of available color modules.
const stp_color_t * stp_get_color_by_name (const char *name)
 Get a color module by its name.
const stp_color_t * stp_get_color_by_index (int idx)
 Get a color module by its name.
const stp_color_t * stp_get_color_by_index (int idx)
 Get a color module by its index number.
const stp_color_t * stp_get_color_by_colorfuncs (stp_colorfuncs_t *colorfuncs)
 Get a color module by its index number.
const stp_color_t * stp_get_color_by_colorfuncs (stp_colorfuncs_t *colorfuncs)
const char * stp_color_get_name (const stp_color_t *c)
const char * stp_color_get_name (const stp_color_t *c)
 Get the short (untranslated) name of a color module.
const char * stp_color_get_long_name (const stp_color_t *c)
 Get the short (untranslated) name of a color module.
const char * stp_color_get_long_name (const stp_color_t *c)
 Get the long (translated) name of a color module.
 Get the long (translated) name of a color module.

Detailed Description

Color functions.

-

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html index 398c681..7951a7f 100644 --- a/doc/gutenprint/html/curve-cache_8h.html +++ b/doc/gutenprint/html/curve-cache_8h.html @@ -2,25 +2,11 @@ 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
+include » gutenprint

curve-cache.h File Reference

Curve caching functions. More...

#include <gutenprint/curve.h>
@@ -30,39 +16,39 @@

struct  stp_cached_curve_t

Defines

#define CURVE_CACHE_FAST_USHORT(cache)   ((cache)->s_cache)
#define CURVE_CACHE_FAST_USHORT(cache)   ((cache)->s_cache)
#define CURVE_CACHE_FAST_DOUBLE(cache)   ((cache)->d_cache)
#define CURVE_CACHE_FAST_DOUBLE(cache)   ((cache)->d_cache)
#define CURVE_CACHE_FAST_COUNT(cache)   ((cache)->count)
#define CURVE_CACHE_FAST_COUNT(cache)   ((cache)->count)

Functions

void stp_curve_free_curve_cache (stp_cached_curve_t *cache)
void stp_curve_free_curve_cache (stp_cached_curve_t *cache)
void stp_curve_cache_curve_data (stp_cached_curve_t *cache)
void stp_curve_cache_curve_data (stp_cached_curve_t *cache)
stp_curve_t * stp_curve_cache_get_curve (stp_cached_curve_t *cache)
stp_curve_t * stp_curve_cache_get_curve (stp_cached_curve_t *cache)
void stp_curve_cache_curve_invalidate (stp_cached_curve_t *cache)
void stp_curve_cache_curve_invalidate (stp_cached_curve_t *cache)
void stp_curve_cache_set_curve (stp_cached_curve_t *cache, stp_curve_t *curve)
void stp_curve_cache_set_curve (stp_cached_curve_t *cache, stp_curve_t *curve)
void stp_curve_cache_set_curve_copy (stp_cached_curve_t *cache, const stp_curve_t *curve)
void stp_curve_cache_set_curve_copy (stp_cached_curve_t *cache, const stp_curve_t *curve)
size_t stp_curve_cache_get_count (stp_cached_curve_t *cache)
size_t stp_curve_cache_get_count (stp_cached_curve_t *cache)
const unsigned short * stp_curve_cache_get_ushort_data (stp_cached_curve_t *cache)
const unsigned short * stp_curve_cache_get_ushort_data (stp_cached_curve_t *cache)
const double * stp_curve_cache_get_double_data (stp_cached_curve_t *cache)
const double * stp_curve_cache_get_double_data (stp_cached_curve_t *cache)
void stp_curve_cache_copy (stp_cached_curve_t *dest, const stp_cached_curve_t *src)
void stp_curve_cache_copy (stp_cached_curve_t *dest, const stp_cached_curve_t *src)

Detailed Description

Curve caching functions.

Define Documentation

-

+

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

+

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

+

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

Function Documentation

-

+

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

+

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

+

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

+

@@ -268,13 +254,13 @@ Curve caching functions.
-

+

- + - + - - - + - - + - - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
- + @@ -296,7 +282,7 @@ Curve caching functions.
stp_curve_t* stp_curve_cache_get_curve stp_curve_t* stp_curve_cache_get_curve (  stp_cached_curve_t *  cache
-

+

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

+

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

+

- + @@ -389,7 +375,7 @@ Curve caching functions.
@@ -366,7 +352,7 @@ Curve caching functions.
stp_curve_t * stp_curve_t *  curve
-

+

- + @@ -426,7 +412,7 @@ Curve caching functions.
@@ -403,7 +389,7 @@ Curve caching functions.
const stp_curve_t * const stp_curve_t *  curve
-

+

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

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html index fa3d9b5..76c8ff7 100644 --- a/doc/gutenprint/html/curve_8h.html +++ b/doc/gutenprint/html/curve_8h.html @@ -2,25 +2,11 @@ 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
+include » gutenprint

curve.h File Reference

Curve functions. More...

#include <stdio.h>
@@ -33,175 +19,175 @@

 Point (x,y) for piecewise curve. More...

Typedefs

typedef stp_curve stp_curve_t
typedef stp_curve stp_curve_t
 The curve opaque data type.
 The curve opaque data type.

Enumerations

enum  stp_curve_type_t { STP_CURVE_TYPE_LINEAR, -STP_CURVE_TYPE_SPLINE +
enum  stp_curve_type_t { STP_CURVE_TYPE_LINEAR, +STP_CURVE_TYPE_SPLINE }
 Curve types. More...
enum  stp_curve_wrap_mode_t { STP_CURVE_WRAP_NONE, -STP_CURVE_WRAP_AROUND +
 Curve types. More...
enum  stp_curve_wrap_mode_t { STP_CURVE_WRAP_NONE, +STP_CURVE_WRAP_AROUND }
 Wrapping mode. More...
enum  stp_curve_compose_t { STP_CURVE_COMPOSE_ADD, -STP_CURVE_COMPOSE_MULTIPLY, -STP_CURVE_COMPOSE_EXPONENTIATE +
 Wrapping mode. More...
enum  stp_curve_compose_t { STP_CURVE_COMPOSE_ADD, +STP_CURVE_COMPOSE_MULTIPLY, +STP_CURVE_COMPOSE_EXPONENTIATE }
 Composition types. More...
enum  stp_curve_bounds_t { STP_CURVE_BOUNDS_RESCALE, -STP_CURVE_BOUNDS_CLIP, -STP_CURVE_BOUNDS_ERROR +
 Composition types. More...
enum  stp_curve_bounds_t { STP_CURVE_BOUNDS_RESCALE, +STP_CURVE_BOUNDS_CLIP, +STP_CURVE_BOUNDS_ERROR }
 Behaviour when curve exceeds bounds. More...
 Behaviour when curve exceeds bounds. More...

Functions

stp_curve_t * stp_curve_create (stp_curve_wrap_mode_t wrap)
stp_curve_t * stp_curve_create (stp_curve_wrap_mode_t wrap)
 Create a new curve.
stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve)
 Create a new curve.
stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve)
 Copy and allocate an curve.
void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source)
 Copy and allocate an curve.
void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source)
 Copy an curve.
void stp_curve_destroy (stp_curve_t *curve)
 Copy an curve.
void stp_curve_destroy (stp_curve_t *curve)
 Destroy an curve.
int stp_curve_set_bounds (stp_curve_t *curve, double low, double high)
 Destroy an curve.
int stp_curve_set_bounds (stp_curve_t *curve, double low, double high)
 Set the lower and upper bounds on a curve.
void stp_curve_get_bounds (const stp_curve_t *curve, double *low, double *high)
 Set the lower and upper bounds on a curve.
void stp_curve_get_bounds (const stp_curve_t *curve, double *low, double *high)
 Get the lower and upper bounds on a curve.
stp_curve_wrap_mode_t stp_curve_get_wrap (const stp_curve_t *curve)
 Get the lower and upper bounds on a curve.
stp_curve_wrap_mode_t stp_curve_get_wrap (const stp_curve_t *curve)
 Get the wrapping mode.
int stp_curve_is_piecewise (const stp_curve_t *curve)
 Get the wrapping mode.
int stp_curve_is_piecewise (const stp_curve_t *curve)
 Determine whether the curve is piecewise.
void stp_curve_get_range (const stp_curve_t *curve, double *low, double *high)
 Determine whether the curve is piecewise.
void stp_curve_get_range (const stp_curve_t *curve, double *low, double *high)
size_t stp_curve_count_points (const stp_curve_t *curve)
size_t stp_curve_count_points (const stp_curve_t *curve)
 Get the number of allocated points in the curve.
int stp_curve_set_interpolation_type (stp_curve_t *curve, stp_curve_type_t itype)
 Get the number of allocated points in the curve.
int stp_curve_set_interpolation_type (stp_curve_t *curve, stp_curve_type_t itype)
 Set the curve interpolation type.
stp_curve_type_t stp_curve_get_interpolation_type (const stp_curve_t *curve)
 Set the curve interpolation type.
stp_curve_type_t stp_curve_get_interpolation_type (const stp_curve_t *curve)
 Get the curve interpolation type.
int stp_curve_set_data (stp_curve_t *curve, size_t count, const double *data)
 Get the curve interpolation type.
int stp_curve_set_data (stp_curve_t *curve, size_t count, const double *data)
 Set all data points of the curve.
int stp_curve_set_data_points (stp_curve_t *curve, size_t count, const stp_curve_point_t *data)
 Set all data points of the curve.
int stp_curve_set_data_points (stp_curve_t *curve, size_t count, const stp_curve_point_t *data)
 Set all data points of the curve.
int stp_curve_set_float_data (stp_curve_t *curve, size_t count, const float *data)
 Set all data points of the curve.
int stp_curve_set_float_data (stp_curve_t *curve, size_t count, const float *data)
 Set the data points in a curve from float values.
int stp_curve_set_long_data (stp_curve_t *curve, size_t count, const long *data)
 Set the data points in a curve from float values.
int stp_curve_set_long_data (stp_curve_t *curve, size_t count, const long *data)
 Set the data points in a curve from long values.
int stp_curve_set_ulong_data (stp_curve_t *curve, size_t count, const unsigned long *data)
 Set the data points in a curve from long values.
int stp_curve_set_ulong_data (stp_curve_t *curve, size_t count, const unsigned long *data)
 Set the data points in a curve from unsigned long values.
int stp_curve_set_int_data (stp_curve_t *curve, size_t count, const int *data)
 Set the data points in a curve from unsigned long values.
int stp_curve_set_int_data (stp_curve_t *curve, size_t count, const int *data)
 Set the data points in a curve from integer values.
int stp_curve_set_uint_data (stp_curve_t *curve, size_t count, const unsigned int *data)
 Set the data points in a curve from integer values.
int stp_curve_set_uint_data (stp_curve_t *curve, size_t count, const unsigned int *data)
 Set the data points in a curve from unsigned integer values.
int stp_curve_set_short_data (stp_curve_t *curve, size_t count, const short *data)
 Set the data points in a curve from unsigned integer values.
int stp_curve_set_short_data (stp_curve_t *curve, size_t count, const short *data)
 Set the data points in a curve from short values.
int stp_curve_set_ushort_data (stp_curve_t *curve, size_t count, const unsigned short *data)
 Set the data points in a curve from short values.
int stp_curve_set_ushort_data (stp_curve_t *curve, size_t count, const unsigned short *data)
 Set the data points in a curve from unsigned short values.
stp_curve_t * stp_curve_get_subrange (const stp_curve_t *curve, size_t start, size_t count)
 Set the data points in a curve from unsigned short values.
stp_curve_t * stp_curve_get_subrange (const stp_curve_t *curve, size_t start, size_t count)
 Get a curve containing a subrange of data.
int stp_curve_set_subrange (stp_curve_t *curve, const stp_curve_t *range, size_t start)
 Get a curve containing a subrange of data.
int stp_curve_set_subrange (stp_curve_t *curve, const stp_curve_t *range, size_t start)
const double * stp_curve_get_data (const stp_curve_t *curve, size_t *count)
const double * stp_curve_get_data (const stp_curve_t *curve, size_t *count)
 Get a pointer to the curve's raw data.
const stp_curve_point_t * stp_curve_get_data_points (const stp_curve_t *curve, size_t *count)
 Get a pointer to the curve's raw data.
const stp_curve_point_t * stp_curve_get_data_points (const stp_curve_t *curve, size_t *count)
 Get a pointer to the curve's raw data as points.
const float * stp_curve_get_float_data (const stp_curve_t *curve, size_t *count)
 Get a pointer to the curve's raw data as points.
const float * stp_curve_get_float_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as floats.
const long * stp_curve_get_long_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as floats.
const long * stp_curve_get_long_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as longs.
const unsigned long * stp_curve_get_ulong_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as longs.
const unsigned long * stp_curve_get_ulong_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as unsigned longs.
const int * stp_curve_get_int_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as unsigned longs.
const int * stp_curve_get_int_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as integers.
const unsigned int * stp_curve_get_uint_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as integers.
const unsigned int * stp_curve_get_uint_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as unsigned integers.
const short * stp_curve_get_short_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as unsigned integers.
const short * stp_curve_get_short_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as shorts.
const unsigned short * stp_curve_get_ushort_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as shorts.
const unsigned short * stp_curve_get_ushort_data (const stp_curve_t *curve, size_t *count)
 Get pointer to the curve's raw data as unsigned shorts.
const stp_sequence_t * stp_curve_get_sequence (const stp_curve_t *curve)
 Get pointer to the curve's raw data as unsigned shorts.
const stp_sequence_t * stp_curve_get_sequence (const stp_curve_t *curve)
 Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.
int stp_curve_set_gamma (stp_curve_t *curve, double f_gamma)
 Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.
int stp_curve_set_gamma (stp_curve_t *curve, double f_gamma)
 Set the gamma of a curve.
double stp_curve_get_gamma (const stp_curve_t *curve)
 Set the gamma of a curve.
double stp_curve_get_gamma (const stp_curve_t *curve)
 Get the gamma value of the curve.
int stp_curve_set_point (stp_curve_t *curve, size_t where, double data)
 Get the gamma value of the curve.
int stp_curve_set_point (stp_curve_t *curve, size_t where, double data)
 Set a point along the curve.
int stp_curve_get_point (const stp_curve_t *curve, size_t where, double *data)
 Set a point along the curve.
int stp_curve_get_point (const stp_curve_t *curve, size_t where, double *data)
 Get a point along the curve.
int stp_curve_interpolate_value (const stp_curve_t *curve, double where, double *result)
 Get a point along the curve.
int stp_curve_interpolate_value (const stp_curve_t *curve, double where, double *result)
 Interpolate a point along the curve.
int stp_curve_resample (stp_curve_t *curve, size_t points)
 Interpolate a point along the curve.
int stp_curve_resample (stp_curve_t *curve, size_t points)
 Resample a curve (change the number of points).
int stp_curve_rescale (stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)
 Resample a curve (change the number of points).
int stp_curve_rescale (stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)
 Rescale a curve (multiply all points by a scaling constant).
int stp_curve_write (FILE *file, const stp_curve_t *curve)
 Rescale a curve (multiply all points by a scaling constant).
int stp_curve_write (FILE *file, const stp_curve_t *curve)
 Write a curve to a file.
char * stp_curve_write_string (const stp_curve_t *curve)
 Write a curve to a file.
char * stp_curve_write_string (const stp_curve_t *curve)
 Write a curve to a string.
stp_curve_t * stp_curve_create_from_stream (FILE *fp)
 Write a curve to a string.
stp_curve_t * stp_curve_create_from_stream (FILE *fp)
 Create a curve from a stream.
stp_curve_t * stp_curve_create_from_file (const char *file)
 Create a curve from a stream.
stp_curve_t * stp_curve_create_from_file (const char *file)
 Create a curve from a stream.
stp_curve_t * stp_curve_create_from_string (const char *string)
 Create a curve from a stream.
stp_curve_t * stp_curve_create_from_string (const char *string)
 Create a curve from a string.
int stp_curve_compose (stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)
 Create a curve from a string.
int stp_curve_compose (stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)
 Compose two curves, creating a third curve.
 Compose two curves, creating a third curve.

Detailed Description

Curve functions.

-

Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html index 66b9d67..04fdb80 100644 --- a/doc/gutenprint/html/deprecated.html +++ b/doc/gutenprint/html/deprecated.html @@ -2,41 +2,20 @@ 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
-
There should never be any need to use this function.
Parameters:
- - -
driver the printer model's short (driver) name.
-
-
Returns:
the index number, or -1 on failure.
-
+
Global stp_get_printer_index_by_driver
+
There should never be any need to use this function.

-
Global stp_merge_printvars
-
This is likely to go away.
Parameters:
- - - -
user the destination vars.
print the vars to merge into user.
-
-
+
Global stp_merge_printvars
+
This is likely to go away.
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html new file mode 100644 index 0000000..be119bc --- /dev/null +++ b/doc/gutenprint/html/dir_000000.html @@ -0,0 +1,20 @@ + + +libgutenprint API Reference: include/ Directory Reference + + + +
Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
+
+include
+

include Directory Reference

+ + + + +

Directories

directory  gutenprint
+
Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  + +doxygen 1.4.4
+ + diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir_000001.html new file mode 100644 index 0000000..300dc2f --- /dev/null +++ b/doc/gutenprint/html/dir_000001.html @@ -0,0 +1,143 @@ + + +libgutenprint API Reference: include/gutenprint/ Directory Reference + + + +
Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
+
+include » gutenprint
+

gutenprint Directory Reference

+ + + + + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+

+ + + +

+


Files

file  array.h
 Array functions.
file  bit-ops.h
 Bit operations.
file  channel.h
 Channel functions.
file  color.h
 Color functions.
file  curve-cache.h
 Curve caching functions.
file  curve.h
 Curve functions.
file  dither.h
 Dither functions.
file  gutenprint-intl-internal.h
 Internationalisation functions.
file  gutenprint-intl.h
 Internationalisation functions.
file  gutenprint-module.h
 Gutenprint module header.
file  gutenprint-version.h
 Version functions.
file  gutenprint.h
 Gutenprint master header.
file  image.h
 Image functions.
file  list.h
 Generic list functions.
file  module.h
 Module functions.
file  mxml.h
 Mini-XML XML parsing functions.
file  paper.h
 Paper size functions.
file  path.h
 Simple directory path functions.
file  printers.h
 Printer functions.
file  sequence.h
 Sequence functions.
file  string-list.h
 String list functions.
file  util.h
 Utility functions.
file  vars.h
 Print job functions.
file  weave.h
 Softweave functions.
file  xml.h
 XML tree functions.
+
Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  + +doxygen 1.4.4
+ + diff --git a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html deleted file mode 100644 index 922c642..0000000 --- a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html +++ /dev/null @@ -1,29 +0,0 @@ - - -libgutenprint API Reference: include/ Directory Reference - - - - -
-
-
-include
-

include Directory Reference

- - - - -

Directories

directory  gutenprint
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  - -doxygen 1.4.5
- - diff --git a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html deleted file mode 100644 index 94a415b..0000000 --- a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html +++ /dev/null @@ -1,152 +0,0 @@ - - -libgutenprint API Reference: include/gutenprint/ Directory Reference - - - - -
-
-
-include » gutenprint
-

gutenprint Directory Reference

- - - - - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-

- - - -

-


Files

file  array.h
 Array functions.
file  bit-ops.h
 Bit operations.
file  channel.h
 Channel functions.
file  color.h
 Color functions.
file  curve-cache.h
 Curve caching functions.
file  curve.h
 Curve functions.
file  dither.h
 Dither functions.
file  gutenprint-intl-internal.h
 Internationalisation functions.
file  gutenprint-intl.h
 Internationalisation functions.
file  gutenprint-module.h
 Gutenprint module header.
file  gutenprint-version.h
 Version functions.
file  gutenprint.h
 Gutenprint master header.
file  image.h
 Image functions.
file  list.h
 Generic list functions.
file  module.h
 Module functions.
file  mxml.h
 Mini-XML XML parsing functions.
file  paper.h
 Paper size functions.
file  path.h
 Simple directory path functions.
file  printers.h
 Printer functions.
file  sequence.h
 Sequence functions.
file  string-list.h
 String list functions.
file  util.h
 Utility functions.
file  vars.h
 Print job functions.
file  weave.h
 Softweave functions.
file  xml.h
 XML tree functions.
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  - -doxygen 1.4.5
- - diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html index f9a3cfd..74629ea 100644 --- a/doc/gutenprint/html/dirs.html +++ b/doc/gutenprint/html/dirs.html @@ -2,26 +2,17 @@ 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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html index 5c7dce3..626ae0f 100644 --- a/doc/gutenprint/html/dither_8h.html +++ b/doc/gutenprint/html/dither_8h.html @@ -2,25 +2,11 @@ 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
+include » gutenprint

dither.h File Reference

Dither functions. More...

@@ -39,98 +25,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
struct  stp_shade

Defines

#define STP_ECOLOR_K   0
#define STP_ECOLOR_K   0
#define STP_ECOLOR_C   1
#define STP_ECOLOR_C   1
#define STP_ECOLOR_M   2
#define STP_ECOLOR_M   2
#define STP_ECOLOR_Y   3
#define STP_ECOLOR_Y   3
#define STP_NCOLORS   (4)
#define STP_NCOLORS   (4)

Typedefs

typedef stp_dither_matrix_short stp_dither_matrix_short_t
typedef stp_dither_matrix_short stp_dither_matrix_short_t
typedef stp_dither_matrix_normal stp_dither_matrix_normal_t
typedef stp_dither_matrix_normal stp_dither_matrix_normal_t
typedef stp_dither_matrix_generic stp_dither_matrix_generic_t
typedef stp_dither_matrix_generic stp_dither_matrix_generic_t
typedef dither_matrix_impl stp_dither_matrix_impl_t
typedef dither_matrix_impl stp_dither_matrix_impl_t
typedef stp_dotsize stp_dotsize_t
typedef stp_dotsize stp_dotsize_t
typedef stp_shade stp_shade_t
typedef stp_shade stp_shade_t

Functions

void stp_dither_matrix_iterated_init (stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)
void stp_dither_matrix_iterated_init (stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)
void stp_dither_matrix_shear (stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)
void stp_dither_matrix_shear (stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)
void stp_dither_matrix_init (stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)
void stp_dither_matrix_init (stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)
void stp_dither_matrix_init_short (stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)
void stp_dither_matrix_init_short (stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)
int stp_dither_matrix_validate_array (const stp_array_t *array)
int stp_dither_matrix_validate_array (const stp_array_t *array)
void stp_dither_matrix_init_from_dither_array (stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)
void stp_dither_matrix_init_from_dither_array (stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)
void stp_dither_matrix_destroy (stp_dither_matrix_impl_t *mat)
void stp_dither_matrix_destroy (stp_dither_matrix_impl_t *mat)
void stp_dither_matrix_clone (const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)
void stp_dither_matrix_clone (const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)
void stp_dither_matrix_copy (const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)
void stp_dither_matrix_copy (const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)
void stp_dither_matrix_scale_exponentially (stp_dither_matrix_impl_t *mat, double exponent)
void stp_dither_matrix_scale_exponentially (stp_dither_matrix_impl_t *mat, double exponent)
void stp_dither_matrix_set_row (stp_dither_matrix_impl_t *mat, int y)
void stp_dither_matrix_set_row (stp_dither_matrix_impl_t *mat, int y)
stp_array_t * stp_find_standard_dither_array (int x_aspect, int y_aspect)
stp_array_t * stp_find_standard_dither_array (int x_aspect, int y_aspect)
stp_parameter_list_t stp_dither_list_parameters (const stp_vars_t *v)
stp_parameter_list_t stp_dither_list_parameters (const stp_vars_t *v)
void stp_dither_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
void stp_dither_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
void stp_dither_init (stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)
void stp_dither_init (stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)
void stp_dither_set_iterated_matrix (stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)
void stp_dither_set_iterated_matrix (stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)
void stp_dither_set_matrix (stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)
void stp_dither_set_matrix (stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)
void stp_dither_set_matrix_from_dither_array (stp_vars_t *v, const stp_array_t *array, int transpose)
void stp_dither_set_matrix_from_dither_array (stp_vars_t *v, const stp_array_t *array, int transpose)
void stp_dither_set_transition (stp_vars_t *v, double)
void stp_dither_set_transition (stp_vars_t *v, double)
void stp_dither_set_randomizer (stp_vars_t *v, int color, double)
void stp_dither_set_randomizer (stp_vars_t *v, int color, double)
void stp_dither_set_ink_spread (stp_vars_t *v, int spread)
void stp_dither_set_ink_spread (stp_vars_t *v, int spread)
void stp_dither_set_adaptive_limit (stp_vars_t *v, double limit)
void stp_dither_set_adaptive_limit (stp_vars_t *v, double limit)
int stp_dither_get_first_position (stp_vars_t *v, int color, int subchan)
int stp_dither_get_first_position (stp_vars_t *v, int color, int subchan)
int stp_dither_get_last_position (stp_vars_t *v, int color, int subchan)
int stp_dither_get_last_position (stp_vars_t *v, int color, int subchan)
void stp_dither_set_inks_simple (stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)
void stp_dither_set_inks_simple (stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)
void stp_dither_set_inks_full (stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)
void stp_dither_set_inks_full (stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)
void stp_dither_set_inks (stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)
void stp_dither_set_inks (stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)
void stp_dither_add_channel (stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)
void stp_dither_add_channel (stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)
unsigned char * stp_dither_get_channel (stp_vars_t *v, unsigned channel, unsigned subchannel)
unsigned char * stp_dither_get_channel (stp_vars_t *v, unsigned channel, unsigned subchannel)
void stp_dither (stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)
void stp_dither (stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)
void stp_dither_internal (stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)
void stp_dither_internal (stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)

Detailed Description

Dither functions.

Define Documentation

-

+

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

+

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

+

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

+

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

+

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

Typedef Documentation

-

+

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

+

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

+

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

+

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

+

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

+

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

Function Documentation

-

+

- + @@ -440,7 +426,7 @@ Dither functions.
@@ -393,7 +379,7 @@ Dither functions.
void stp_dither ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -489,7 +475,7 @@ Dither functions.
@@ -448,7 +434,7 @@ Dither functions.
void stp_dither_add_channel ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -532,7 +518,7 @@ Dither functions.
@@ -497,7 +483,7 @@ Dither functions.
void stp_dither_describe_parameter ( const stp_vars_t * const stp_vars_t *  v,
-

+

- + @@ -575,7 +561,7 @@ Dither functions.
@@ -540,7 +526,7 @@ Dither functions.
unsigned char* stp_dither_get_channel ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -618,7 +604,7 @@ Dither functions.
@@ -583,7 +569,7 @@ Dither functions.
int stp_dither_get_first_position ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -661,7 +647,7 @@ Dither functions.
@@ -626,7 +612,7 @@ Dither functions.
int stp_dither_get_last_position ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -716,7 +702,7 @@ Dither functions.
@@ -669,7 +655,7 @@ Dither functions.
void stp_dither_init ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -777,15 +763,15 @@ Dither functions.
@@ -724,7 +710,7 @@ Dither functions.
void stp_dither_internal ( stp_vars_t * stp_vars_t *  v,
-

+

- + - + @@ -805,7 +791,7 @@ Dither functions.
stp_parameter_list_t stp_dither_list_parameters stp_parameter_list_t stp_dither_list_parameters ( const stp_vars_t * const stp_vars_t *  v  ) 
-

+

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

+

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

+

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

+

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

+

- + @@ -1023,7 +1009,7 @@ Dither functions.
@@ -994,7 +980,7 @@ Dither functions.
const stp_array_t * const stp_array_t *  array,
-

+

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

+

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

+

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

+

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

+

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

+

- + @@ -1278,7 +1264,7 @@ Dither functions.
@@ -1258,7 +1244,7 @@ Dither functions.
int stp_dither_matrix_validate_array ( const stp_array_t * const stp_array_t *  array  ) 
-

+

- + @@ -1315,7 +1301,7 @@ Dither functions.
@@ -1286,7 +1272,7 @@ Dither functions.
void stp_dither_set_adaptive_limit ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1352,7 +1338,7 @@ Dither functions.
@@ -1323,7 +1309,7 @@ Dither functions.
void stp_dither_set_ink_spread ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1425,7 +1411,7 @@ Dither functions.
@@ -1360,7 +1346,7 @@ Dither functions.
void stp_dither_set_inks ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1486,7 +1472,7 @@ Dither functions.
@@ -1433,7 +1419,7 @@ Dither functions.
void stp_dither_set_inks_full ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1547,7 +1533,7 @@ Dither functions.
@@ -1494,7 +1480,7 @@ Dither functions.
void stp_dither_set_inks_simple ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1614,7 +1600,7 @@ Dither functions.
@@ -1555,7 +1541,7 @@ Dither functions.
void stp_dither_set_iterated_matrix ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1669,7 +1655,7 @@ Dither functions.
@@ -1622,7 +1608,7 @@ Dither functions.
void stp_dither_set_matrix ( stp_vars_t * stp_vars_t *  v,
-

+

- + - + @@ -1712,7 +1698,7 @@ Dither functions.
@@ -1677,13 +1663,13 @@ Dither functions.
void stp_dither_set_matrix_from_dither_array ( stp_vars_t * stp_vars_t *  v,
const stp_array_t * const stp_array_t *  array,
-

+

- + @@ -1755,7 +1741,7 @@ Dither functions.
@@ -1720,7 +1706,7 @@ Dither functions.
void stp_dither_set_randomizer ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1792,13 +1778,13 @@ Dither functions.
@@ -1763,7 +1749,7 @@ Dither functions.
void stp_dither_set_transition ( stp_vars_t * stp_vars_t *  v,
-

+

- + @@ -1829,8 +1815,8 @@ Dither functions.
stp_array_t* stp_find_standard_dither_array stp_array_t* stp_find_standard_dither_array (  int  x_aspect,
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css index 05615b2..decae9e 100644 --- a/doc/gutenprint/html/doxygen.css +++ b/doc/gutenprint/html/doxygen.css @@ -17,8 +17,8 @@ H3 { CAPTION { font-weight: bold } DIV.qindex { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; padding: 2px; @@ -26,16 +26,16 @@ DIV.qindex { } DIV.nav { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; padding: 2px; line-height: 140%; } DIV.navtab { - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; margin-right: 15px; @@ -118,7 +118,7 @@ BODY { margin-left: 20px; } TD.indexkey { - background-color: #e8eef2; + background-color: #eeeeff; font-weight: bold; padding-right : 10px; padding-top : 2px; @@ -131,7 +131,7 @@ TD.indexkey { border: 1px solid #CCCCCC; } TD.indexvalue { - background-color: #e8eef2; + background-color: #eeeeff; font-style: italic; padding-right : 10px; padding-top : 2px; @@ -286,25 +286,24 @@ FORM.search { INPUT.search { font-size: 75%; color: #000080; font-weight: normal; - background-color: #e8eef2; + background-color: #eeeeff; } TD.tiny { font-size: 75%; } a { - color: #1A41A8; + color: #252E78; } a:visited { - color: #2A3798; + color: #3D2185; } .dirtab { padding: 4px; border-collapse: collapse; - border: 1px solid #84b0c7; + border: 1px solid #b0b0b0; } -TH.dirtab { background: #e8eef2; +TH.dirtab { background: #eeeeff; font-weight: bold; } HR { height: 1px; border: none; border-top: 1px solid black; } - diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html index fc0c57a..355f011 100644 --- a/doc/gutenprint/html/files.html +++ b/doc/gutenprint/html/files.html @@ -2,23 +2,9 @@ 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: @@ -46,8 +32,8 @@
include/gutenprint/array.hArray functions
include/gutenprint/bit-ops.hBit operations
include/gutenprint/weave.hSoftweave functions
include/gutenprint/xml.hXML tree functions
-
Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
+doxygen 1.4.4
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html index 8e045d2..6fd2d38 100644 --- a/doc/gutenprint/html/functions.html +++ b/doc/gutenprint/html/functions.html @@ -2,223 +2,176 @@ 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

Here is a list of all struct and union fields with links to the structures/unions they belong to:

- a -

+: stp_parameter_t
  • attrs +: stp_mxml_value_s

    - b -

    +: dither_matrix_impl
  • bit_pattern +: stp_dotsize
  • boolean +: stp_parameter_t
  • bottom +: stp_papersize_t
  • bounds +: stp_parameter_t
  • bytes +: stp_raw_t, stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short

    - c -

    +: stp_parameter_t
  • channel +: stp_parameter_t
  • child +: stp_mxml_node_s
  • class +: stp_module
  • colorfuncs +: stp_color
  • comment +: stp_papersize_t, stp_module
  • conclude +: stp_image
  • count +: stp_cached_curve_t
  • curve +: stp_parameter_t, stp_cached_curve_t

    - d -

    +: stp_cached_curve_t
  • data +: stp_raw_t, stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short
  • dbl +: stp_parameter_t
  • deflt +: stp_parameter_t
  • describe_output +: stp_printfuncs_t
  • describe_parameter +: stp_colorfuncs_t
  • describe_resolution +: stp_printfuncs_t
  • dimension +: stp_parameter_t
  • dot_sizes +: stp_shade

    - e -

    +: stp_mxml_value_u
  • end_job +: stp_printfuncs_t
  • end_pos +: stp_linebounds_t
  • exp +: dither_matrix_impl

    - f -

    +: dither_matrix_impl
  • fini +: stp_module

    - g -

    +: stp_image
  • get_row +: stp_image, stp_colorfuncs_t

    - h -

    +: stp_module
  • height +: stp_papersize_t, stp_image
  • help +: stp_parameter_t

    - i -

    +: dither_matrix_impl
  • imageable_area +: stp_printfuncs_t
  • index +: dither_matrix_impl
  • init +: stp_module, stp_image, stp_colorfuncs_t
  • integer +: stp_parameter_t, stp_mxml_value_u
  • is_active +: stp_parameter_t
  • is_mandatory +: stp_parameter_t

    - j -

    +: stp_weave_t

    - l -

    +: stp_mxml_node_s
  • last_x +: dither_matrix_impl
  • last_x_mod +: dither_matrix_impl
  • last_y +: dither_matrix_impl
  • last_y_mod +: dither_matrix_impl
  • left +: stp_papersize_t
  • limit +: stp_printfuncs_t
  • list_parameters +: stp_printfuncs_t, stp_colorfuncs_t
  • logicalpassstart +: stp_pass_t, stp_weave_t
  • long_name +: stp_color
  • lower +: stp_int_bound_t, stp_double_bound_t

    - m -

    +: stp_module_version
  • matrix +: dither_matrix_impl
  • media_size +: stp_printfuncs_t
  • minor +: stp_module_version
  • missingstartrows +: stp_pass_t, stp_weave_t

    - n -

    +: stp_parameter_t, stp_param_string_t, stp_papersize_t, stp_mxml_value_s, stp_mxml_attr_s, stp_module
  • ncolors +: stp_linebounds_t, stp_linebufs_t, stp_linecount_t, stp_lineactive_t, stp_lineoff_t
  • next +: stp_mxml_node_s
  • num_attrs +: stp_mxml_value_s
  • numsizes +: stp_shade

    - o -

    +: stp_mxml_value_u

    - p -

    +: stp_parameter_t
  • p_level +: stp_parameter_t
  • p_type +: stp_parameter_t
  • paper_unit +: stp_papersize_t
  • parameters +: stp_printfuncs_t
  • parent +: stp_mxml_node_s
  • pass +: stp_pass_t, stp_weave_t
  • physpassend +: stp_pass_t, stp_weave_t
  • physpassstart +: stp_pass_t, stp_weave_t
  • prescaled +: stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short
  • prev +: stp_mxml_node_s
  • print +: stp_printfuncs_t
  • printer_list +: stp_family
  • printfuncs +: stp_family

    - r -

    +: stp_parameter_t
  • real +: stp_mxml_value_u
  • rep +: stp_image
  • reset +: stp_image
  • right +: stp_papersize_t
  • row +: stp_weave_t

    - s -

    +: stp_cached_curve_t
  • short_name +: stp_color
  • start_job +: stp_printfuncs_t
  • start_pos +: stp_linebounds_t
  • str +: stp_parameter_t
  • string +: stp_mxml_text_s
  • subpass +: stp_pass_t
  • syms +: stp_module

    - t -

    +: stp_parameter_t, stp_param_string_t, stp_papersize_t, stp_mxml_value_u
  • top +: stp_papersize_t
  • total_size +: dither_matrix_impl
  • type +: stp_mxml_node_s

    - u -

    +: stp_int_bound_t, stp_double_bound_t

    - v -

    +: stp_linebufs_t, stp_linecount_t, stp_lineactive_t, stp_lineoff_t
  • value +: stp_mxml_node_s, stp_mxml_attr_s, stp_shade, stp_dotsize
  • verify +: stp_printfuncs_t
  • verify_this_parameter +: stp_parameter_t
  • version +: stp_module

    - w -

    +: stp_mxml_text_s
  • width +: stp_papersize_t, stp_image

    - x -

    +: stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short, stp_curve_point_t
  • x_offset +: dither_matrix_impl
  • x_size +: dither_matrix_impl

    - y -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: 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 Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/functions_type.html b/doc/gutenprint/html/functions_type.html deleted file mode 100644 index 0a2ebb1..0000000 --- a/doc/gutenprint/html/functions_type.html +++ /dev/null @@ -1,54 +0,0 @@ - - -libgutenprint API Reference: Data Fields - Typedefs - - - - -
    -
    -
    -
    -
    - -
    -  -

    -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  - -doxygen 1.4.5
    - - diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html index c1a81cb..1dd927f 100644 --- a/doc/gutenprint/html/functions_vars.html +++ b/doc/gutenprint/html/functions_vars.html @@ -2,208 +2,176 @@ 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

    -  +

    - a -

    +: stp_parameter_t
  • attrs +: stp_mxml_value_s

    - b -

    +: dither_matrix_impl
  • bit_pattern +: stp_dotsize
  • boolean +: stp_parameter_t
  • bottom +: stp_papersize_t
  • bounds +: stp_parameter_t
  • bytes +: stp_raw_t, stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short

    - c -

    +
  • category +: stp_parameter_t
  • channel +: stp_parameter_t
  • child +: stp_mxml_node_s
  • class +: stp_module
  • colorfuncs +: stp_color
  • comment +: stp_papersize_t, stp_module
  • conclude +: stp_image
  • count +: stp_cached_curve_t
  • curve +: stp_parameter_t, stp_cached_curve_t

    - d -

    +: stp_cached_curve_t
  • data +: stp_raw_t, stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short
  • dbl +: stp_parameter_t
  • deflt +: stp_parameter_t
  • describe_output +: stp_printfuncs_t
  • describe_parameter +: stp_colorfuncs_t
  • describe_resolution +: stp_printfuncs_t
  • dimension +: stp_parameter_t
  • dot_sizes +: stp_shade

    - e -

    +: stp_mxml_value_u
  • end_job +: stp_printfuncs_t
  • end_pos +: stp_linebounds_t
  • exp +: dither_matrix_impl

    - f -

    +: dither_matrix_impl
  • fini +: stp_module

    - g -

    +: stp_image
  • get_row +: stp_image, stp_colorfuncs_t

    - h -

    +: stp_module
  • height +: stp_papersize_t, stp_image
  • help +: stp_parameter_t

    - i -

    +: dither_matrix_impl
  • imageable_area +: stp_printfuncs_t
  • index +: dither_matrix_impl
  • init +: stp_module, stp_image, stp_colorfuncs_t
  • integer +: stp_parameter_t, stp_mxml_value_u
  • is_active +: stp_parameter_t
  • is_mandatory +: stp_parameter_t

    - j -

    +: stp_weave_t

    - l -

    +: stp_mxml_node_s
  • last_x +: dither_matrix_impl
  • last_x_mod +: dither_matrix_impl
  • last_y +: dither_matrix_impl
  • last_y_mod +: dither_matrix_impl
  • left +: stp_papersize_t
  • limit +: stp_printfuncs_t
  • list_parameters +: stp_printfuncs_t, stp_colorfuncs_t
  • logicalpassstart +: stp_pass_t, stp_weave_t
  • long_name +: stp_color
  • lower +: stp_int_bound_t, stp_double_bound_t

    - m -

    +: stp_module_version
  • matrix +: dither_matrix_impl
  • media_size +: stp_printfuncs_t
  • minor +: stp_module_version
  • missingstartrows +: stp_pass_t, stp_weave_t

    - n -

    +: stp_parameter_t, stp_param_string_t, stp_papersize_t, stp_mxml_value_s, stp_mxml_attr_s, stp_module
  • ncolors +: stp_linebounds_t, stp_linebufs_t, stp_linecount_t, stp_lineactive_t, stp_lineoff_t
  • next +: stp_mxml_node_s
  • num_attrs +: stp_mxml_value_s
  • numsizes +: stp_shade

    - o -

    +: stp_mxml_value_u

    - p -

    +
  • p_class +: stp_parameter_t
  • p_level +: stp_parameter_t
  • p_type +: stp_parameter_t
  • paper_unit +: stp_papersize_t
  • parameters +: stp_printfuncs_t
  • parent +: stp_mxml_node_s
  • pass +: stp_pass_t, stp_weave_t
  • physpassend +: stp_pass_t, stp_weave_t
  • physpassstart +: stp_pass_t, stp_weave_t
  • prescaled +: stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short
  • prev +: stp_mxml_node_s
  • print +: stp_printfuncs_t
  • printer_list +: stp_family
  • printfuncs +: stp_family

    - r -

    +
  • read_only +: stp_parameter_t
  • real +: stp_mxml_value_u
  • rep +: stp_image
  • reset +: stp_image
  • right +: stp_papersize_t
  • row +: stp_weave_t

    - s -

    +: stp_cached_curve_t
  • short_name +: stp_color
  • start_job +: stp_printfuncs_t
  • start_pos +: stp_linebounds_t
  • str +: stp_parameter_t
  • string +: stp_mxml_text_s
  • subpass +: stp_pass_t
  • syms +: stp_module

    - t -

    +: stp_parameter_t, stp_param_string_t, stp_papersize_t, stp_mxml_value_u
  • top +: stp_papersize_t
  • total_size +: dither_matrix_impl
  • type +: stp_mxml_node_s +

    - u -

    - v -

    +: stp_linebufs_t, stp_linecount_t, stp_lineactive_t, stp_lineoff_t
  • value +: stp_mxml_node_s, stp_mxml_attr_s, stp_shade, stp_dotsize
  • verify +: stp_printfuncs_t
  • verify_this_parameter +: stp_parameter_t
  • version +: stp_module

    - w -

    +: stp_mxml_text_s
  • width +: stp_papersize_t, stp_image

    - x -

    +: stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short, stp_curve_point_t
  • x_offset +: dither_matrix_impl
  • x_size +: dither_matrix_impl

    - y -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: 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 Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html index 9e2911a..32d8b1b 100644 --- a/doc/gutenprint/html/globals.html +++ b/doc/gutenprint/html/globals.html @@ -2,56 +2,20 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - _ -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html index 2e4d7e4..0666089 100644 --- a/doc/gutenprint/html/globals_0x62.html +++ b/doc/gutenprint/html/globals_0x62.html @@ -2,56 +2,20 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - b -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html index 8e2633f..44deb8e 100644 --- a/doc/gutenprint/html/globals_0x63.html +++ b/doc/gutenprint/html/globals_0x63.html @@ -2,59 +2,23 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - c -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: vars.h
  • CURVE_CACHE_FAST_COUNT +: curve-cache.h
  • CURVE_CACHE_FAST_DOUBLE +: curve-cache.h
  • CURVE_CACHE_FAST_USHORT +: curve-cache.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html index 5dfedeb..8af98da 100644 --- a/doc/gutenprint/html/globals_0x64.html +++ b/doc/gutenprint/html/globals_0x64.html @@ -2,57 +2,21 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - d -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h
  • dgettext +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html index 2353e63..2f8dfbb 100644 --- a/doc/gutenprint/html/globals_0x67.html +++ b/doc/gutenprint/html/globals_0x67.html @@ -2,56 +2,20 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - g -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html index 041adba..4495526 100644 --- a/doc/gutenprint/html/globals_0x6e.html +++ b/doc/gutenprint/html/globals_0x6e.html @@ -2,56 +2,20 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - n -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html index 5e4d81b..80f4f6a 100644 --- a/doc/gutenprint/html/globals_0x70.html +++ b/doc/gutenprint/html/globals_0x70.html @@ -2,62 +2,26 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - p -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: paper.h
  • PAPERSIZE_ENGLISH_STANDARD +: paper.h
  • PAPERSIZE_METRIC_EXTENDED +: paper.h
  • PAPERSIZE_METRIC_STANDARD +: paper.h
  • PARAMETER_BAD +: vars.h
  • PARAMETER_INACTIVE +: vars.h
  • PARAMETER_OK +: vars.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html index 473ee69..b1d4327 100644 --- a/doc/gutenprint/html/globals_0x73.html +++ b/doc/gutenprint/html/globals_0x73.html @@ -2,681 +2,645 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - s -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: util.h
  • stp_allocate_component_data() +: vars.h
  • stp_array_copy() +: array.h
  • stp_array_create() +: array.h
  • stp_array_create_copy() +: array.h
  • stp_array_create_from_xmltree() +: xml.h
  • stp_array_destroy() +: array.h
  • stp_array_get_data() +: array.h
  • stp_array_get_point() +: array.h
  • stp_array_get_sequence() +: array.h
  • stp_array_get_size() +: array.h
  • stp_array_set_data() +: array.h
  • stp_array_set_point() +: array.h
  • stp_array_set_size() +: array.h
  • stp_array_t +: array.h
  • stp_asprintf() +: util.h
  • STP_BINARY_AGE +: gutenprint-version.h
  • stp_binary_age +: 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_curve() +: channel.h
  • stp_channel_get_cutoff_adjustment() +: channel.h
  • stp_channel_get_density_adjustment() +: 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_initialize() +: 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_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() +: vars.h
  • stp_check_boolean_parameter() +: vars.h
  • stp_check_curve_parameter() +: vars.h
  • stp_check_dimension_parameter() +: vars.h
  • stp_check_file_parameter() +: vars.h
  • stp_check_float_parameter() +: vars.h
  • stp_check_int_parameter() +: vars.h
  • stp_check_raw_parameter() +: vars.h
  • stp_check_string_parameter() +: vars.h
  • stp_check_version() +: gutenprint-version.h
  • STP_CHECK_VERSION +: gutenprint-version.h
  • stp_clear_array_parameter() +: vars.h
  • stp_clear_boolean_parameter() +: vars.h
  • stp_clear_curve_parameter() +: vars.h
  • stp_clear_dimension_parameter() +: vars.h
  • stp_clear_file_parameter() +: vars.h
  • stp_clear_float_parameter() +: vars.h
  • stp_clear_int_parameter() +: vars.h
  • stp_clear_raw_parameter() +: vars.h
  • stp_clear_string_parameter() +: vars.h
  • stp_color_count() +: color.h
  • stp_color_describe_parameter() +: color.h
  • stp_color_get_long_name() +: color.h
  • stp_color_get_name() +: color.h
  • stp_color_get_row() +: color.h
  • stp_color_init() +: color.h
  • stp_color_list_parameters() +: color.h
  • stp_color_register() +: color.h
  • stp_color_t +: color.h
  • stp_color_unregister() +: color.h
  • stp_compute_linewidth_func +: weave.h
  • stp_compute_tiff_linewidth +: weave.h
  • stp_compute_uncompressed_linewidth +: weave.h
  • stp_const_parameter_list_t +: vars.h
  • stp_copy_data_func_t +: vars.h
  • stp_copy_options() +: vars.h
  • STP_CURRENT_INTERFACE +: gutenprint-version.h
  • stp_current_interface +: gutenprint-version.h
  • STP_CURVE_BOUNDS_CLIP +: curve.h
  • STP_CURVE_BOUNDS_ERROR +: curve.h
  • STP_CURVE_BOUNDS_RESCALE +: curve.h
  • stp_curve_bounds_t +: curve.h
  • stp_curve_cache_copy() +: curve-cache.h
  • stp_curve_cache_curve_data() +: curve-cache.h
  • stp_curve_cache_curve_invalidate() +: curve-cache.h
  • stp_curve_cache_get_count() +: curve-cache.h
  • stp_curve_cache_get_curve() +: curve-cache.h
  • stp_curve_cache_get_double_data() +: curve-cache.h
  • stp_curve_cache_get_ushort_data() +: curve-cache.h
  • stp_curve_cache_set_curve() +: curve-cache.h
  • stp_curve_cache_set_curve_copy() +: curve-cache.h
  • stp_curve_compose() +: curve.h
  • STP_CURVE_COMPOSE_ADD +: curve.h
  • STP_CURVE_COMPOSE_EXPONENTIATE +: curve.h
  • STP_CURVE_COMPOSE_MULTIPLY +: curve.h
  • stp_curve_compose_t +: curve.h
  • stp_curve_copy() +: curve.h
  • stp_curve_count_points() +: curve.h
  • stp_curve_create() +: curve.h
  • stp_curve_create_copy() +: curve.h
  • stp_curve_create_from_file() +: curve.h
  • stp_curve_create_from_stream() +: curve.h
  • stp_curve_create_from_string() +: curve.h
  • stp_curve_create_from_xmltree() +: xml.h
  • stp_curve_destroy() +: curve.h
  • stp_curve_free_curve_cache() +: curve-cache.h
  • stp_curve_get_bounds() +: curve.h
  • stp_curve_get_data() +: curve.h
  • stp_curve_get_data_points() +: curve.h
  • stp_curve_get_float_data() +: curve.h
  • stp_curve_get_gamma() +: curve.h
  • stp_curve_get_int_data() +: curve.h
  • stp_curve_get_interpolation_type() +: curve.h
  • stp_curve_get_long_data() +: curve.h
  • stp_curve_get_point() +: curve.h
  • stp_curve_get_range() +: curve.h
  • stp_curve_get_sequence() +: curve.h
  • stp_curve_get_short_data() +: curve.h
  • stp_curve_get_subrange() +: curve.h
  • stp_curve_get_uint_data() +: curve.h
  • stp_curve_get_ulong_data() +: curve.h
  • stp_curve_get_ushort_data() +: curve.h
  • stp_curve_get_wrap() +: curve.h
  • stp_curve_interpolate_value() +: curve.h
  • stp_curve_is_piecewise() +: curve.h
  • stp_curve_resample() +: curve.h
  • stp_curve_rescale() +: curve.h
  • stp_curve_set_bounds() +: curve.h
  • stp_curve_set_data() +: curve.h
  • stp_curve_set_data_points() +: curve.h
  • stp_curve_set_float_data() +: curve.h
  • stp_curve_set_gamma() +: curve.h
  • stp_curve_set_int_data() +: curve.h
  • stp_curve_set_interpolation_type() +: curve.h
  • stp_curve_set_long_data() +: curve.h
  • stp_curve_set_point() +: curve.h
  • stp_curve_set_short_data() +: curve.h
  • stp_curve_set_subrange() +: curve.h
  • stp_curve_set_uint_data() +: curve.h
  • stp_curve_set_ulong_data() +: curve.h
  • stp_curve_set_ushort_data() +: curve.h
  • stp_curve_t +: curve.h
  • STP_CURVE_TYPE_LINEAR +: curve.h
  • STP_CURVE_TYPE_SPLINE +: curve.h
  • stp_curve_type_t +: curve.h
  • STP_CURVE_WRAP_AROUND +: curve.h
  • stp_curve_wrap_mode_t +: curve.h
  • STP_CURVE_WRAP_NONE +: curve.h
  • stp_curve_write() +: curve.h
  • stp_curve_write_string() +: curve.h
  • STP_DBG_CANON +: util.h
  • STP_DBG_COLORFUNC +: util.h
  • STP_DBG_CURVE +: util.h
  • STP_DBG_CURVE_ERRORS +: util.h
  • STP_DBG_ESCP2 +: util.h
  • STP_DBG_INK +: util.h
  • STP_DBG_LEXMARK +: util.h
  • STP_DBG_LIST +: util.h
  • STP_DBG_LUT +: util.h
  • STP_DBG_MARK_FILE +: util.h
  • STP_DBG_MODULE +: util.h
  • STP_DBG_OLYMPUS +: util.h
  • STP_DBG_PAPER +: util.h
  • STP_DBG_PATH +: util.h
  • STP_DBG_PCL +: util.h
  • STP_DBG_PRINTERS +: util.h
  • STP_DBG_PS +: util.h
  • STP_DBG_ROWS +: util.h
  • STP_DBG_VARS +: util.h
  • STP_DBG_WEAVE_PARAMS +: util.h
  • STP_DBG_XML +: util.h
  • stp_default_media_size() +: paper.h
  • stp_default_settings() +: vars.h
  • stp_deprintf() +: util.h
  • stp_describe_output() +: printers.h
  • stp_describe_parameter() +: vars.h
  • stp_describe_resolution() +: vars.h
  • stp_destroy_component_data() +: vars.h
  • stp_dither() +: dither.h
  • stp_dither_add_channel() +: dither.h
  • stp_dither_describe_parameter() +: dither.h
  • stp_dither_get_channel() +: dither.h
  • stp_dither_get_first_position() +: dither.h
  • stp_dither_get_last_position() +: dither.h
  • stp_dither_init() +: dither.h
  • stp_dither_internal() +: dither.h
  • stp_dither_list_parameters() +: dither.h
  • stp_dither_matrix_clone() +: dither.h
  • stp_dither_matrix_copy() +: dither.h
  • stp_dither_matrix_destroy() +: dither.h
  • stp_dither_matrix_generic_t +: dither.h
  • stp_dither_matrix_impl_t +: dither.h
  • stp_dither_matrix_init() +: dither.h
  • stp_dither_matrix_init_from_dither_array() +: dither.h
  • stp_dither_matrix_init_short() +: dither.h
  • stp_dither_matrix_iterated_init() +: dither.h
  • stp_dither_matrix_normal_t +: dither.h
  • stp_dither_matrix_scale_exponentially() +: dither.h
  • stp_dither_matrix_set_row() +: dither.h
  • stp_dither_matrix_shear() +: dither.h
  • stp_dither_matrix_short_t +: dither.h
  • stp_dither_matrix_validate_array() +: dither.h
  • stp_dither_set_adaptive_limit() +: dither.h
  • stp_dither_set_ink_spread() +: dither.h
  • stp_dither_set_inks() +: dither.h
  • stp_dither_set_inks_full() +: dither.h
  • stp_dither_set_inks_simple() +: dither.h
  • stp_dither_set_iterated_matrix() +: dither.h
  • stp_dither_set_matrix() +: dither.h
  • stp_dither_set_matrix_from_dither_array() +: dither.h
  • stp_dither_set_randomizer() +: dither.h
  • stp_dither_set_transition() +: dither.h
  • stp_dotsize_t +: dither.h
  • stp_dprintf() +: util.h
  • STP_ECOLOR_C +: dither.h
  • STP_ECOLOR_K +: dither.h
  • STP_ECOLOR_M +: dither.h
  • STP_ECOLOR_Y +: dither.h
  • stp_end_job() +: printers.h
  • stp_eprintf() +: util.h
  • stp_erprintf() +: util.h
  • stp_erputc() +: util.h
  • stp_family_register() +: printers.h
  • stp_family_t +: printers.h
  • stp_family_unregister() +: printers.h
  • stp_fill_parameter_settings() +: vars.h
  • stp_fill_tiff +: weave.h
  • stp_fill_uncompressed +: weave.h
  • stp_fillfunc +: weave.h
  • stp_find_standard_dither_array() +: dither.h
  • stp_flush_all() +: weave.h
  • stp_flush_debug_messages() +: util.h
  • stp_flushfunc +: weave.h
  • stp_fold() +: bit-ops.h
  • stp_free() +: util.h
  • stp_free_data_func_t +: vars.h
  • stp_get_array_parameter() +: vars.h
  • stp_get_array_parameter_active() +: vars.h
  • stp_get_boolean_parameter() +: vars.h
  • stp_get_boolean_parameter_active() +: vars.h
  • stp_get_color_by_colorfuncs() +: color.h
  • stp_get_color_by_index() +: color.h
  • stp_get_color_by_name() +: color.h
  • stp_get_color_conversion() +: vars.h
  • stp_get_component_data() +: vars.h
  • stp_get_curve_parameter() +: vars.h
  • stp_get_curve_parameter_active() +: vars.h
  • stp_get_debug_level() +: util.h
  • stp_get_dimension_parameter() +: vars.h
  • stp_get_dimension_parameter_active() +: vars.h
  • stp_get_driver() +: vars.h
  • stp_get_errdata() +: vars.h
  • stp_get_errfunc() +: vars.h
  • stp_get_file_parameter() +: vars.h
  • stp_get_file_parameter_active() +: vars.h
  • stp_get_float_parameter() +: vars.h
  • stp_get_float_parameter_active() +: vars.h
  • stp_get_height() +: vars.h
  • stp_get_imageable_area() +: vars.h
  • stp_get_int_parameter() +: vars.h
  • stp_get_int_parameter_active() +: vars.h
  • stp_get_left() +: vars.h
  • stp_get_lineactive_by_pass() +: weave.h
  • stp_get_linebases_by_pass() +: weave.h
  • stp_get_linecount_by_pass() +: weave.h
  • stp_get_lineoffsets_by_pass() +: weave.h
  • stp_get_media_size() +: vars.h
  • stp_get_model_id() +: printers.h
  • stp_get_outdata() +: vars.h
  • stp_get_outfunc() +: vars.h
  • stp_get_page_height() +: vars.h
  • stp_get_page_width() +: vars.h
  • stp_get_papersize_by_index() +: paper.h
  • stp_get_papersize_by_name() +: paper.h
  • stp_get_papersize_by_size() +: paper.h
  • stp_get_parameter_list() +: vars.h
  • stp_get_pass_by_pass() +: weave.h
  • stp_get_printer() +: printers.h
  • stp_get_printer_by_driver() +: printers.h
  • stp_get_printer_by_index() +: printers.h
  • stp_get_printer_by_long_name() +: printers.h
  • stp_get_printer_index_by_driver() +: printers.h
  • stp_get_raw_parameter() +: vars.h
  • stp_get_raw_parameter_active() +: vars.h
  • stp_get_release_version() +: util.h
  • stp_get_size_limit() +: vars.h
  • stp_get_string_parameter() +: vars.h
  • stp_get_string_parameter_active() +: vars.h
  • stp_get_top() +: vars.h
  • stp_get_verified() +: vars.h
  • stp_get_version() +: util.h
  • stp_get_width() +: vars.h
  • stp_image_conclude() +: image.h
  • stp_image_get_appname() +: image.h
  • stp_image_get_row() +: image.h
  • stp_image_height() +: image.h
  • stp_image_init() +: image.h
  • stp_image_reset() +: image.h
  • STP_IMAGE_STATUS_ABORT +: image.h
  • STP_IMAGE_STATUS_OK +: image.h
  • stp_image_status_t +: image.h
  • stp_image_t +: image.h
  • stp_image_width() +: image.h
  • stp_init() +: util.h
  • stp_init_debug_messages() +: util.h
  • stp_initialize_printer_defaults() +: printers.h
  • stp_initialize_weave() +: weave.h
  • stp_interface_age +: gutenprint-version.h
  • STP_INTERFACE_AGE +: gutenprint-version.h
  • stp_known_papersizes() +: paper.h
  • stp_list_copy() +: list.h
  • stp_list_create() +: list.h
  • stp_list_destroy() +: list.h
  • stp_list_get_copyfunc() +: list.h
  • stp_list_get_end() +: list.h
  • stp_list_get_freefunc() +: list.h
  • stp_list_get_item_by_index() +: list.h
  • stp_list_get_item_by_long_name() +: list.h
  • stp_list_get_item_by_name() +: list.h
  • stp_list_get_length() +: list.h
  • stp_list_get_long_namefunc() +: list.h
  • stp_list_get_namefunc() +: list.h
  • stp_list_get_sortfunc() +: list.h
  • stp_list_get_start() +: list.h
  • stp_list_item_create() +: list.h
  • stp_list_item_destroy() +: list.h
  • stp_list_item_get_data() +: list.h
  • stp_list_item_next() +: list.h
  • stp_list_item_prev() +: list.h
  • stp_list_item_set_data() +: list.h
  • stp_list_item_t +: list.h
  • stp_list_node_free_data() +: list.h
  • stp_list_set_copyfunc() +: list.h
  • stp_list_set_freefunc() +: list.h
  • stp_list_set_long_namefunc() +: list.h
  • stp_list_set_namefunc() +: list.h
  • stp_list_set_sortfunc() +: list.h
  • stp_list_t +: list.h
  • STP_MAJOR_VERSION +: gutenprint-version.h
  • stp_major_version +: gutenprint-version.h
  • stp_malloc() +: util.h
  • STP_MAX_WEAVE +: 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-module.h
  • STP_MODULE_CLASS_COLOR +: module.h
  • STP_MODULE_CLASS_DITHER +: module.h
  • STP_MODULE_CLASS_FAMILY +: module.h
  • STP_MODULE_CLASS_INVALID +: module.h
  • STP_MODULE_CLASS_MISC +: module.h
  • stp_module_class_t +: module.h
  • stp_module_close() +: module.h
  • stp_module_exit() +: module.h
  • stp_module_get_class() +: module.h
  • stp_module_init() +: module.h
  • stp_module_load() +: module.h
  • stp_module_open() +: module.h
  • stp_module_t +: module.h
  • stp_module_version_t +: module.h
  • STP_MXML_ADD_AFTER +: mxml.h
  • STP_MXML_ADD_BEFORE +: mxml.h
  • STP_MXML_ADD_TO_PARENT +: mxml.h
  • stp_mxml_attr_t +: mxml.h
  • STP_MXML_DESCEND +: mxml.h
  • STP_MXML_DESCEND_FIRST +: mxml.h
  • STP_MXML_ELEMENT +: mxml.h
  • stp_mxml_element_t +: mxml.h
  • STP_MXML_INTEGER +: mxml.h
  • STP_MXML_NO_CALLBACK +: mxml.h
  • STP_MXML_NO_DESCEND +: mxml.h
  • STP_MXML_NO_PARENT +: mxml.h
  • stp_mxml_node_t +: mxml.h
  • STP_MXML_OPAQUE +: mxml.h
  • STP_MXML_REAL +: mxml.h
  • STP_MXML_TAB +: mxml.h
  • STP_MXML_TEXT +: mxml.h
  • stp_mxml_text_t +: mxml.h
  • stp_mxml_type_e +: mxml.h
  • stp_mxml_type_t +: mxml.h
  • stp_mxml_value_t +: mxml.h
  • STP_MXML_WRAP +: mxml.h
  • STP_MXML_WS_AFTER_CLOSE +: mxml.h
  • STP_MXML_WS_AFTER_OPEN +: mxml.h
  • STP_MXML_WS_BEFORE_CLOSE +: mxml.h
  • STP_MXML_WS_BEFORE_OPEN +: mxml.h
  • stp_mxmlAdd() +: mxml.h
  • stp_mxmlDelete() +: mxml.h
  • stp_mxmlElementGetAttr() +: mxml.h
  • stp_mxmlElementSetAttr() +: mxml.h
  • stp_mxmlFindElement() +: mxml.h
  • stp_mxmlLoadFile() +: mxml.h
  • stp_mxmlLoadString() +: mxml.h
  • stp_mxmlNewElement() +: mxml.h
  • stp_mxmlNewInteger() +: mxml.h
  • stp_mxmlNewOpaque() +: mxml.h
  • stp_mxmlNewReal() +: mxml.h
  • stp_mxmlNewText() +: mxml.h
  • stp_mxmlRemove() +: mxml.h
  • stp_mxmlSaveAllocString() +: mxml.h
  • stp_mxmlSaveFile() +: mxml.h
  • stp_mxmlSaveString() +: mxml.h
  • stp_mxmlWalkNext() +: mxml.h
  • stp_mxmlWalkPrev() +: mxml.h
  • STP_NCOLORS +: dither.h
  • stp_node_copyfunc +: list.h
  • stp_node_freefunc +: list.h
  • stp_node_namefunc +: list.h
  • stp_node_sortfunc +: list.h
  • stp_outfunc_t +: vars.h
  • stp_pack_tiff +: weave.h
  • stp_pack_uncompressed +: weave.h
  • stp_packfunc +: weave.h
  • stp_papersize_unit_t +: paper.h
  • STP_PARAMETER_ACTIVE +: vars.h
  • stp_parameter_activity_t +: vars.h
  • STP_PARAMETER_CLASS_CORE +: vars.h
  • STP_PARAMETER_CLASS_FEATURE +: vars.h
  • STP_PARAMETER_CLASS_INVALID +: vars.h
  • STP_PARAMETER_CLASS_OUTPUT +: vars.h
  • stp_parameter_class_t +: vars.h
  • STP_PARAMETER_DEFAULTED +: vars.h
  • stp_parameter_description_destroy() +: vars.h
  • stp_parameter_find() +: vars.h
  • stp_parameter_find_in_settings() +: vars.h
  • STP_PARAMETER_INACTIVE +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED1 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED2 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED3 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED4 +: vars.h
  • STP_PARAMETER_LEVEL_BASIC +: vars.h
  • STP_PARAMETER_LEVEL_EXTERNAL +: vars.h
  • STP_PARAMETER_LEVEL_INTERNAL +: vars.h
  • STP_PARAMETER_LEVEL_INVALID +: vars.h
  • stp_parameter_level_t +: vars.h
  • stp_parameter_list_add_param() +: vars.h
  • stp_parameter_list_append() +: vars.h
  • stp_parameter_list_copy() +: vars.h
  • stp_parameter_list_count() +: vars.h
  • stp_parameter_list_create() +: vars.h
  • stp_parameter_list_destroy() +: vars.h
  • stp_parameter_list_param() +: vars.h
  • stp_parameter_list_t +: vars.h
  • STP_PARAMETER_TYPE_ARRAY +: vars.h
  • STP_PARAMETER_TYPE_BOOLEAN +: vars.h
  • STP_PARAMETER_TYPE_CURVE +: vars.h
  • STP_PARAMETER_TYPE_DIMENSION +: vars.h
  • STP_PARAMETER_TYPE_DOUBLE +: vars.h
  • STP_PARAMETER_TYPE_FILE +: vars.h
  • STP_PARAMETER_TYPE_INT +: vars.h
  • STP_PARAMETER_TYPE_INVALID +: vars.h
  • STP_PARAMETER_TYPE_RAW +: vars.h
  • STP_PARAMETER_TYPE_STRING_LIST +: vars.h
  • stp_parameter_type_t +: vars.h
  • stp_parameter_verify_t +: vars.h
  • stp_path_search() +: path.h
  • stp_path_split() +: path.h
  • stp_print() +: printers.h
  • stp_printer_describe_parameter() +: printers.h
  • stp_printer_get_defaults() +: printers.h
  • stp_printer_get_driver() +: printers.h
  • stp_printer_get_family() +: printers.h
  • stp_printer_get_long_name() +: printers.h
  • stp_printer_get_manufacturer() +: printers.h
  • stp_printer_get_model() +: printers.h
  • stp_printer_list_parameters() +: printers.h
  • stp_printer_model_count() +: printers.h
  • stp_printer_t +: printers.h
  • stp_prune_inactive_options() +: util.h
  • stp_put16_be() +: util.h
  • stp_put16_le() +: util.h
  • stp_put32_be() +: util.h
  • stp_put32_le() +: util.h
  • stp_putc() +: util.h
  • stp_puts() +: util.h
  • stp_read_and_compose_curves() +: util.h
  • stp_realloc() +: util.h
  • stp_register_xml_parser() +: xml.h
  • stp_register_xml_preload() +: xml.h
  • STP_SAFE_FREE +: util.h
  • stp_scale_float_parameter() +: vars.h
  • stp_send_command() +: util.h
  • stp_sequence_copy() +: sequence.h
  • stp_sequence_create() +: sequence.h
  • stp_sequence_create_copy() +: sequence.h
  • stp_sequence_create_from_xmltree() +: xml.h
  • stp_sequence_destroy() +: sequence.h
  • stp_sequence_get_bounds() +: sequence.h
  • stp_sequence_get_data() +: sequence.h
  • stp_sequence_get_float_data() +: sequence.h
  • stp_sequence_get_int_data() +: sequence.h
  • stp_sequence_get_long_data() +: sequence.h
  • stp_sequence_get_point() +: sequence.h
  • stp_sequence_get_range() +: sequence.h
  • stp_sequence_get_short_data() +: sequence.h
  • stp_sequence_get_size() +: sequence.h
  • stp_sequence_get_uint_data() +: sequence.h
  • stp_sequence_get_ulong_data() +: sequence.h
  • stp_sequence_get_ushort_data() +: sequence.h
  • stp_sequence_set_bounds() +: sequence.h
  • stp_sequence_set_data() +: sequence.h
  • stp_sequence_set_float_data() +: sequence.h
  • stp_sequence_set_int_data() +: sequence.h
  • stp_sequence_set_long_data() +: sequence.h
  • stp_sequence_set_point() +: sequence.h
  • stp_sequence_set_short_data() +: sequence.h
  • stp_sequence_set_size() +: sequence.h
  • stp_sequence_set_subrange() +: sequence.h
  • stp_sequence_set_uint_data() +: sequence.h
  • stp_sequence_set_ulong_data() +: sequence.h
  • stp_sequence_set_ushort_data() +: sequence.h
  • stp_sequence_t +: sequence.h
  • stp_set_array_parameter() +: vars.h
  • stp_set_array_parameter_active() +: vars.h
  • stp_set_boolean_parameter() +: vars.h
  • stp_set_boolean_parameter_active() +: vars.h
  • stp_set_color_conversion() +: vars.h
  • stp_set_color_conversion_n() +: vars.h
  • stp_set_curve_parameter() +: vars.h
  • stp_set_curve_parameter_active() +: vars.h
  • stp_set_default_array_parameter() +: vars.h
  • stp_set_default_boolean_parameter() +: vars.h
  • stp_set_default_curve_parameter() +: vars.h
  • stp_set_default_dimension_parameter() +: vars.h
  • stp_set_default_file_parameter() +: vars.h
  • stp_set_default_file_parameter_n() +: vars.h
  • stp_set_default_float_parameter() +: vars.h
  • stp_set_default_int_parameter() +: vars.h
  • stp_set_default_raw_parameter() +: vars.h
  • stp_set_default_string_parameter() +: vars.h
  • stp_set_default_string_parameter_n() +: vars.h
  • stp_set_dimension_parameter() +: vars.h
  • stp_set_dimension_parameter_active() +: vars.h
  • stp_set_driver() +: vars.h
  • stp_set_driver_n() +: vars.h
  • stp_set_errdata() +: vars.h
  • stp_set_errfunc() +: vars.h
  • stp_set_file_parameter() +: vars.h
  • stp_set_file_parameter_active() +: vars.h
  • stp_set_file_parameter_n() +: vars.h
  • stp_set_float_parameter() +: vars.h
  • stp_set_float_parameter_active() +: vars.h
  • stp_set_height() +: vars.h
  • stp_set_int_parameter() +: vars.h
  • stp_set_int_parameter_active() +: vars.h
  • stp_set_left() +: vars.h
  • stp_set_outdata() +: vars.h
  • stp_set_outfunc() +: vars.h
  • stp_set_output_codeset() +: util.h
  • stp_set_page_height() +: vars.h
  • stp_set_page_width() +: vars.h
  • stp_set_printer_defaults() +: printers.h
  • stp_set_raw_parameter() +: vars.h
  • stp_set_raw_parameter_active() +: vars.h
  • stp_set_string_parameter() +: vars.h
  • stp_set_string_parameter_active() +: vars.h
  • stp_set_string_parameter_n() +: vars.h
  • stp_set_top() +: vars.h
  • stp_set_verified() +: vars.h
  • stp_set_width() +: vars.h
  • stp_shade_t +: dither.h
  • stp_split_2() +: bit-ops.h
  • stp_split_4() +: bit-ops.h
  • stp_start_job() +: printers.h
  • stp_strdup() +: util.h
  • stp_string_list_add_string() +: string-list.h
  • stp_string_list_count() +: string-list.h
  • stp_string_list_create() +: string-list.h
  • stp_string_list_create_copy() +: string-list.h
  • stp_string_list_create_from_params() +: string-list.h
  • stp_string_list_destroy() +: string-list.h
  • stp_string_list_find() +: string-list.h
  • stp_string_list_is_present() +: string-list.h
  • stp_string_list_param() +: string-list.h
  • stp_string_list_remove_string() +: string-list.h
  • stp_string_list_t +: string-list.h
  • stp_strlen() +: util.h
  • stp_strndup() +: util.h
  • stp_unpack_16() +: bit-ops.h
  • stp_unpack_2() +: bit-ops.h
  • stp_unpack_4() +: bit-ops.h
  • stp_unpack_8() +: bit-ops.h
  • stp_unregister_xml_parser() +: xml.h
  • stp_unregister_xml_preload() +: xml.h
  • stp_vars_copy() +: vars.h
  • stp_vars_create() +: vars.h
  • stp_vars_create_copy() +: vars.h
  • stp_vars_destroy() +: vars.h
  • stp_vars_t +: vars.h
  • stp_verify() +: vars.h
  • stp_verify_parameter() +: vars.h
  • stp_verify_printer_params() +: printers.h
  • STP_WEAVE_ASCENDING +: weave.h
  • STP_WEAVE_ASCENDING_2X +: weave.h
  • STP_WEAVE_ASCENDING_3X +: weave.h
  • STP_WEAVE_DESCENDING +: weave.h
  • stp_weave_parameters_by_row() +: weave.h
  • STP_WEAVE_STAGGERED +: weave.h
  • stp_weave_strategy_t +: weave.h
  • STP_WEAVE_ZIGZAG +: weave.h
  • stp_write_weave() +: weave.h
  • stp_xml_exit() +: xml.h
  • stp_xml_get_node() +: xml.h
  • stp_xml_init() +: xml.h
  • stp_xml_init_defaults() +: xml.h
  • stp_xml_parse_file() +: xml.h
  • stp_xml_parse_file_named() +: xml.h
  • stp_xml_parse_func +: xml.h
  • stp_xml_preinit() +: xml.h
  • stp_xmldoc_create_generic() +: xml.h
  • stp_xmlstrtod() +: xml.h
  • stp_xmlstrtol() +: xml.h
  • stp_xmlstrtoul() +: xml.h
  • stp_xmltree_create_from_array() +: xml.h
  • stp_xmltree_create_from_curve() +: xml.h
  • stp_xmltree_create_from_sequence() +: xml.h
  • stp_zalloc() +: util.h
  • stp_zfwrite() +: util.h
  • stp_zprintf() +: util.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html index d53778f..0e627b4 100644 --- a/doc/gutenprint/html/globals_0x74.html +++ b/doc/gutenprint/html/globals_0x74.html @@ -2,56 +2,20 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - t -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html index 9f018cb..e834c2a 100644 --- a/doc/gutenprint/html/globals_defs.html +++ b/doc/gutenprint/html/globals_defs.html @@ -2,129 +2,94 @@ 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

    -  +

    - _ -

    +: gutenprint-intl.h, gutenprint-intl-internal.h

    - b -

    +: gutenprint-intl.h, gutenprint-intl-internal.h

    - c -

    +: curve-cache.h
  • CURVE_CACHE_FAST_DOUBLE +: curve-cache.h
  • CURVE_CACHE_FAST_USHORT +: curve-cache.h

    - d -

    +: gutenprint-intl.h, gutenprint-intl-internal.h
  • dgettext +: gutenprint-intl.h, gutenprint-intl-internal.h

    - g -

    +: gutenprint-intl.h, gutenprint-intl-internal.h

    - n -

    +: gutenprint-intl.h, gutenprint-intl-internal.h

    - s -

    +: gutenprint-version.h
  • STP_CHANNEL_LIMIT +: image.h
  • STP_CHECK_VERSION +: gutenprint-version.h
  • STP_CURRENT_INTERFACE +: gutenprint-version.h
  • STP_DBG_CANON +: util.h
  • STP_DBG_COLORFUNC +: util.h
  • STP_DBG_CURVE +: util.h
  • STP_DBG_CURVE_ERRORS +: util.h
  • STP_DBG_ESCP2 +: util.h
  • STP_DBG_INK +: util.h
  • STP_DBG_LEXMARK +: util.h
  • STP_DBG_LIST +: util.h
  • STP_DBG_LUT +: util.h
  • STP_DBG_MARK_FILE +: util.h
  • STP_DBG_MODULE +: util.h
  • STP_DBG_OLYMPUS +: util.h
  • STP_DBG_PAPER +: util.h
  • STP_DBG_PATH +: util.h
  • STP_DBG_PCL +: util.h
  • STP_DBG_PRINTERS +: util.h
  • STP_DBG_PS +: util.h
  • STP_DBG_ROWS +: util.h
  • STP_DBG_VARS +: util.h
  • STP_DBG_WEAVE_PARAMS +: util.h
  • STP_DBG_XML +: util.h
  • STP_ECOLOR_C +: dither.h
  • STP_ECOLOR_K +: dither.h
  • STP_ECOLOR_M +: dither.h
  • STP_ECOLOR_Y +: dither.h
  • STP_INTERFACE_AGE +: gutenprint-version.h
  • STP_MAJOR_VERSION +: gutenprint-version.h
  • STP_MAX_WEAVE +: weave.h
  • STP_MICRO_VERSION +: gutenprint-version.h
  • STP_MINOR_VERSION +: gutenprint-version.h
  • STP_MODULE +: gutenprint-module.h
  • STP_MXML_ADD_AFTER +: mxml.h
  • STP_MXML_ADD_BEFORE +: mxml.h
  • STP_MXML_ADD_TO_PARENT +: mxml.h
  • STP_MXML_DESCEND +: mxml.h
  • STP_MXML_DESCEND_FIRST +: mxml.h
  • STP_MXML_NO_CALLBACK +: mxml.h
  • STP_MXML_NO_DESCEND +: mxml.h
  • STP_MXML_NO_PARENT +: mxml.h
  • STP_MXML_TAB +: mxml.h
  • STP_MXML_WRAP +: mxml.h
  • STP_MXML_WS_AFTER_CLOSE +: mxml.h
  • STP_MXML_WS_AFTER_OPEN +: mxml.h
  • STP_MXML_WS_BEFORE_CLOSE +: mxml.h
  • STP_MXML_WS_BEFORE_OPEN +: mxml.h
  • STP_NCOLORS +: dither.h
  • STP_SAFE_FREE +: util.h

    - t -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-intl.h, gutenprint-intl-internal.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html index c61d7cd..6540637 100644 --- a/doc/gutenprint/html/globals_enum.html +++ b/doc/gutenprint/html/globals_enum.html @@ -2,54 +2,30 @@ 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
    +

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: curve.h
  • stp_curve_compose_t +: curve.h
  • stp_curve_type_t +: curve.h
  • stp_curve_wrap_mode_t +: curve.h
  • stp_image_status_t +: image.h
  • stp_module_class_t +: module.h
  • stp_mxml_type_e +: mxml.h
  • stp_papersize_unit_t +: paper.h
  • stp_parameter_activity_t +: vars.h
  • stp_parameter_class_t +: vars.h
  • stp_parameter_level_t +: vars.h
  • stp_parameter_type_t +: vars.h
  • stp_parameter_verify_t +: vars.h
  • stp_weave_strategy_t +: weave.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html index 24b8a40..92ca001 100644 --- a/doc/gutenprint/html/globals_eval.html +++ b/doc/gutenprint/html/globals_eval.html @@ -2,111 +2,82 @@ libgutenprint API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -
    -
      -
    • p
      • -
    • s
      • -
    -
    + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    +
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    +
    p | s

    -  +

    - p -

    +: paper.h
  • PAPERSIZE_ENGLISH_STANDARD +: paper.h
  • PAPERSIZE_METRIC_EXTENDED +: paper.h
  • PAPERSIZE_METRIC_STANDARD +: paper.h
  • PARAMETER_BAD +: vars.h
  • PARAMETER_INACTIVE +: vars.h
  • PARAMETER_OK +: vars.h

    - s -

    • STP_CURVE_BOUNDS_CLIP -: curve.h
    • STP_CURVE_BOUNDS_ERROR -: curve.h
    • STP_CURVE_BOUNDS_RESCALE -: curve.h
    • STP_CURVE_COMPOSE_ADD -: curve.h
    • STP_CURVE_COMPOSE_EXPONENTIATE -: curve.h
    • STP_CURVE_COMPOSE_MULTIPLY -: curve.h
    • STP_CURVE_TYPE_LINEAR -: curve.h
    • STP_CURVE_TYPE_SPLINE -: curve.h
    • STP_CURVE_WRAP_AROUND -: curve.h
    • STP_CURVE_WRAP_NONE -: curve.h
    • STP_IMAGE_STATUS_ABORT -: image.h
    • STP_IMAGE_STATUS_OK -: image.h
    • STP_MODULE_CLASS_COLOR -: module.h
    • STP_MODULE_CLASS_DITHER -: module.h
    • STP_MODULE_CLASS_FAMILY -: module.h
    • STP_MODULE_CLASS_INVALID -: module.h
    • STP_MODULE_CLASS_MISC -: module.h
    • STP_MXML_ELEMENT -: mxml.h
    • STP_MXML_INTEGER -: mxml.h
    • STP_MXML_OPAQUE -: mxml.h
    • STP_MXML_REAL -: mxml.h
    • STP_MXML_TEXT -: mxml.h
    • STP_PARAMETER_ACTIVE -: vars.h
    • STP_PARAMETER_CLASS_CORE -: vars.h
    • STP_PARAMETER_CLASS_FEATURE -: vars.h
    • STP_PARAMETER_CLASS_INVALID -: vars.h
    • STP_PARAMETER_CLASS_OUTPUT -: vars.h
    • STP_PARAMETER_DEFAULTED -: vars.h
    • STP_PARAMETER_INACTIVE -: vars.h
    • STP_PARAMETER_LEVEL_ADVANCED -: vars.h
    • STP_PARAMETER_LEVEL_ADVANCED1 -: vars.h
    • STP_PARAMETER_LEVEL_ADVANCED2 -: vars.h
    • STP_PARAMETER_LEVEL_ADVANCED3 -: vars.h
    • STP_PARAMETER_LEVEL_ADVANCED4 -: vars.h
    • STP_PARAMETER_LEVEL_BASIC -: vars.h
    • STP_PARAMETER_LEVEL_EXTERNAL -: vars.h
    • STP_PARAMETER_LEVEL_INTERNAL -: vars.h
    • STP_PARAMETER_LEVEL_INVALID -: vars.h
    • STP_PARAMETER_TYPE_ARRAY -: vars.h
    • STP_PARAMETER_TYPE_BOOLEAN -: vars.h
    • STP_PARAMETER_TYPE_CURVE -: vars.h
    • STP_PARAMETER_TYPE_DIMENSION -: vars.h
    • STP_PARAMETER_TYPE_DOUBLE -: vars.h
    • STP_PARAMETER_TYPE_FILE -: vars.h
    • STP_PARAMETER_TYPE_INT -: vars.h
    • STP_PARAMETER_TYPE_INVALID -: vars.h
    • STP_PARAMETER_TYPE_RAW -: vars.h
    • STP_PARAMETER_TYPE_STRING_LIST -: vars.h
    • STP_WEAVE_ASCENDING -: weave.h
    • STP_WEAVE_ASCENDING_2X -: weave.h
    • STP_WEAVE_ASCENDING_3X -: weave.h
    • STP_WEAVE_DESCENDING -: weave.h
    • STP_WEAVE_STAGGERED -: weave.h
    • STP_WEAVE_ZIGZAG -: weave.h
    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: curve.h
  • STP_CURVE_BOUNDS_ERROR +: curve.h
  • STP_CURVE_BOUNDS_RESCALE +: curve.h
  • STP_CURVE_COMPOSE_ADD +: curve.h
  • STP_CURVE_COMPOSE_EXPONENTIATE +: curve.h
  • STP_CURVE_COMPOSE_MULTIPLY +: curve.h
  • STP_CURVE_TYPE_LINEAR +: curve.h
  • STP_CURVE_TYPE_SPLINE +: curve.h
  • STP_CURVE_WRAP_AROUND +: curve.h
  • STP_CURVE_WRAP_NONE +: curve.h
  • STP_IMAGE_STATUS_ABORT +: image.h
  • STP_IMAGE_STATUS_OK +: image.h
  • STP_MODULE_CLASS_COLOR +: module.h
  • STP_MODULE_CLASS_DITHER +: module.h
  • STP_MODULE_CLASS_FAMILY +: module.h
  • STP_MODULE_CLASS_INVALID +: module.h
  • STP_MODULE_CLASS_MISC +: module.h
  • STP_MXML_ELEMENT +: mxml.h
  • STP_MXML_INTEGER +: mxml.h
  • STP_MXML_OPAQUE +: mxml.h
  • STP_MXML_REAL +: mxml.h
  • STP_MXML_TEXT +: mxml.h
  • STP_PARAMETER_ACTIVE +: vars.h
  • STP_PARAMETER_CLASS_CORE +: vars.h
  • STP_PARAMETER_CLASS_FEATURE +: vars.h
  • STP_PARAMETER_CLASS_INVALID +: vars.h
  • STP_PARAMETER_CLASS_OUTPUT +: vars.h
  • STP_PARAMETER_DEFAULTED +: vars.h
  • STP_PARAMETER_INACTIVE +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED1 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED2 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED3 +: vars.h
  • STP_PARAMETER_LEVEL_ADVANCED4 +: vars.h
  • STP_PARAMETER_LEVEL_BASIC +: vars.h
  • STP_PARAMETER_LEVEL_EXTERNAL +: vars.h
  • STP_PARAMETER_LEVEL_INTERNAL +: vars.h
  • STP_PARAMETER_LEVEL_INVALID +: vars.h
  • STP_PARAMETER_TYPE_ARRAY +: vars.h
  • STP_PARAMETER_TYPE_BOOLEAN +: vars.h
  • STP_PARAMETER_TYPE_CURVE +: vars.h
  • STP_PARAMETER_TYPE_DIMENSION +: vars.h
  • STP_PARAMETER_TYPE_DOUBLE +: vars.h
  • STP_PARAMETER_TYPE_FILE +: vars.h
  • STP_PARAMETER_TYPE_INT +: vars.h
  • STP_PARAMETER_TYPE_INVALID +: vars.h
  • STP_PARAMETER_TYPE_RAW +: vars.h
  • STP_PARAMETER_TYPE_STRING_LIST +: vars.h
  • STP_WEAVE_ASCENDING +: weave.h
  • STP_WEAVE_ASCENDING_2X +: weave.h
  • STP_WEAVE_ASCENDING_3X +: weave.h
  • STP_WEAVE_DESCENDING +: weave.h
  • STP_WEAVE_STAGGERED +: weave.h
  • STP_WEAVE_ZIGZAG +: weave.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html index 33a6aee..3a14614 100644 --- a/doc/gutenprint/html/globals_func.html +++ b/doc/gutenprint/html/globals_func.html @@ -2,503 +2,475 @@ libgutenprint API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -
    -
      -
    • s
      • -
    -
    + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    +
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    +
    s

    -  +

    - s -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: util.h
  • stp_allocate_component_data() +: vars.h
  • stp_array_copy() +: array.h
  • stp_array_create() +: array.h
  • stp_array_create_copy() +: array.h
  • stp_array_create_from_xmltree() +: xml.h
  • stp_array_destroy() +: array.h
  • stp_array_get_data() +: array.h
  • stp_array_get_point() +: array.h
  • stp_array_get_sequence() +: array.h
  • stp_array_get_size() +: array.h
  • stp_array_set_data() +: array.h
  • stp_array_set_point() +: array.h
  • stp_array_set_size() +: array.h
  • stp_asprintf() +: 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_curve() +: channel.h
  • stp_channel_get_cutoff_adjustment() +: channel.h
  • stp_channel_get_density_adjustment() +: 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_initialize() +: 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_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() +: vars.h
  • stp_check_boolean_parameter() +: vars.h
  • stp_check_curve_parameter() +: vars.h
  • stp_check_dimension_parameter() +: vars.h
  • stp_check_file_parameter() +: vars.h
  • stp_check_float_parameter() +: vars.h
  • stp_check_int_parameter() +: vars.h
  • stp_check_raw_parameter() +: vars.h
  • stp_check_string_parameter() +: vars.h
  • stp_check_version() +: gutenprint-version.h
  • stp_clear_array_parameter() +: vars.h
  • stp_clear_boolean_parameter() +: vars.h
  • stp_clear_curve_parameter() +: vars.h
  • stp_clear_dimension_parameter() +: vars.h
  • stp_clear_file_parameter() +: vars.h
  • stp_clear_float_parameter() +: vars.h
  • stp_clear_int_parameter() +: vars.h
  • stp_clear_raw_parameter() +: vars.h
  • stp_clear_string_parameter() +: vars.h
  • stp_color_count() +: color.h
  • stp_color_describe_parameter() +: color.h
  • stp_color_get_long_name() +: color.h
  • stp_color_get_name() +: color.h
  • stp_color_get_row() +: color.h
  • stp_color_init() +: color.h
  • stp_color_list_parameters() +: color.h
  • stp_color_register() +: color.h
  • stp_color_unregister() +: color.h
  • stp_copy_options() +: vars.h
  • stp_curve_cache_copy() +: curve-cache.h
  • stp_curve_cache_curve_data() +: curve-cache.h
  • stp_curve_cache_curve_invalidate() +: curve-cache.h
  • stp_curve_cache_get_count() +: curve-cache.h
  • stp_curve_cache_get_curve() +: curve-cache.h
  • stp_curve_cache_get_double_data() +: curve-cache.h
  • stp_curve_cache_get_ushort_data() +: curve-cache.h
  • stp_curve_cache_set_curve() +: curve-cache.h
  • stp_curve_cache_set_curve_copy() +: curve-cache.h
  • stp_curve_compose() +: curve.h
  • stp_curve_copy() +: curve.h
  • stp_curve_count_points() +: curve.h
  • stp_curve_create() +: curve.h
  • stp_curve_create_copy() +: curve.h
  • stp_curve_create_from_file() +: curve.h
  • stp_curve_create_from_stream() +: curve.h
  • stp_curve_create_from_string() +: curve.h
  • stp_curve_create_from_xmltree() +: xml.h
  • stp_curve_destroy() +: curve.h
  • stp_curve_free_curve_cache() +: curve-cache.h
  • stp_curve_get_bounds() +: curve.h
  • stp_curve_get_data() +: curve.h
  • stp_curve_get_data_points() +: curve.h
  • stp_curve_get_float_data() +: curve.h
  • stp_curve_get_gamma() +: curve.h
  • stp_curve_get_int_data() +: curve.h
  • stp_curve_get_interpolation_type() +: curve.h
  • stp_curve_get_long_data() +: curve.h
  • stp_curve_get_point() +: curve.h
  • stp_curve_get_range() +: curve.h
  • stp_curve_get_sequence() +: curve.h
  • stp_curve_get_short_data() +: curve.h
  • stp_curve_get_subrange() +: curve.h
  • stp_curve_get_uint_data() +: curve.h
  • stp_curve_get_ulong_data() +: curve.h
  • stp_curve_get_ushort_data() +: curve.h
  • stp_curve_get_wrap() +: curve.h
  • stp_curve_interpolate_value() +: curve.h
  • stp_curve_is_piecewise() +: curve.h
  • stp_curve_resample() +: curve.h
  • stp_curve_rescale() +: curve.h
  • stp_curve_set_bounds() +: curve.h
  • stp_curve_set_data() +: curve.h
  • stp_curve_set_data_points() +: curve.h
  • stp_curve_set_float_data() +: curve.h
  • stp_curve_set_gamma() +: curve.h
  • stp_curve_set_int_data() +: curve.h
  • stp_curve_set_interpolation_type() +: curve.h
  • stp_curve_set_long_data() +: curve.h
  • stp_curve_set_point() +: curve.h
  • stp_curve_set_short_data() +: curve.h
  • stp_curve_set_subrange() +: curve.h
  • stp_curve_set_uint_data() +: curve.h
  • stp_curve_set_ulong_data() +: curve.h
  • stp_curve_set_ushort_data() +: curve.h
  • stp_curve_write() +: curve.h
  • stp_curve_write_string() +: curve.h
  • stp_default_media_size() +: paper.h
  • stp_default_settings() +: vars.h
  • stp_deprintf() +: util.h
  • stp_describe_output() +: printers.h
  • stp_describe_parameter() +: vars.h
  • stp_describe_resolution() +: vars.h
  • stp_destroy_component_data() +: vars.h
  • stp_dither() +: dither.h
  • stp_dither_add_channel() +: dither.h
  • stp_dither_describe_parameter() +: dither.h
  • stp_dither_get_channel() +: dither.h
  • stp_dither_get_first_position() +: dither.h
  • stp_dither_get_last_position() +: dither.h
  • stp_dither_init() +: dither.h
  • stp_dither_internal() +: dither.h
  • stp_dither_list_parameters() +: dither.h
  • stp_dither_matrix_clone() +: dither.h
  • stp_dither_matrix_copy() +: dither.h
  • stp_dither_matrix_destroy() +: dither.h
  • stp_dither_matrix_init() +: dither.h
  • stp_dither_matrix_init_from_dither_array() +: dither.h
  • stp_dither_matrix_init_short() +: dither.h
  • stp_dither_matrix_iterated_init() +: dither.h
  • stp_dither_matrix_scale_exponentially() +: dither.h
  • stp_dither_matrix_set_row() +: dither.h
  • stp_dither_matrix_shear() +: dither.h
  • stp_dither_matrix_validate_array() +: dither.h
  • stp_dither_set_adaptive_limit() +: dither.h
  • stp_dither_set_ink_spread() +: dither.h
  • stp_dither_set_inks() +: dither.h
  • stp_dither_set_inks_full() +: dither.h
  • stp_dither_set_inks_simple() +: dither.h
  • stp_dither_set_iterated_matrix() +: dither.h
  • stp_dither_set_matrix() +: dither.h
  • stp_dither_set_matrix_from_dither_array() +: dither.h
  • stp_dither_set_randomizer() +: dither.h
  • stp_dither_set_transition() +: dither.h
  • stp_dprintf() +: util.h
  • stp_end_job() +: printers.h
  • stp_eprintf() +: util.h
  • stp_erprintf() +: util.h
  • stp_erputc() +: util.h
  • stp_family_register() +: printers.h
  • stp_family_unregister() +: printers.h
  • stp_fill_parameter_settings() +: vars.h
  • stp_find_standard_dither_array() +: dither.h
  • stp_flush_all() +: weave.h
  • stp_flush_debug_messages() +: util.h
  • stp_fold() +: bit-ops.h
  • stp_free() +: util.h
  • stp_get_array_parameter() +: vars.h
  • stp_get_array_parameter_active() +: vars.h
  • stp_get_boolean_parameter() +: vars.h
  • stp_get_boolean_parameter_active() +: vars.h
  • stp_get_color_by_colorfuncs() +: color.h
  • stp_get_color_by_index() +: color.h
  • stp_get_color_by_name() +: color.h
  • stp_get_color_conversion() +: vars.h
  • stp_get_component_data() +: vars.h
  • stp_get_curve_parameter() +: vars.h
  • stp_get_curve_parameter_active() +: vars.h
  • stp_get_debug_level() +: util.h
  • stp_get_dimension_parameter() +: vars.h
  • stp_get_dimension_parameter_active() +: vars.h
  • stp_get_driver() +: vars.h
  • stp_get_errdata() +: vars.h
  • stp_get_errfunc() +: vars.h
  • stp_get_file_parameter() +: vars.h
  • stp_get_file_parameter_active() +: vars.h
  • stp_get_float_parameter() +: vars.h
  • stp_get_float_parameter_active() +: vars.h
  • stp_get_height() +: vars.h
  • stp_get_imageable_area() +: vars.h
  • stp_get_int_parameter() +: vars.h
  • stp_get_int_parameter_active() +: vars.h
  • stp_get_left() +: vars.h
  • stp_get_lineactive_by_pass() +: weave.h
  • stp_get_linebases_by_pass() +: weave.h
  • stp_get_linecount_by_pass() +: weave.h
  • stp_get_lineoffsets_by_pass() +: weave.h
  • stp_get_media_size() +: vars.h
  • stp_get_model_id() +: printers.h
  • stp_get_outdata() +: vars.h
  • stp_get_outfunc() +: vars.h
  • stp_get_page_height() +: vars.h
  • stp_get_page_width() +: vars.h
  • stp_get_papersize_by_index() +: paper.h
  • stp_get_papersize_by_name() +: paper.h
  • stp_get_papersize_by_size() +: paper.h
  • stp_get_parameter_list() +: vars.h
  • stp_get_pass_by_pass() +: weave.h
  • stp_get_printer() +: printers.h
  • stp_get_printer_by_driver() +: printers.h
  • stp_get_printer_by_index() +: printers.h
  • stp_get_printer_by_long_name() +: printers.h
  • stp_get_printer_index_by_driver() +: printers.h
  • stp_get_raw_parameter() +: vars.h
  • stp_get_raw_parameter_active() +: vars.h
  • stp_get_release_version() +: util.h
  • stp_get_size_limit() +: vars.h
  • stp_get_string_parameter() +: vars.h
  • stp_get_string_parameter_active() +: vars.h
  • stp_get_top() +: vars.h
  • stp_get_verified() +: vars.h
  • stp_get_version() +: util.h
  • stp_get_width() +: vars.h
  • stp_image_conclude() +: image.h
  • stp_image_get_appname() +: image.h
  • stp_image_get_row() +: image.h
  • stp_image_height() +: image.h
  • stp_image_init() +: image.h
  • stp_image_reset() +: image.h
  • stp_image_width() +: image.h
  • stp_init() +: util.h
  • stp_init_debug_messages() +: util.h
  • stp_initialize_printer_defaults() +: printers.h
  • stp_initialize_weave() +: weave.h
  • stp_known_papersizes() +: paper.h
  • stp_list_copy() +: list.h
  • stp_list_create() +: list.h
  • stp_list_destroy() +: list.h
  • stp_list_get_copyfunc() +: list.h
  • stp_list_get_end() +: list.h
  • stp_list_get_freefunc() +: list.h
  • stp_list_get_item_by_index() +: list.h
  • stp_list_get_item_by_long_name() +: list.h
  • stp_list_get_item_by_name() +: list.h
  • stp_list_get_length() +: list.h
  • stp_list_get_long_namefunc() +: list.h
  • stp_list_get_namefunc() +: list.h
  • stp_list_get_sortfunc() +: list.h
  • stp_list_get_start() +: list.h
  • stp_list_item_create() +: list.h
  • stp_list_item_destroy() +: list.h
  • stp_list_item_get_data() +: list.h
  • stp_list_item_next() +: list.h
  • stp_list_item_prev() +: list.h
  • stp_list_item_set_data() +: list.h
  • stp_list_node_free_data() +: list.h
  • stp_list_set_copyfunc() +: list.h
  • stp_list_set_freefunc() +: list.h
  • stp_list_set_long_namefunc() +: list.h
  • stp_list_set_namefunc() +: list.h
  • stp_list_set_sortfunc() +: list.h
  • stp_malloc() +: util.h
  • stp_merge_printvars() +: vars.h
  • stp_module_close() +: module.h
  • stp_module_exit() +: module.h
  • stp_module_get_class() +: module.h
  • stp_module_init() +: module.h
  • stp_module_load() +: module.h
  • stp_module_open() +: module.h
  • stp_mxmlAdd() +: mxml.h
  • stp_mxmlDelete() +: mxml.h
  • stp_mxmlElementGetAttr() +: mxml.h
  • stp_mxmlElementSetAttr() +: mxml.h
  • stp_mxmlFindElement() +: mxml.h
  • stp_mxmlLoadFile() +: mxml.h
  • stp_mxmlLoadString() +: mxml.h
  • stp_mxmlNewElement() +: mxml.h
  • stp_mxmlNewInteger() +: mxml.h
  • stp_mxmlNewOpaque() +: mxml.h
  • stp_mxmlNewReal() +: mxml.h
  • stp_mxmlNewText() +: mxml.h
  • stp_mxmlRemove() +: mxml.h
  • stp_mxmlSaveAllocString() +: mxml.h
  • stp_mxmlSaveFile() +: mxml.h
  • stp_mxmlSaveString() +: mxml.h
  • stp_mxmlWalkNext() +: mxml.h
  • stp_mxmlWalkPrev() +: mxml.h
  • stp_parameter_description_destroy() +: vars.h
  • stp_parameter_find() +: vars.h
  • stp_parameter_find_in_settings() +: vars.h
  • stp_parameter_list_add_param() +: vars.h
  • stp_parameter_list_append() +: vars.h
  • stp_parameter_list_copy() +: vars.h
  • stp_parameter_list_count() +: vars.h
  • stp_parameter_list_create() +: vars.h
  • stp_parameter_list_destroy() +: vars.h
  • stp_parameter_list_param() +: vars.h
  • stp_path_search() +: path.h
  • stp_path_split() +: path.h
  • stp_print() +: printers.h
  • stp_printer_describe_parameter() +: printers.h
  • stp_printer_get_defaults() +: printers.h
  • stp_printer_get_driver() +: printers.h
  • stp_printer_get_family() +: printers.h
  • stp_printer_get_long_name() +: printers.h
  • stp_printer_get_manufacturer() +: printers.h
  • stp_printer_get_model() +: printers.h
  • stp_printer_list_parameters() +: printers.h
  • stp_printer_model_count() +: printers.h
  • stp_prune_inactive_options() +: util.h
  • stp_put16_be() +: util.h
  • stp_put16_le() +: util.h
  • stp_put32_be() +: util.h
  • stp_put32_le() +: util.h
  • stp_putc() +: util.h
  • stp_puts() +: util.h
  • stp_read_and_compose_curves() +: util.h
  • stp_realloc() +: util.h
  • stp_register_xml_parser() +: xml.h
  • stp_register_xml_preload() +: xml.h
  • stp_scale_float_parameter() +: vars.h
  • stp_send_command() +: util.h
  • stp_sequence_copy() +: sequence.h
  • stp_sequence_create() +: sequence.h
  • stp_sequence_create_copy() +: sequence.h
  • stp_sequence_create_from_xmltree() +: xml.h
  • stp_sequence_destroy() +: sequence.h
  • stp_sequence_get_bounds() +: sequence.h
  • stp_sequence_get_data() +: sequence.h
  • stp_sequence_get_float_data() +: sequence.h
  • stp_sequence_get_int_data() +: sequence.h
  • stp_sequence_get_long_data() +: sequence.h
  • stp_sequence_get_point() +: sequence.h
  • stp_sequence_get_range() +: sequence.h
  • stp_sequence_get_short_data() +: sequence.h
  • stp_sequence_get_size() +: sequence.h
  • stp_sequence_get_uint_data() +: sequence.h
  • stp_sequence_get_ulong_data() +: sequence.h
  • stp_sequence_get_ushort_data() +: sequence.h
  • stp_sequence_set_bounds() +: sequence.h
  • stp_sequence_set_data() +: sequence.h
  • stp_sequence_set_float_data() +: sequence.h
  • stp_sequence_set_int_data() +: sequence.h
  • stp_sequence_set_long_data() +: sequence.h
  • stp_sequence_set_point() +: sequence.h
  • stp_sequence_set_short_data() +: sequence.h
  • stp_sequence_set_size() +: sequence.h
  • stp_sequence_set_subrange() +: sequence.h
  • stp_sequence_set_uint_data() +: sequence.h
  • stp_sequence_set_ulong_data() +: sequence.h
  • stp_sequence_set_ushort_data() +: sequence.h
  • stp_set_array_parameter() +: vars.h
  • stp_set_array_parameter_active() +: vars.h
  • stp_set_boolean_parameter() +: vars.h
  • stp_set_boolean_parameter_active() +: vars.h
  • stp_set_color_conversion() +: vars.h
  • stp_set_color_conversion_n() +: vars.h
  • stp_set_curve_parameter() +: vars.h
  • stp_set_curve_parameter_active() +: vars.h
  • stp_set_default_array_parameter() +: vars.h
  • stp_set_default_boolean_parameter() +: vars.h
  • stp_set_default_curve_parameter() +: vars.h
  • stp_set_default_dimension_parameter() +: vars.h
  • stp_set_default_file_parameter() +: vars.h
  • stp_set_default_file_parameter_n() +: vars.h
  • stp_set_default_float_parameter() +: vars.h
  • stp_set_default_int_parameter() +: vars.h
  • stp_set_default_raw_parameter() +: vars.h
  • stp_set_default_string_parameter() +: vars.h
  • stp_set_default_string_parameter_n() +: vars.h
  • stp_set_dimension_parameter() +: vars.h
  • stp_set_dimension_parameter_active() +: vars.h
  • stp_set_driver() +: vars.h
  • stp_set_driver_n() +: vars.h
  • stp_set_errdata() +: vars.h
  • stp_set_errfunc() +: vars.h
  • stp_set_file_parameter() +: vars.h
  • stp_set_file_parameter_active() +: vars.h
  • stp_set_file_parameter_n() +: vars.h
  • stp_set_float_parameter() +: vars.h
  • stp_set_float_parameter_active() +: vars.h
  • stp_set_height() +: vars.h
  • stp_set_int_parameter() +: vars.h
  • stp_set_int_parameter_active() +: vars.h
  • stp_set_left() +: vars.h
  • stp_set_outdata() +: vars.h
  • stp_set_outfunc() +: vars.h
  • stp_set_output_codeset() +: util.h
  • stp_set_page_height() +: vars.h
  • stp_set_page_width() +: vars.h
  • stp_set_printer_defaults() +: printers.h
  • stp_set_raw_parameter() +: vars.h
  • stp_set_raw_parameter_active() +: vars.h
  • stp_set_string_parameter() +: vars.h
  • stp_set_string_parameter_active() +: vars.h
  • stp_set_string_parameter_n() +: vars.h
  • stp_set_top() +: vars.h
  • stp_set_verified() +: vars.h
  • stp_set_width() +: vars.h
  • stp_split_2() +: bit-ops.h
  • stp_split_4() +: bit-ops.h
  • stp_start_job() +: printers.h
  • stp_strdup() +: util.h
  • stp_string_list_add_string() +: string-list.h
  • stp_string_list_count() +: string-list.h
  • stp_string_list_create() +: string-list.h
  • stp_string_list_create_copy() +: string-list.h
  • stp_string_list_create_from_params() +: string-list.h
  • stp_string_list_destroy() +: string-list.h
  • stp_string_list_find() +: string-list.h
  • stp_string_list_is_present() +: string-list.h
  • stp_string_list_param() +: string-list.h
  • stp_string_list_remove_string() +: string-list.h
  • stp_strlen() +: util.h
  • stp_strndup() +: util.h
  • stp_unpack_16() +: bit-ops.h
  • stp_unpack_2() +: bit-ops.h
  • stp_unpack_4() +: bit-ops.h
  • stp_unpack_8() +: bit-ops.h
  • stp_unregister_xml_parser() +: xml.h
  • stp_unregister_xml_preload() +: xml.h
  • stp_vars_copy() +: vars.h
  • stp_vars_create() +: vars.h
  • stp_vars_create_copy() +: vars.h
  • stp_vars_destroy() +: vars.h
  • stp_verify() +: vars.h
  • stp_verify_parameter() +: vars.h
  • stp_verify_printer_params() +: printers.h
  • stp_weave_parameters_by_row() +: weave.h
  • stp_write_weave() +: weave.h
  • stp_xml_exit() +: xml.h
  • stp_xml_get_node() +: xml.h
  • stp_xml_init() +: xml.h
  • stp_xml_init_defaults() +: xml.h
  • stp_xml_parse_file() +: xml.h
  • stp_xml_parse_file_named() +: xml.h
  • stp_xml_preinit() +: xml.h
  • stp_xmldoc_create_generic() +: xml.h
  • stp_xmlstrtod() +: xml.h
  • stp_xmlstrtol() +: xml.h
  • stp_xmlstrtoul() +: xml.h
  • stp_xmltree_create_from_array() +: xml.h
  • stp_xmltree_create_from_curve() +: xml.h
  • stp_xmltree_create_from_sequence() +: xml.h
  • stp_zalloc() +: util.h
  • stp_zfwrite() +: util.h
  • stp_zprintf() +: util.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html index eb9b536..3da366e 100644 --- a/doc/gutenprint/html/globals_type.html +++ b/doc/gutenprint/html/globals_type.html @@ -2,90 +2,61 @@ libgutenprint API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -
    -
      -
    • c
      • -
    • s
      • -
    -
    + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    +
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    +
    c | s

    -  +

    - c -

    +: vars.h

    - s -

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: array.h
  • stp_color_t +: color.h
  • stp_compute_linewidth_func +: weave.h
  • stp_const_parameter_list_t +: vars.h
  • stp_copy_data_func_t +: vars.h
  • stp_curve_t +: curve.h
  • stp_dither_matrix_generic_t +: dither.h
  • stp_dither_matrix_impl_t +: dither.h
  • stp_dither_matrix_normal_t +: dither.h
  • stp_dither_matrix_short_t +: dither.h
  • stp_dotsize_t +: dither.h
  • stp_family_t +: printers.h
  • stp_fillfunc +: weave.h
  • stp_flushfunc +: weave.h
  • stp_free_data_func_t +: vars.h
  • stp_image_t +: image.h
  • stp_list_item_t +: list.h
  • stp_list_t +: list.h
  • stp_module_t +: module.h
  • stp_module_version_t +: module.h
  • stp_mxml_attr_t +: mxml.h
  • stp_mxml_element_t +: mxml.h
  • stp_mxml_node_t +: mxml.h
  • stp_mxml_text_t +: mxml.h
  • stp_mxml_type_t +: mxml.h
  • stp_mxml_value_t +: mxml.h
  • stp_node_copyfunc +: list.h
  • stp_node_freefunc +: list.h
  • stp_node_namefunc +: list.h
  • stp_node_sortfunc +: list.h
  • stp_outfunc_t +: vars.h
  • stp_packfunc +: weave.h
  • stp_parameter_list_t +: vars.h
  • stp_printer_t +: printers.h
  • stp_sequence_t +: sequence.h
  • stp_shade_t +: dither.h
  • stp_string_list_t +: string-list.h
  • stp_vars_t +: vars.h
  • stp_xml_parse_func +: xml.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html index 1e673c7..68f42da 100644 --- a/doc/gutenprint/html/globals_vars.html +++ b/doc/gutenprint/html/globals_vars.html @@ -2,52 +2,28 @@ 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
    +

    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +: gutenprint-version.h
  • stp_compute_tiff_linewidth +: weave.h
  • stp_compute_uncompressed_linewidth +: weave.h
  • stp_current_interface +: gutenprint-version.h
  • stp_fill_tiff +: weave.h
  • stp_fill_uncompressed +: weave.h
  • stp_interface_age +: gutenprint-version.h
  • stp_major_version +: gutenprint-version.h
  • stp_micro_version +: gutenprint-version.h
  • stp_minor_version +: gutenprint-version.h
  • stp_pack_tiff +: weave.h
  • stp_pack_uncompressed +: weave.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html index 7bcf47f..9e5678b 100644 --- a/doc/gutenprint/html/group__array.html +++ b/doc/gutenprint/html/group__array.html @@ -2,71 +2,62 @@ 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... - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Typedefs

    typedef stp_array stp_array_t
    typedef stp_array stp_array_t
     The array opaque data type.
     The array opaque data type.

    Functions

    stp_array_t * stp_array_create (int x_size, int y_size)
    stp_array_t * stp_array_create (int x_size, int y_size)
     Create a new array.
    void stp_array_destroy (stp_array_t *array)
     Create a new array.
    void stp_array_destroy (stp_array_t *array)
     Destroy an array.
    void stp_array_copy (stp_array_t *dest, const stp_array_t *source)
     Destroy an array.
    void stp_array_copy (stp_array_t *dest, const stp_array_t *source)
     Copy an array.
    stp_array_t * stp_array_create_copy (const stp_array_t *array)
     Copy an array.
    stp_array_t * stp_array_create_copy (const stp_array_t *array)
     Copy and allocate an array.
    void stp_array_set_size (stp_array_t *array, int x_size, int y_size)
     Copy and allocate an array.
    void stp_array_set_size (stp_array_t *array, int x_size, int y_size)
     Resize an array.
    void stp_array_get_size (const stp_array_t *array, int *x_size, int *y_size)
     Resize an array.
    void stp_array_get_size (const stp_array_t *array, int *x_size, int *y_size)
     Get the size of an array.
    void stp_array_set_data (stp_array_t *array, const double *data)
     Get the size of an array.
    void stp_array_set_data (stp_array_t *array, const double *data)
     Set the data in an array.
    void stp_array_get_data (const stp_array_t *array, size_t *size, const double **data)
     Set the data in an array.
    void stp_array_get_data (const stp_array_t *array, size_t *size, const double **data)
     Get the data in an array.
    int stp_array_set_point (stp_array_t *array, int x, int y, double data)
     Get the data in an array.
    int stp_array_set_point (stp_array_t *array, int x, int y, double data)
     Set the data at a single point in the array.
    int stp_array_get_point (const stp_array_t *array, int x, int y, double *data)
     Set the data at a single point in the array.
    int stp_array_get_point (const stp_array_t *array, int x, int y, double *data)
     Get the data at a single point in the array.
    const stp_sequence_t * stp_array_get_sequence (const stp_array_t *array)
     Get the data at a single point in the array.
    const stp_sequence_t * stp_array_get_sequence (const stp_array_t *array)
     Get the underlying stp_sequence_t.
     Get the underlying stp_sequence_t.

    Detailed Description

    The array is a simple "two-dimensional array of numbers" data structure.

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

    Typedef Documentation

    -

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

    Typedef Documentation

    +

    @@ -86,7 +77,7 @@ The array opaque data type.
    - +
    typedef struct stp_array stp_array_t typedef struct stp_array stp_array_t

    Function Documentation

    -

    +

    - + - + @@ -122,22 +113,22 @@ The array opaque data type.

    Copy an array.

    -Both dest and source must be valid arrays previously created with stp_array_create().

    Parameters:
    +Both dest and source must be valid arrays previously created with stp_array_create().
    Parameters:
    @@ -94,13 +85,13 @@ The array opaque data type.
    void stp_array_copy ( stp_array_t * stp_array_t *  dest,
    const stp_array_t * const stp_array_t *  source
    - +
    dest the destination array.
    source the source array.
    source the source array.

    		•
    -

    +

    - + @@ -173,19 +164,19 @@ The total size of the array will be (x_size * y_size).
    Parame
    stp_array_t* stp_array_create stp_array_t* stp_array_create (  int  x_size,
    y_size the number of "rows".
    -
    Returns:
    the newly created array.
    +
    Returns:
    the newly created array.
    -

    +

    - + - + @@ -204,16 +195,16 @@ The total size of the array will be (x_size * y_size).
    Parame

    Copy and allocate an array.

    -dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_array_create().

    Parameters:
    +dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_array_create().
    Parameters:
    stp_array_t* stp_array_create_copy stp_array_t* stp_array_create_copy ( const stp_array_t * const stp_array_t *  array  ) 
    array the source array.
    -
    Returns:
    the new copy of the array.
    +
    Returns:
    the new copy of the array.
    -

    +

    - + @@ -242,13 +233,13 @@ Destroy an array.

    It is an error to destroy the array more than once.

    Parameters:
    @@ -221,7 +212,7 @@ dest will be created, and then the contents of source will be copied into it. de
    void stp_array_destroy ( stp_array_t * stp_array_t *  array  ) 
    - +
    array the array to destroy.
    array the array to destroy.
    -

    +

    - + @@ -294,17 +285,17 @@ Get the data in an array.
    @@ -256,7 +247,7 @@ It is an error to destroy the array more than once.
    Parameter
    void stp_array_get_data ( const stp_array_t * const stp_array_t *  array,
    - + stp_array_get_data(array, &size, &data); +
    array the array to get the data from.
    size the number of elements in the array (x_size * y_size) are stored in the size_t pointed to.
    data a pointer to the first element of an array of doubles is stored in a pointer to double*. 
     stp_array_t *array;
+
    data a pointer to the first element of an array of doubles is stored in a pointer to double*. 
     stp_array_t *array;
  size_t size;
  double *data;
- stp_array_get_data(array, &size, &data);
-
    -

    +

    - + @@ -360,19 +351,19 @@ Get the data at a single point in the array.
    @@ -312,7 +303,7 @@ Get the data in an array.
    int stp_array_get_point ( const stp_array_t * const stp_array_t *  array,
    data the datum is stored in the double pointed to.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + - + @@ -396,11 +387,11 @@ Get the underlying stp_sequence_t.
    const stp_sequence_t* stp_array_get_sequence const stp_sequence_t* stp_array_get_sequence ( const stp_array_t * const stp_array_t *  array  ) 
    array the array to use.
    -
    Returns:
    the (constant) stp_sequence_t.
    +
    Returns:
    the (constant) stp_sequence_t.
    -

    +

    - + @@ -446,13 +437,13 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
    @@ -408,7 +399,7 @@ Get the underlying stp_sequence_t.
    void stp_array_get_size ( const stp_array_t * const stp_array_t *  array,
    - +
    array the array to get the size of.
    x_size a pointer to an integer to store the x size in.
    y_size a pointer to an integer to store the y size in.
    y_size a pointer to an integer to store the y size in.
    -

    +

    - + @@ -491,13 +482,13 @@ Set the data in an array.
    Parameters:
    @@ -460,7 +451,7 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
    void stp_array_set_data ( stp_array_t * stp_array_t *  array,
    - +
    array the array to set.
    data a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size).
    data a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size).
    -

    +

    - + @@ -553,11 +544,11 @@ Set the data at a single point in the array.
    @@ -505,7 +496,7 @@ Set the data in an array.
    int stp_array_set_point ( stp_array_t * stp_array_t *  array,
    data the datum to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -603,14 +594,14 @@ Resizing an array will destroy all data stored in the array.
    @@ -565,7 +556,7 @@ Set the data at a single point in the array.
    void stp_array_set_size ( stp_array_t * stp_array_t *  array,
    - +
    array the array to resize.
    x_size the new number of "columns".
    y_size the new number of "rows".
    y_size the new number of "rows".
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html index 66aa11e..d4ed9ff 100644 --- a/doc/gutenprint/html/group__color.html +++ b/doc/gutenprint/html/group__color.html @@ -2,18 +2,9 @@ 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... @@ -23,44 +14,44 @@ - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - +
    struct  stp_color

    Typedefs

    typedef stp_color stp_color_t
    typedef stp_color stp_color_t

    Functions

    int stp_color_init (stp_vars_t *v, stp_image_t *image, size_t steps)
    int stp_color_init (stp_vars_t *v, stp_image_t *image, size_t steps)
    int stp_color_get_row (stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
    int stp_color_get_row (stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
    stp_parameter_list_t stp_color_list_parameters (const stp_vars_t *v)
    stp_parameter_list_t stp_color_list_parameters (const stp_vars_t *v)
    void stp_color_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    void stp_color_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    int stp_color_register (const stp_color_t *color)
    int stp_color_register (const stp_color_t *color)
    int stp_color_unregister (const stp_color_t *color)
    int stp_color_unregister (const stp_color_t *color)
    int stp_color_count (void)
    int stp_color_count (void)
     Get the number of available color modules.
    const stp_color_t * stp_get_color_by_name (const char *name)
     Get the number of available color modules.
    const stp_color_t * stp_get_color_by_name (const char *name)
     Get a color module by its name.
    const stp_color_t * stp_get_color_by_index (int idx)
     Get a color module by its name.
    const stp_color_t * stp_get_color_by_index (int idx)
     Get a color module by its index number.
    const stp_color_t * stp_get_color_by_colorfuncs (stp_colorfuncs_t *colorfuncs)
     Get a color module by its index number.
    const stp_color_t * stp_get_color_by_colorfuncs (stp_colorfuncs_t *colorfuncs)
    const char * stp_color_get_name (const stp_color_t *c)
    const char * stp_color_get_name (const stp_color_t *c)
     Get the short (untranslated) name of a color module.
    const char * stp_color_get_long_name (const stp_color_t *c)
     Get the short (untranslated) name of a color module.
    const char * stp_color_get_long_name (const stp_color_t *c)
     Get the long (translated) name of a color module.
     Get the long (translated) name of a color module.

    Detailed Description

    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

    -

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

    Typedef Documentation

    +

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

    Function Documentation

    -

    +

    @@ -111,11 +102,11 @@ Color modules provide the actual functionality, so different colour management m

    Get the number of available color modules.

    -

    Returns:
    the number of color modules.
    +
    Returns:
    the number of color modules.
    -

    +

    - + @@ -158,7 +149,7 @@ Get the number of available color modules.
    @@ -123,7 +114,7 @@ Get the number of available color modules.
    void stp_color_describe_parameter ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    @@ -190,11 +181,11 @@ Get the long (translated) name of a color module.
    c the color module to use.
    -

    Returns:
    the long name.
    +
    Returns:
    the long name.
    -

    +

    @@ -226,11 +217,11 @@ Get the short (untranslated) name of a color module.
    c the color module to use.
    -

    Returns:
    the short name.
    +
    Returns:
    the short name.
    -

    +

    - + @@ -279,7 +270,7 @@ Get the short (untranslated) name of a color module.
    @@ -238,7 +229,7 @@ Get the short (untranslated) name of a color module.
    int stp_color_get_row ( stp_vars_t * stp_vars_t *  v,
    -

    +

    - + @@ -322,15 +313,15 @@ Get the short (untranslated) name of a color module.
    @@ -287,7 +278,7 @@ Get the short (untranslated) name of a color module.
    int stp_color_init ( stp_vars_t * stp_vars_t *  v,
    -

    +

    - + - + @@ -350,7 +341,7 @@ Get the short (untranslated) name of a color module.
    stp_parameter_list_t stp_color_list_parameters stp_parameter_list_t stp_color_list_parameters ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

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

    +

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

    +

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

    +

    @@ -466,11 +457,11 @@ Get a color module by its index number.
    idx the index number. This must not be greater than (total number of papers - 1).
    -

    Returns:
    a pointer to the color module, or NULL on failure.
    +
    Returns:
    a pointer to the color module, or NULL on failure.
    -

    +

    @@ -502,12 +493,12 @@ Get a color module by its name.
    name the short unique name. number of papers - 1).
    -

    Returns:
    a pointer to the color module, or NULL on failure.
    +
    Returns:
    a pointer to the color module, or NULL on failure.
    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html index e9d3ecd..aab61b8 100644 --- a/doc/gutenprint/html/group__curve.html +++ b/doc/gutenprint/html/group__curve.html @@ -2,18 +2,9 @@ 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... @@ -22,182 +13,182 @@ - + - + - - - + - - + - - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
     Point (x,y) for piecewise curve. More...

    Typedefs

    typedef stp_curve stp_curve_t
    typedef stp_curve stp_curve_t
     The curve opaque data type.
     The curve opaque data type.

    Enumerations

    enum  stp_curve_type_t { STP_CURVE_TYPE_LINEAR, -STP_CURVE_TYPE_SPLINE +
    enum  stp_curve_type_t { STP_CURVE_TYPE_LINEAR, +STP_CURVE_TYPE_SPLINE }
     Curve types. More...
    enum  stp_curve_wrap_mode_t { STP_CURVE_WRAP_NONE, -STP_CURVE_WRAP_AROUND +
     Curve types. More...
    enum  stp_curve_wrap_mode_t { STP_CURVE_WRAP_NONE, +STP_CURVE_WRAP_AROUND }
     Wrapping mode. More...
    enum  stp_curve_compose_t { STP_CURVE_COMPOSE_ADD, -STP_CURVE_COMPOSE_MULTIPLY, -STP_CURVE_COMPOSE_EXPONENTIATE +
     Wrapping mode. More...
    enum  stp_curve_compose_t { STP_CURVE_COMPOSE_ADD, +STP_CURVE_COMPOSE_MULTIPLY, +STP_CURVE_COMPOSE_EXPONENTIATE }
     Composition types. More...
    enum  stp_curve_bounds_t { STP_CURVE_BOUNDS_RESCALE, -STP_CURVE_BOUNDS_CLIP, -STP_CURVE_BOUNDS_ERROR +
     Composition types. More...
    enum  stp_curve_bounds_t { STP_CURVE_BOUNDS_RESCALE, +STP_CURVE_BOUNDS_CLIP, +STP_CURVE_BOUNDS_ERROR }
     Behaviour when curve exceeds bounds. More...
     Behaviour when curve exceeds bounds. More...

    Functions

    stp_curve_t * stp_curve_create (stp_curve_wrap_mode_t wrap)
    stp_curve_t * stp_curve_create (stp_curve_wrap_mode_t wrap)
     Create a new curve.
    stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve)
     Create a new curve.
    stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve)
     Copy and allocate an curve.
    void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source)
     Copy and allocate an curve.
    void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source)
     Copy an curve.
    void stp_curve_destroy (stp_curve_t *curve)
     Copy an curve.
    void stp_curve_destroy (stp_curve_t *curve)
     Destroy an curve.
    int stp_curve_set_bounds (stp_curve_t *curve, double low, double high)
     Destroy an curve.
    int stp_curve_set_bounds (stp_curve_t *curve, double low, double high)
     Set the lower and upper bounds on a curve.
    void stp_curve_get_bounds (const stp_curve_t *curve, double *low, double *high)
     Set the lower and upper bounds on a curve.
    void stp_curve_get_bounds (const stp_curve_t *curve, double *low, double *high)
     Get the lower and upper bounds on a curve.
    stp_curve_wrap_mode_t stp_curve_get_wrap (const stp_curve_t *curve)
     Get the lower and upper bounds on a curve.
    stp_curve_wrap_mode_t stp_curve_get_wrap (const stp_curve_t *curve)
     Get the wrapping mode.
    int stp_curve_is_piecewise (const stp_curve_t *curve)
     Get the wrapping mode.
    int stp_curve_is_piecewise (const stp_curve_t *curve)
     Determine whether the curve is piecewise.
    void stp_curve_get_range (const stp_curve_t *curve, double *low, double *high)
     Determine whether the curve is piecewise.
    void stp_curve_get_range (const stp_curve_t *curve, double *low, double *high)
    size_t stp_curve_count_points (const stp_curve_t *curve)
    size_t stp_curve_count_points (const stp_curve_t *curve)
     Get the number of allocated points in the curve.
    int stp_curve_set_interpolation_type (stp_curve_t *curve, stp_curve_type_t itype)
     Get the number of allocated points in the curve.
    int stp_curve_set_interpolation_type (stp_curve_t *curve, stp_curve_type_t itype)
     Set the curve interpolation type.
    stp_curve_type_t stp_curve_get_interpolation_type (const stp_curve_t *curve)
     Set the curve interpolation type.
    stp_curve_type_t stp_curve_get_interpolation_type (const stp_curve_t *curve)
     Get the curve interpolation type.
    int stp_curve_set_data (stp_curve_t *curve, size_t count, const double *data)
     Get the curve interpolation type.
    int stp_curve_set_data (stp_curve_t *curve, size_t count, const double *data)
     Set all data points of the curve.
    int stp_curve_set_data_points (stp_curve_t *curve, size_t count, const stp_curve_point_t *data)
     Set all data points of the curve.
    int stp_curve_set_data_points (stp_curve_t *curve, size_t count, const stp_curve_point_t *data)
     Set all data points of the curve.
    int stp_curve_set_float_data (stp_curve_t *curve, size_t count, const float *data)
     Set all data points of the curve.
    int stp_curve_set_float_data (stp_curve_t *curve, size_t count, const float *data)
     Set the data points in a curve from float values.
    int stp_curve_set_long_data (stp_curve_t *curve, size_t count, const long *data)
     Set the data points in a curve from float values.
    int stp_curve_set_long_data (stp_curve_t *curve, size_t count, const long *data)
     Set the data points in a curve from long values.
    int stp_curve_set_ulong_data (stp_curve_t *curve, size_t count, const unsigned long *data)
     Set the data points in a curve from long values.
    int stp_curve_set_ulong_data (stp_curve_t *curve, size_t count, const unsigned long *data)
     Set the data points in a curve from unsigned long values.
    int stp_curve_set_int_data (stp_curve_t *curve, size_t count, const int *data)
     Set the data points in a curve from unsigned long values.
    int stp_curve_set_int_data (stp_curve_t *curve, size_t count, const int *data)
     Set the data points in a curve from integer values.
    int stp_curve_set_uint_data (stp_curve_t *curve, size_t count, const unsigned int *data)
     Set the data points in a curve from integer values.
    int stp_curve_set_uint_data (stp_curve_t *curve, size_t count, const unsigned int *data)
     Set the data points in a curve from unsigned integer values.
    int stp_curve_set_short_data (stp_curve_t *curve, size_t count, const short *data)
     Set the data points in a curve from unsigned integer values.
    int stp_curve_set_short_data (stp_curve_t *curve, size_t count, const short *data)
     Set the data points in a curve from short values.
    int stp_curve_set_ushort_data (stp_curve_t *curve, size_t count, const unsigned short *data)
     Set the data points in a curve from short values.
    int stp_curve_set_ushort_data (stp_curve_t *curve, size_t count, const unsigned short *data)
     Set the data points in a curve from unsigned short values.
    stp_curve_t * stp_curve_get_subrange (const stp_curve_t *curve, size_t start, size_t count)
     Set the data points in a curve from unsigned short values.
    stp_curve_t * stp_curve_get_subrange (const stp_curve_t *curve, size_t start, size_t count)
     Get a curve containing a subrange of data.
    int stp_curve_set_subrange (stp_curve_t *curve, const stp_curve_t *range, size_t start)
     Get a curve containing a subrange of data.
    int stp_curve_set_subrange (stp_curve_t *curve, const stp_curve_t *range, size_t start)
    const double * stp_curve_get_data (const stp_curve_t *curve, size_t *count)
    const double * stp_curve_get_data (const stp_curve_t *curve, size_t *count)
     Get a pointer to the curve's raw data.
    const stp_curve_point_t * stp_curve_get_data_points (const stp_curve_t *curve, size_t *count)
     Get a pointer to the curve's raw data.
    const stp_curve_point_t * stp_curve_get_data_points (const stp_curve_t *curve, size_t *count)
     Get a pointer to the curve's raw data as points.
    const float * stp_curve_get_float_data (const stp_curve_t *curve, size_t *count)
     Get a pointer to the curve's raw data as points.
    const float * stp_curve_get_float_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as floats.
    const long * stp_curve_get_long_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as floats.
    const long * stp_curve_get_long_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as longs.
    const unsigned long * stp_curve_get_ulong_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as longs.
    const unsigned long * stp_curve_get_ulong_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as unsigned longs.
    const int * stp_curve_get_int_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as unsigned longs.
    const int * stp_curve_get_int_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as integers.
    const unsigned int * stp_curve_get_uint_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as integers.
    const unsigned int * stp_curve_get_uint_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as unsigned integers.
    const short * stp_curve_get_short_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as unsigned integers.
    const short * stp_curve_get_short_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as shorts.
    const unsigned short * stp_curve_get_ushort_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as shorts.
    const unsigned short * stp_curve_get_ushort_data (const stp_curve_t *curve, size_t *count)
     Get pointer to the curve's raw data as unsigned shorts.
    const stp_sequence_t * stp_curve_get_sequence (const stp_curve_t *curve)
     Get pointer to the curve's raw data as unsigned shorts.
    const stp_sequence_t * stp_curve_get_sequence (const stp_curve_t *curve)
     Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.
    int stp_curve_set_gamma (stp_curve_t *curve, double f_gamma)
     Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.
    int stp_curve_set_gamma (stp_curve_t *curve, double f_gamma)
     Set the gamma of a curve.
    double stp_curve_get_gamma (const stp_curve_t *curve)
     Set the gamma of a curve.
    double stp_curve_get_gamma (const stp_curve_t *curve)
     Get the gamma value of the curve.
    int stp_curve_set_point (stp_curve_t *curve, size_t where, double data)
     Get the gamma value of the curve.
    int stp_curve_set_point (stp_curve_t *curve, size_t where, double data)
     Set a point along the curve.
    int stp_curve_get_point (const stp_curve_t *curve, size_t where, double *data)
     Set a point along the curve.
    int stp_curve_get_point (const stp_curve_t *curve, size_t where, double *data)
     Get a point along the curve.
    int stp_curve_interpolate_value (const stp_curve_t *curve, double where, double *result)
     Get a point along the curve.
    int stp_curve_interpolate_value (const stp_curve_t *curve, double where, double *result)
     Interpolate a point along the curve.
    int stp_curve_resample (stp_curve_t *curve, size_t points)
     Interpolate a point along the curve.
    int stp_curve_resample (stp_curve_t *curve, size_t points)
     Resample a curve (change the number of points).
    int stp_curve_rescale (stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)
     Resample a curve (change the number of points).
    int stp_curve_rescale (stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)
     Rescale a curve (multiply all points by a scaling constant).
    int stp_curve_write (FILE *file, const stp_curve_t *curve)
     Rescale a curve (multiply all points by a scaling constant).
    int stp_curve_write (FILE *file, const stp_curve_t *curve)
     Write a curve to a file.
    char * stp_curve_write_string (const stp_curve_t *curve)
     Write a curve to a file.
    char * stp_curve_write_string (const stp_curve_t *curve)
     Write a curve to a string.
    stp_curve_t * stp_curve_create_from_stream (FILE *fp)
     Write a curve to a string.
    stp_curve_t * stp_curve_create_from_stream (FILE *fp)
     Create a curve from a stream.
    stp_curve_t * stp_curve_create_from_file (const char *file)
     Create a curve from a stream.
    stp_curve_t * stp_curve_create_from_file (const char *file)
     Create a curve from a stream.
    stp_curve_t * stp_curve_create_from_string (const char *string)
     Create a curve from a stream.
    stp_curve_t * stp_curve_create_from_string (const char *string)
     Create a curve from a string.
    int stp_curve_compose (stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)
     Create a curve from a string.
    int stp_curve_compose (stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)
     Compose two curves, creating a third curve.
     Compose two curves, creating a third curve.

    Detailed Description

    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

    -

    +Various operations are supported, including interpolation and composition.

    Typedef Documentation

    +

    @@ -217,13 +208,13 @@ The curve opaque data type.
    - +
    typedef struct stp_curve stp_curve_t typedef struct stp_curve stp_curve_t

    Enumeration Type Documentation

    -

    +

    @@ -241,24 +232,24 @@ Behaviour when curve exceeds bounds.

    Enumerator:
    - +
    enum stp_curve_bounds_t enum stp_curve_bounds_t
    - - -
    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.
    -

    +

    @@ -276,24 +267,24 @@ Composition types.

    Enumerator:
    - +
    enum stp_curve_compose_t enum stp_curve_compose_t
    - - -
    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.
    -

    +

    @@ -311,22 +302,22 @@ Curve types.

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

    +

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

    Enumerator:
    - +
    enum stp_curve_wrap_mode_t enum stp_curve_wrap_mode_t
    - -
    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.
    @@ -354,7 +345,7 @@ The curve wraps to its starting point.

    Function Documentation

    -

    +

    - + - + - + - + @@ -417,11 +408,11 @@ Only add and multiply composition is currently supported. If both curves are gam
    @@ -362,25 +353,25 @@ The curve wraps to its starting point.
    int stp_curve_compose ( stp_curve_t ** stp_curve_t **  retval,
    stp_curve_t * stp_curve_t *  a,
    stp_curve_t * stp_curve_t *  b,
    stp_curve_compose_t stp_curve_compose_t  mode,
    points the number of points in the output curve (must not exceed 1048576). It must be at least two, unless the curve is a gamma curve and the operation chosen is multiplication or division. If -1, the resulting number of points will be the least common multiplier of the number of points in the input and output curves (but will not exceed 1048576).
    -

    Returns:
    FALSE if element-wise composition fails.
    +
    Returns:
    FALSE if element-wise composition fails.
    -

    +

    - + - + @@ -457,16 +448,16 @@ Only add and multiply composition is currently supported. If both curves are gam

    Copy an curve.

    -Both dest and source must be valid curves previously created with stp_curve_create().

    Parameters:
    +Both dest and source must be valid curves previously created with stp_curve_create().
    Parameters:
    @@ -429,13 +420,13 @@ Only add and multiply composition is currently supported. If both curves are gam
    void stp_curve_copy ( stp_curve_t * stp_curve_t *  dest,
    const stp_curve_t * const stp_curve_t *  source
    - +
    dest the destination curve.
    source the source curve.
    source the source curve.
    -

    +

    - + @@ -498,19 +489,19 @@ Get the number of allocated points in the curve.
    @@ -474,7 +465,7 @@ Both dest and source must be valid curves previously created with size_t stp_curve_count_points ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -

    Returns:
    the number of points.
    +
    Returns:
    the number of points.
    -

    +

    - + - + @@ -535,19 +526,19 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
    stp_curve_t* stp_curve_create stp_curve_t* stp_curve_create ( stp_curve_wrap_mode_t stp_curve_wrap_mode_t  wrap  ) 
    wrap the wrap mode of the curve.
    -
    Returns:
    the newly created curve.
    +
    Returns:
    the newly created curve.
    -

    +

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

    Copy and allocate an curve.

    -dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_curve_create().

    Parameters:
    +dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_curve_create().
    Parameters:
    stp_curve_t* stp_curve_create_copy stp_curve_t* stp_curve_create_copy ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the source curve.
    -
    Returns:
    the new copy of the curve.
    +
    Returns:
    the new copy of the curve.
    -

    +

    - + @@ -608,17 +599,17 @@ Create a curve from a stream.
    stp_curve_t* stp_curve_create_from_file stp_curve_t* stp_curve_create_from_file (  const char *  file
    file the file to read.
    -
    Returns:
    the newly created curve, or NULL if an error occured.
    +
    Returns:
    the newly created curve, or NULL if an error occured.
    -

    +

    - + @@ -645,17 +636,17 @@ Create a curve from a stream.
    stp_curve_t* stp_curve_create_from_stream stp_curve_t* stp_curve_create_from_stream (  FILE *  fp
    fp the stream to read.
    -
    Returns:
    the newly created curve, or NULL if an error occured.
    +
    Returns:
    the newly created curve, or NULL if an error occured.
    -

    +

    - + @@ -682,11 +673,11 @@ Create a curve from a string.
    stp_curve_t* stp_curve_create_from_string stp_curve_t* stp_curve_create_from_string (  const char *  string
    string the string to read.
    -
    Returns:
    the newly created curve, or NULL if an error occured.
    +
    Returns:
    the newly created curve, or NULL if an error occured.
    -

    +

    - + @@ -715,13 +706,13 @@ Destroy an curve.

    It is an error to destroy the curve more than once.

    Parameters:
    @@ -694,7 +685,7 @@ Create a curve from a string.
    void stp_curve_destroy ( stp_curve_t * stp_curve_t *  curve  ) 
    - +
    curve the curve to destroy.
    curve the curve to destroy.
    -

    +

    - + @@ -767,13 +758,13 @@ Get the lower and upper bounds on a curve.
    @@ -729,7 +720,7 @@ It is an error to destroy the curve more than once.
    Parameter
    void stp_curve_get_bounds ( const stp_curve_t * const stp_curve_t *  curve,
    - +
    curve the curve to use.
    low a pointer to a double to store the lower bound in.
    high a pointer to a double to store the upper bound in.
    high a pointer to a double to store the upper bound in.
    -

    +

    - + @@ -815,11 +806,11 @@ Get a pointer to the curve's raw data.
    @@ -781,7 +772,7 @@ Get the lower and upper bounds on a curve.
    const double* stp_curve_get_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -861,11 +852,11 @@ Get a pointer to the curve's raw data as points.
    @@ -827,7 +818,7 @@ Get a pointer to the curve's raw data.
    const stp_curve_point_t* stp_curve_get_data_points ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve.
    -

    +

    - + @@ -907,11 +898,11 @@ Get pointer to the curve's raw data as floats.
    @@ -873,7 +864,7 @@ Get a pointer to the curve's raw data as points.
    const float* stp_curve_get_float_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -938,11 +929,11 @@ Get pointer to the curve's raw data as floats.

    Get the gamma value of the curve.

    -

    Returns:
    the gamma value. A value of 0 indicates that the curve does not have a valid gamma value.
    +
    Returns:
    the gamma value. A value of 0 indicates that the curve does not have a valid gamma value.
    @@ -919,7 +910,7 @@ Get pointer to the curve's raw data as floats.
    double stp_curve_get_gamma ( const stp_curve_t * const stp_curve_t *  curve  ) 
    -

    +

    - + @@ -984,19 +975,19 @@ Get pointer to the curve's raw data as integers.
    @@ -950,7 +941,7 @@ Get the gamma value of the curve.
    const int* stp_curve_get_int_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + - + @@ -1020,11 +1011,11 @@ Get the curve interpolation type.
    stp_curve_type_t stp_curve_get_interpolation_type stp_curve_type_t stp_curve_get_interpolation_type ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -
    Returns:
    the interpolation type.
    +
    Returns:
    the interpolation type.
    -

    +

    - + @@ -1066,11 +1057,11 @@ Get pointer to the curve's raw data as longs.
    @@ -1032,7 +1023,7 @@ Get the curve interpolation type.
    const long* stp_curve_get_long_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -1119,11 +1110,11 @@ Get a point along the curve.
    @@ -1078,7 +1069,7 @@ Get pointer to the curve's raw data as longs.
    int stp_curve_get_point ( const stp_curve_t * const stp_curve_t *  curve,
    data a pointer to a double to store the value of where in.
    -

    Returns:
    FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -1166,15 +1157,15 @@ Get a point along the curve.
    @@ -1131,7 +1122,7 @@ Get a point along the curve.
    void stp_curve_get_range ( const stp_curve_t * const stp_curve_t *  curve,
    -

    +

    - + - + @@ -1198,11 +1189,11 @@ This can be used for fast access to the raw data.
    Parameters:
    const stp_sequence_t* stp_curve_get_sequence const stp_sequence_t* stp_curve_get_sequence ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -
    Returns:
    the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL;
    +
    Returns:
    the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL;
    -

    +

    - + @@ -1244,19 +1235,19 @@ Get pointer to the curve's raw data as shorts.
    @@ -1210,7 +1201,7 @@ This can be used for fast access to the raw data.
    Parameters:
    const short* stp_curve_get_short_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + - + @@ -1297,11 +1288,11 @@ If the start or count is invalid, the returned curve will compare equal to NULL
    stp_curve_t* stp_curve_get_subrange stp_curve_t* stp_curve_get_subrange ( const stp_curve_t * const stp_curve_t *  curve,
    count the number of point starting at start.
    -
    Returns:
    a curve containing the subrange. The returned curve is non-wrapping.
    +
    Returns:
    a curve containing the subrange. The returned curve is non-wrapping.
    -

    +

    - + @@ -1343,11 +1334,11 @@ Get pointer to the curve's raw data as unsigned integers.
    @@ -1309,7 +1300,7 @@ If the start or count is invalid, the returned curve will compare equal to NULL
    const unsigned int* stp_curve_get_uint_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -1389,11 +1380,11 @@ Get pointer to the curve's raw data as unsigned longs.
    @@ -1355,7 +1346,7 @@ Get pointer to the curve's raw data as unsigned integers.
    const unsigned long* stp_curve_get_ulong_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -1435,19 +1426,19 @@ Get pointer to the curve's raw data as unsigned shorts.
    @@ -1401,7 +1392,7 @@ Get pointer to the curve's raw data as unsigned longs.
    const unsigned short* stp_curve_get_ushort_data ( const stp_curve_t * const stp_curve_t *  curve,
    count a pointer to a size_t to store the curve size in.
    -

    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + - + @@ -1471,11 +1462,11 @@ Get the wrapping mode.
    stp_curve_wrap_mode_t stp_curve_get_wrap stp_curve_wrap_mode_t stp_curve_get_wrap ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -
    Returns:
    the wrapping mode.
    +
    Returns:
    the wrapping mode.
    -

    +

    - + @@ -1524,11 +1515,11 @@ Interpolate a point along the curve.
    @@ -1483,7 +1474,7 @@ Get the wrapping mode.
    int stp_curve_interpolate_value ( const stp_curve_t * const stp_curve_t *  curve,
    result a pointer to double to store the value of where in. If interpolation would produce a value outside of the allowed range (as could happen with spline interpolation), the value is clipped to the range.
    -

    Returns:
    FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve.
    +
    Returns:
    FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve.
    -

    +

    - + @@ -1560,11 +1551,11 @@ Determine whether the curve is piecewise.
    @@ -1536,7 +1527,7 @@ Interpolate a point along the curve.
    int stp_curve_is_piecewise ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -

    Returns:
    whether the curve is piecewise
    +
    Returns:
    whether the curve is piecewise
    -

    +

    - + @@ -1606,11 +1597,11 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
    @@ -1572,7 +1563,7 @@ Determine whether the curve is piecewise.
    int stp_curve_resample ( stp_curve_t * stp_curve_t *  curve,
    points the number of points.
    -

    Returns:
    FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve).
    +
    Returns:
    FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve).
    -

    +

    - + @@ -1630,13 +1621,13 @@ This does not destroy the gamma value of a curve. Points are interpolated as req - + - + @@ -1666,11 +1657,11 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
    @@ -1618,7 +1609,7 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
    int stp_curve_rescale ( stp_curve_t * stp_curve_t *  curve,
    stp_curve_compose_t stp_curve_compose_t  mode,
    stp_curve_bounds_t stp_curve_bounds_t  bounds_mode
    bounds_mode the bounds exceeding mode.
    -

    Returns:
    FALSE if this would exceed floating point limits
    +
    Returns:
    FALSE if this would exceed floating point limits
    -

    +

    - + @@ -1719,11 +1710,11 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
    @@ -1678,7 +1669,7 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
    int stp_curve_set_bounds ( stp_curve_t * stp_curve_t *  curve,
    high the upper bound.
    -

    Returns:
    FALSE if any existing points on the curve are outside the bounds.
    +
    Returns:
    FALSE if any existing points on the curve are outside the bounds.
    -

    +

    - + @@ -1772,11 +1763,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -1731,7 +1722,7 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
    int stp_curve_set_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of doubles (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1825,11 +1816,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -1784,7 +1775,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_data_points ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of points (must be at least count in size). The first point must have X=0, and each point must have an X value at least .000001 greater than the previous point. If the curve is not a wraparound curve, the last point must have X=1.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1878,11 +1869,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -1837,7 +1828,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_float_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of floats (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1924,11 +1915,11 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
    @@ -1890,7 +1881,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_gamma ( stp_curve_t * stp_curve_t *  curve,
    f_gamma the gamma value to set.
    -

    Returns:
    FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around.
    +
    Returns:
    FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around.
    -

    +

    - + @@ -1977,11 +1968,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -1936,7 +1927,7 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
    int stp_curve_set_int_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of integers (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + - + @@ -2023,11 +2014,11 @@ Set the curve interpolation type.
    @@ -1989,13 +1980,13 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_interpolation_type ( stp_curve_t * stp_curve_t *  curve,
    stp_curve_type_t stp_curve_type_t  itype
    itype the interpolation type.
    -

    Returns:
    1 on success, or 0 if itype is invalid.
    +
    Returns:
    1 on success, or 0 if itype is invalid.
    -

    +

    - + @@ -2076,11 +2067,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2035,7 +2026,7 @@ Set the curve interpolation type.
    int stp_curve_set_long_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of longs (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -2129,11 +2120,11 @@ This call destroys any gamma value assigned to the curve.
    Par
    @@ -2088,7 +2079,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_point ( stp_curve_t * stp_curve_t *  curve,
    data the value to set where to.
    -

    Returns:
    FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve.
    +
    Returns:
    FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve.
    -

    +

    - + @@ -2182,11 +2173,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2141,7 +2132,7 @@ This call destroys any gamma value assigned to the curve.
    Par
    int stp_curve_set_short_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of shorts (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + - + @@ -2229,7 +2220,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2194,13 +2185,13 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_subrange ( stp_curve_t * stp_curve_t *  curve,
    const stp_curve_t * const stp_curve_t *  range,
    -

    +

    - + @@ -2278,11 +2269,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2237,7 +2228,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_uint_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of unsigned integers (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -2331,11 +2322,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2290,7 +2281,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_ulong_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of unsigned longs (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -2384,11 +2375,11 @@ If any of the data points fall outside the bounds, the operation is not performe
    @@ -2343,7 +2334,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    int stp_curve_set_ushort_data ( stp_curve_t * stp_curve_t *  curve,
    data a pointer to an array of unsigned shorts (must be at least count in size).
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -2431,11 +2422,11 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
    @@ -2402,7 +2393,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    const stp_curve_t * const stp_curve_t *  curve
    curve the curve to use.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -2468,12 +2459,12 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
    @@ -2443,7 +2434,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
    char* stp_curve_write_string ( const stp_curve_t * const stp_curve_t *  curve  ) 
    curve the curve to use.
    -

    Returns:
    a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it.
    +
    Returns:
    a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it.
    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html index 718042c..8a70c36 100644 --- a/doc/gutenprint/html/group__image.html +++ b/doc/gutenprint/html/group__image.html @@ -2,18 +2,9 @@ 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... @@ -22,39 +13,39 @@ - + - + - + - - + - + - + - + - + - + - + - +
     The image type is an abstract data type for interfacing with the image creation program. More...

    Defines

    #define STP_CHANNEL_LIMIT   (32)
    #define STP_CHANNEL_LIMIT   (32)

    Typedefs

    typedef stp_image stp_image_t
    typedef stp_image stp_image_t
     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.

    Enumerations

    enum  stp_image_status_t { STP_IMAGE_STATUS_OK, -STP_IMAGE_STATUS_ABORT +
    enum  stp_image_status_t { STP_IMAGE_STATUS_OK, +STP_IMAGE_STATUS_ABORT }
     Image status. More...
     Image status. More...

    Functions

    void stp_image_init (stp_image_t *image)
    void stp_image_init (stp_image_t *image)
    void stp_image_reset (stp_image_t *image)
    void stp_image_reset (stp_image_t *image)
    int stp_image_width (stp_image_t *image)
    int stp_image_width (stp_image_t *image)
    int stp_image_height (stp_image_t *image)
    int stp_image_height (stp_image_t *image)
    stp_image_status_t stp_image_get_row (stp_image_t *image, unsigned char *data, size_t limit, int row)
    stp_image_status_t stp_image_get_row (stp_image_t *image, unsigned char *data, size_t limit, int row)
    const char * stp_image_get_appname (stp_image_t *image)
    const char * stp_image_get_appname (stp_image_t *image)
    void stp_image_conclude (stp_image_t *image)
    void stp_image_conclude (stp_image_t *image)

    Detailed Description

    The image type is an abstract data type for interfacing with the image creation program.

    Define Documentation

    -

    +

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

    Typedef Documentation

    -

    +

    The image type is an abstract data type for interfacing with the image creation program.

    -It provides callbacks to functions defined within the client application which are called while printing the image. +It provides callbacks to functions defined within the client application which are called while printing the image.

    @@ -100,17 +91,17 @@ The maximum number of channels.

    Enumeration Type Documentation

    -

    +

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

    Enumerator:
    - +
    enum stp_image_status_t enum stp_image_status_t
    - -
    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.
    @@ -138,7 +129,7 @@ An error occured, or the job was aborted.

    Function Documentation

    -

    +

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

    +

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

    +

    - + @@ -243,7 +234,7 @@ An error occured, or the job was aborted.
    stp_image_status_t stp_image_get_row stp_image_status_t stp_image_get_row (  stp_image_t *  image,
    -

    +

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

    +

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

    +

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

    +

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

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html index 917cb88..036e11e 100644 --- a/doc/gutenprint/html/group__intl.html +++ b/doc/gutenprint/html/group__intl.html @@ -2,42 +2,33 @@ 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... - + - + - + - + - + - + - +

    Defines

    #define textdomain(String)   (String)
    #define textdomain(String)   (String)
    #define gettext(String)   (String)
    #define gettext(String)   (String)
    #define dgettext(Domain, Message)   (Message)
    #define dgettext(Domain, Message)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define _(String)   (String)
    #define _(String)   (String)
    #define N_(String)   (String)
    #define N_(String)   (String)

    Detailed Description

    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

    -

    +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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html index 41f1bd7..f9f8009 100644 --- a/doc/gutenprint/html/group__intl__internal.html +++ b/doc/gutenprint/html/group__intl__internal.html @@ -2,42 +2,33 @@ 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... - + - + - + - + - + - + - +

    Defines

    #define textdomain(String)   (String)
    #define textdomain(String)   (String)
    #define gettext(String)   (String)
    #define gettext(String)   (String)
    #define dgettext(Domain, Message)   (Message)
    #define dgettext(Domain, Message)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define _(String)   (String)
    #define _(String)   (String)
    #define N_(String)   (String)
    #define N_(String)   (String)

    Detailed Description

    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

    -

    +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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html index f550381..6f5653e 100644 --- a/doc/gutenprint/html/group__list.html +++ b/doc/gutenprint/html/group__list.html @@ -2,131 +2,122 @@ 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... - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Typedefs

    typedef stp_list_item stp_list_item_t
    typedef stp_list_item stp_list_item_t
     The list item opaque data type.
    typedef stp_list stp_list_t
     The list item opaque data type.
    typedef stp_list stp_list_t
     The list opaque data type.
    typedef void(* stp_node_freefunc )(void *)
     The list opaque data type.
    typedef void(* stp_node_freefunc )(void *)
     A callback function to free the data a node contains.
    typedef void *(* stp_node_copyfunc )(const void *)
     A callback function to free the data a node contains.
    typedef void *(* stp_node_copyfunc )(const void *)
     A callback function to copy the data a node contains.
    typedef const char *(* stp_node_namefunc )(const void *)
     A callback function to copy the data a node contains.
    typedef const char *(* stp_node_namefunc )(const void *)
     A callback function to get the name of a node.
    typedef int(* stp_node_sortfunc )(const void *, const void *)
     A callback function to get the name of a node.
    typedef int(* stp_node_sortfunc )(const void *, const void *)
     A callback function to compare two nodes.
     A callback function to compare two nodes.

    Functions

    void stp_list_node_free_data (void *item)
    void stp_list_node_free_data (void *item)
     Free node data allocated with stp_malloc.
    stp_list_t * stp_list_create (void)
     Free node data allocated with stp_malloc.
    stp_list_t * stp_list_create (void)
     Create a new list object.
    stp_list_t * stp_list_copy (const stp_list_t *list)
     Create a new list object.
    stp_list_t * stp_list_copy (const stp_list_t *list)
     Copy and allocate a list object.
    int stp_list_destroy (stp_list_t *list)
     Copy and allocate a list object.
    int stp_list_destroy (stp_list_t *list)
     Destroy a list object.
    stp_list_item_t * stp_list_get_start (const stp_list_t *list)
     Destroy a list object.
    stp_list_item_t * stp_list_get_start (const stp_list_t *list)
     Find the first item in a list.
    stp_list_item_t * stp_list_get_end (const stp_list_t *list)
     Find the first item in a list.
    stp_list_item_t * stp_list_get_end (const stp_list_t *list)
     Find the last item in a list.
    stp_list_item_t * stp_list_get_item_by_index (const stp_list_t *list, int idx)
     Find the last item in a list.
    stp_list_item_t * stp_list_get_item_by_index (const stp_list_t *list, int idx)
     Find an item in a list by its index.
    stp_list_item_t * stp_list_get_item_by_name (const stp_list_t *list, const char *name)
     Find an item in a list by its index.
    stp_list_item_t * stp_list_get_item_by_name (const stp_list_t *list, const char *name)
     Find an item in a list by its name.
    stp_list_item_t * stp_list_get_item_by_long_name (const stp_list_t *list, const char *long_name)
     Find an item in a list by its name.
    stp_list_item_t * stp_list_get_item_by_long_name (const stp_list_t *list, const char *long_name)
     Find an item in a list by its long name.
    int stp_list_get_length (const stp_list_t *list)
     Find an item in a list by its long name.
    int stp_list_get_length (const stp_list_t *list)
     Get the length of a list.
    void stp_list_set_freefunc (stp_list_t *list, stp_node_freefunc freefunc)
     Get the length of a list.
    void stp_list_set_freefunc (stp_list_t *list, stp_node_freefunc freefunc)
     Set a list node free function.
    stp_node_freefunc stp_list_get_freefunc (const stp_list_t *list)
     Set a list node free function.
    stp_node_freefunc stp_list_get_freefunc (const stp_list_t *list)
     Get a list node free function.
    void stp_list_set_copyfunc (stp_list_t *list, stp_node_copyfunc copyfunc)
     Get a list node free function.
    void stp_list_set_copyfunc (stp_list_t *list, stp_node_copyfunc copyfunc)
     Set a list node copy function.
    stp_node_copyfunc stp_list_get_copyfunc (const stp_list_t *list)
     Set a list node copy function.
    stp_node_copyfunc stp_list_get_copyfunc (const stp_list_t *list)
     Get a list node copy function.
    void stp_list_set_namefunc (stp_list_t *list, stp_node_namefunc namefunc)
     Get a list node copy function.
    void stp_list_set_namefunc (stp_list_t *list, stp_node_namefunc namefunc)
     Set a list node name function.
    stp_node_namefunc stp_list_get_namefunc (const stp_list_t *list)
     Set a list node name function.
    stp_node_namefunc stp_list_get_namefunc (const stp_list_t *list)
     Get a list node name function.
    void stp_list_set_long_namefunc (stp_list_t *list, stp_node_namefunc long_namefunc)
     Get a list node name function.
    void stp_list_set_long_namefunc (stp_list_t *list, stp_node_namefunc long_namefunc)
     Set a list node long name function.
    stp_node_namefunc stp_list_get_long_namefunc (const stp_list_t *list)
     Set a list node long name function.
    stp_node_namefunc stp_list_get_long_namefunc (const stp_list_t *list)
     Get a list node long name function.
    void stp_list_set_sortfunc (stp_list_t *list, stp_node_sortfunc sortfunc)
     Get a list node long name function.
    void stp_list_set_sortfunc (stp_list_t *list, stp_node_sortfunc sortfunc)
     Set a list node sort function.
    stp_node_sortfunc stp_list_get_sortfunc (const stp_list_t *list)
     Set a list node sort function.
    stp_node_sortfunc stp_list_get_sortfunc (const stp_list_t *list)
     Get a list node sort function.
    int stp_list_item_create (stp_list_t *list, stp_list_item_t *next, const void *data)
     Get a list node sort function.
    int stp_list_item_create (stp_list_t *list, stp_list_item_t *next, const void *data)
     Create a new list item.
    int stp_list_item_destroy (stp_list_t *list, stp_list_item_t *item)
     Create a new list item.
    int stp_list_item_destroy (stp_list_t *list, stp_list_item_t *item)
     Destroy a list item.
    stp_list_item_t * stp_list_item_prev (const stp_list_item_t *item)
     Destroy a list item.
    stp_list_item_t * stp_list_item_prev (const stp_list_item_t *item)
     Get the previous item in the list.
    stp_list_item_t * stp_list_item_next (const stp_list_item_t *item)
     Get the previous item in the list.
    stp_list_item_t * stp_list_item_next (const stp_list_item_t *item)
     Get the next item in the list.
    void * stp_list_item_get_data (const stp_list_item_t *item)
     Get the next item in the list.
    void * stp_list_item_get_data (const stp_list_item_t *item)
     Get the data associated with a list item.
    int stp_list_item_set_data (stp_list_item_t *item, void *data)
     Get the data associated with a list item.
    int stp_list_item_set_data (stp_list_item_t *item, void *data)
     Set the data associated with a list item.
     Set the data associated with a list item.

    Detailed Description

    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

    -

    +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

    +

    @@ -142,16 +133,16 @@ It supports all of the operations you might want in a list (insert, remove, iter

    The list item opaque data type.

    -This object is a node in the list. +This object is a node in the list.

    - +
    typedef struct stp_list_item stp_list_item_t typedef struct stp_list_item stp_list_item_t
    -

    +

    @@ -167,16 +158,16 @@ This object is a node in the list.

    The list opaque data type.

    -This object represents the list as a whole. +This object represents the list as a whole.

    - +
    typedef struct stp_list stp_list_t typedef struct stp_list stp_list_t
    -

    +

    @@ -192,16 +183,16 @@ This object represents the list as a whole.

    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. +The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data.

    - +
    typedef void*(* stp_node_copyfunc)(const void *) typedef void*(* stp_node_copyfunc)(const void *)
    -

    +

    @@ -217,16 +208,16 @@ The parameter is a pointer to the node data. The return value is a pointer to th

    A callback function to free the data a node contains.

    -The parameter is a pointer to the node data. +The parameter is a pointer to the node data.

    - +
    typedef void(* stp_node_freefunc)(void *) typedef void(* stp_node_freefunc)(void *)
    -

    +

    @@ -242,16 +233,16 @@ The parameter is a pointer to the node data.

    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. +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.

    - +
    typedef const char*(* stp_node_namefunc)(const void *) typedef const char*(* stp_node_namefunc)(const void *)
    -

    +

    @@ -267,19 +258,19 @@ The parameter is a pointer to the node data. The return value is a pointer to th

    A callback function to compare two nodes.

    -The two parameters are pointers to node data. The return value is <0 if the first sorts before the second, 0 if they sort identically, and >0 if the first sorts after the second. +The two parameters are pointers to node data. The return value is <0 if the first sorts before the second, 0 if they sort identically, and >0 if the first sorts after the second.

    - +
    typedef int(* stp_node_sortfunc)(const void *, const void *) typedef int(* stp_node_sortfunc)(const void *, const void *)

    Function Documentation

    -

    +

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

    Copy and allocate a list object.

    -list must be a valid list object previously created with stp_list_create().

    Parameters:
    +list must be a valid list object previously created with stp_list_create().
    Parameters:
    stp_list_t* stp_list_copy stp_list_t* stp_list_copy ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to copy.
    -
    Returns:
    a pointer to the new copy of the list.
    +
    Returns:
    a pointer to the new copy of the list.
    -

    +

    - + @@ -334,11 +325,11 @@ list must be a valid list object previously created with

    +

    stp_list_t* stp_list_create stp_list_t* stp_list_create (  void 
    - + @@ -370,19 +361,19 @@ It is an error to destroy the list more than once.
    Parameters
    @@ -346,7 +337,7 @@ Create a new list object.
    int stp_list_destroy ( stp_list_t * stp_list_t *  list  ) 
    list the list to destroy.
    -
    Returns:
    0 on success, 1 on failure.
    +
    Returns:
    0 on success, 1 on failure.
    -

    +

    - + - + @@ -406,19 +397,19 @@ Get a list node copy function.
    stp_node_copyfunc stp_list_get_copyfunc stp_node_copyfunc stp_list_get_copyfunc ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    the function previously set with stp_list_set_copyfunc, or NULL if no function has been set.
    +
    Returns:
    the function previously set with stp_list_set_copyfunc, or NULL if no function has been set.
    -

    +

    - + - + @@ -442,19 +433,19 @@ Find the last item in a list.
    stp_list_item_t* stp_list_get_end stp_list_item_t* stp_list_get_end ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    a pointer to the last list item, or NULL if the list is empty.
    +
    Returns:
    a pointer to the last list item, or NULL if the list is empty.
    -

    +

    - + - + @@ -478,19 +469,19 @@ Get a list node free function.
    stp_node_freefunc stp_list_get_freefunc stp_node_freefunc stp_list_get_freefunc ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    the function previously set with stp_list_set_freefunc, or NULL if no function has been set.
    +
    Returns:
    the function previously set with stp_list_set_freefunc, or NULL if no function has been set.
    -

    +

    - + - + @@ -524,19 +515,19 @@ Find an item in a list by its index.
    stp_list_item_t* stp_list_get_item_by_index stp_list_item_t* stp_list_get_item_by_index ( const stp_list_t * const stp_list_t *  list,
    idx the index to find.
    -
    Returns:
    a pointer to the list item, or NULL if the index is invalid or the list is empty.
    +
    Returns:
    a pointer to the list item, or NULL if the index is invalid or the list is empty.
    -

    +

    - + - + @@ -570,19 +561,19 @@ Find an item in a list by its long name.
    stp_list_item_t* stp_list_get_item_by_long_name stp_list_item_t* stp_list_get_item_by_long_name ( const stp_list_t * const stp_list_t *  list,
    long_name the long name to find.
    -
    Returns:
    a pointer to the list item, or NULL if the long name is invalid or the list is empty.
    +
    Returns:
    a pointer to the list item, or NULL if the long name is invalid or the list is empty.
    -

    +

    - + - + @@ -616,11 +607,11 @@ Find an item in a list by its name.
    stp_list_item_t* stp_list_get_item_by_name stp_list_item_t* stp_list_get_item_by_name ( const stp_list_t * const stp_list_t *  list,
    name the name to find.
    -
    Returns:
    a pointer to the list item, or NULL if the name is invalid or the list is empty.
    +
    Returns:
    a pointer to the list item, or NULL if the name is invalid or the list is empty.
    -

    +

    - + @@ -652,19 +643,19 @@ Get the length of a list.
    @@ -628,7 +619,7 @@ Find an item in a list by its name.
    int stp_list_get_length ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -

    Returns:
    the list length (number of list items).
    +
    Returns:
    the list length (number of list items).
    -

    +

    - + - + @@ -688,19 +679,19 @@ Get a list node long name function.
    stp_node_namefunc stp_list_get_long_namefunc stp_node_namefunc stp_list_get_long_namefunc ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set.
    +
    Returns:
    the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set.
    -

    +

    - + - + @@ -724,19 +715,19 @@ Get a list node name function.
    stp_node_namefunc stp_list_get_namefunc stp_node_namefunc stp_list_get_namefunc ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    the function previously set with stp_list_set_namefunc, or NULL if no function has been set.
    +
    Returns:
    the function previously set with stp_list_set_namefunc, or NULL if no function has been set.
    -

    +

    - + - + @@ -760,19 +751,19 @@ Get a list node sort function.
    stp_node_sortfunc stp_list_get_sortfunc stp_node_sortfunc stp_list_get_sortfunc ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    the function previously set with stp_list_set_sortfunc, or NULL if no function has been set.
    +
    Returns:
    the function previously set with stp_list_set_sortfunc, or NULL if no function has been set.
    -

    +

    - + - + @@ -796,11 +787,11 @@ Find the first item in a list.
    stp_list_item_t* stp_list_get_start stp_list_item_t* stp_list_get_start ( const stp_list_t * const stp_list_t *  list  ) 
    list the list to use.
    -
    Returns:
    a pointer to the first list item, or NULL if the list is empty.
    +
    Returns:
    a pointer to the first list item, or NULL if the list is empty.
    -

    +

    - + - + @@ -849,11 +840,11 @@ Create a new list item.
    @@ -808,13 +799,13 @@ Find the first item in a list.
    int stp_list_item_create ( stp_list_t * stp_list_t *  list,
    stp_list_item_t * stp_list_item_t *  next,
    data the data the list item will contain.
    -

    Returns:
    0 on success, 1 on failure (if data is NULL, for example).
    +
    Returns:
    0 on success, 1 on failure (if data is NULL, for example).
    -

    +

    - + - + @@ -895,11 +886,11 @@ Destroy a list item.
    @@ -861,13 +852,13 @@ Create a new list item.
    int stp_list_item_destroy ( stp_list_t * stp_list_t *  list,
    stp_list_item_t * stp_list_item_t *  item
    item the item to destroy.
    -

    Returns:
    0 on success, 1 on failure.
    +
    Returns:
    0 on success, 1 on failure.
    -

    +

    - + @@ -931,19 +922,19 @@ Get the data associated with a list item.
    @@ -907,7 +898,7 @@ Destroy a list item.
    void* stp_list_item_get_data ( const stp_list_item_t * const stp_list_item_t *  item  ) 
    item the list item to use.
    -

    Returns:
    the data associated with item.
    +
    Returns:
    the data associated with item.
    -

    +

    - + - + @@ -967,19 +958,19 @@ Get the next item in the list.
    stp_list_item_t* stp_list_item_next stp_list_item_t* stp_list_item_next ( const stp_list_item_t * const stp_list_item_t *  item  ) 
    item the item to start from.
    -
    Returns:
    a pointer to the list item following from item, or NULL if item is the end of the list.
    +
    Returns:
    a pointer to the list item following from item, or NULL if item is the end of the list.
    -

    +

    - + - + @@ -1003,11 +994,11 @@ Get the previous item in the list.
    stp_list_item_t* stp_list_item_prev stp_list_item_t* stp_list_item_prev ( const stp_list_item_t * const stp_list_item_t *  item  ) 
    item the item to start from.
    -
    Returns:
    a pointer to the list item prior to item, or NULL if item is the start of the list.
    +
    Returns:
    a pointer to the list item prior to item, or NULL if item is the start of the list.
    -

    +

    - + @@ -1050,11 +1041,11 @@ Set the data associated with a list item.
    @@ -1015,7 +1006,7 @@ Get the previous item in the list.
    int stp_list_item_set_data ( stp_list_item_t * stp_list_item_t *  item,
    data the data to set.
    -

    Returns:
    0 on success, 1 on failure (if data is NULL).
    +
    Returns:
    0 on success, 1 on failure (if data is NULL).
    -

    +

    @@ -1083,13 +1074,13 @@ Free node data allocated with stp_malloc.

    This function is indended for use as an stp_node_freefunc, which uses stp_free to free the node data.

    Parameters:
    - +
    item the node data to free
    item the node data to free
    -

    +

    - + - + @@ -1128,13 +1119,13 @@ Set a list node copy function. This callback function will be called whenever a list item is copied. Its intended use is for automatic object copying (since C lacks a copy constructor).
    Parameters:
    @@ -1097,13 +1088,13 @@ This function is indended for use as an stp_node_freefunc, which uses stp_free t
    void stp_list_set_copyfunc ( stp_list_t * stp_list_t *  list,
    stp_node_copyfunc stp_node_copyfunc  copyfunc
    - +
    list the list to use.
    copyfunc the function to set.
    copyfunc the function to set.
    -

    +

    - + - + @@ -1173,13 +1164,13 @@ Set a list node free function. This callback function will be called whenever a list item is destroyed. Its intended use is for automatic object destruction and any other cleanup required.
    Parameters:
    @@ -1142,13 +1133,13 @@ This callback function will be called whenever a list item is copied. Its intend
    void stp_list_set_freefunc ( stp_list_t * stp_list_t *  list,
    stp_node_freefunc stp_node_freefunc  freefunc
    - +
    list the list to use.
    freefunc the function to set.
    freefunc the function to set.
    -

    +

    - + - + @@ -1218,13 +1209,13 @@ Set a list node long name function. This callback function will be called whenever the long name of a list item needs to be determined. This is used to find list items by long name.
    Parameters:
    @@ -1187,13 +1178,13 @@ This callback function will be called whenever a list item is destroyed. Its int
    void stp_list_set_long_namefunc ( stp_list_t * stp_list_t *  list,
    stp_node_namefunc stp_node_namefunc  long_namefunc
    - +
    list the list to use.
    long_namefunc the function to set.
    long_namefunc the function to set.
    -

    +

    - + - + @@ -1263,13 +1254,13 @@ Set a list node name function. This callback function will be called whenever the name of a list item needs to be determined. This is used to find list items by name.
    Parameters:
    @@ -1232,13 +1223,13 @@ This callback function will be called whenever the long name of a list item need
    void stp_list_set_namefunc ( stp_list_t * stp_list_t *  list,
    stp_node_namefunc stp_node_namefunc  namefunc
    - +
    list the list to use.
    namefunc the function to set.
    namefunc the function to set.
    -

    +

    - + - + @@ -1308,14 +1299,14 @@ Set a list node sort function. This callback function will be called to determine the sort order for list items in sorted lists.
    Parameters:
    @@ -1277,13 +1268,13 @@ This callback function will be called whenever the name of a list item needs to
    void stp_list_set_sortfunc ( stp_list_t * stp_list_t *  list,
    stp_node_sortfunc stp_node_sortfunc  sortfunc
    - +
    list the list to use.
    sortfunc the function to set.
    sortfunc the function to set.
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html index d1284da..088a171 100644 --- a/doc/gutenprint/html/group__papersize.html +++ b/doc/gutenprint/html/group__papersize.html @@ -2,18 +2,9 @@ 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... @@ -22,40 +13,40 @@ - - + - + - - + + - - + + - - + + - - + +
     The papersize data type. More...

    Enumerations

    enum  stp_papersize_unit_t { PAPERSIZE_ENGLISH_STANDARD, -PAPERSIZE_METRIC_STANDARD, -PAPERSIZE_ENGLISH_EXTENDED, -PAPERSIZE_METRIC_EXTENDED +
    enum  stp_papersize_unit_t { PAPERSIZE_ENGLISH_STANDARD, +PAPERSIZE_METRIC_STANDARD, +PAPERSIZE_ENGLISH_EXTENDED, +PAPERSIZE_METRIC_EXTENDED }
     Units of measurement. More...
     Units of measurement. More...

    Functions

    int stp_known_papersizes (void)
    int stp_known_papersizes (void)
     Get the number of available papersizes.
    const stp_papersize_t * stp_get_papersize_by_name (const char *name)
     Get the number of available papersizes.
    const stp_papersize_t * stp_get_papersize_by_name (const char *name)
     Get a papersize by name.
    const stp_papersize_t * stp_get_papersize_by_size (int length, int width)
     Get a papersize by name.
    const stp_papersize_t * stp_get_papersize_by_size (int length, int width)
     Get a papersize by size.
    const stp_papersize_t * stp_get_papersize_by_index (int idx)
     Get a papersize by size.
    const stp_papersize_t * stp_get_papersize_by_index (int idx)
     Get a papersize by its index number.
    void stp_default_media_size (const stp_vars_t *v, int *width, int *height)
     Get a papersize by its index number.
    void stp_default_media_size (const stp_vars_t *v, int *width, int *height)

    Detailed Description

    The papersize describes the dimensions of a paper.

    Enumeration Type Documentation

    -

    +

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

    Enumerator:
    - +
    enum stp_papersize_unit_t enum stp_papersize_unit_t
    - - - -
    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).
    @@ -87,7 +78,7 @@ Metric units (optional paper, not displayed by default).

    Function Documentation

    -

    +

    - + @@ -130,7 +121,7 @@ Metric units (optional paper, not displayed by default).
    @@ -95,7 +86,7 @@ Metric units (optional paper, not displayed by default).
    void stp_default_media_size ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    @@ -162,11 +153,11 @@ Get a papersize by its index number.
    idx the index number. This must not be greater than (total number of papers - 1).
    -

    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    -

    +

    @@ -198,11 +189,11 @@ Get a papersize by name.
    name the short unique name of the paper.
    -

    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    -

    +

    @@ -244,11 +235,11 @@ The nearest available size to the size requested will be found.
    width the width of the paper
    -

    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the papersize, or NULL on failure. The pointer should not be freed.
    -

    +

    @@ -275,12 +266,12 @@ The nearest available size to the size requested will be found.

    Get the number of available papersizes.

    -

    Returns:
    the number of papersizes.
    +
    Returns:
    the number of papersizes.
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html index 2f8ef0c..275fc19 100644 --- a/doc/gutenprint/html/group__printer.html +++ b/doc/gutenprint/html/group__printer.html @@ -2,18 +2,9 @@ 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... @@ -23,82 +14,82 @@ - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - +
    struct  stp_family

    Typedefs

    typedef stp_printer stp_printer_t
    typedef stp_printer stp_printer_t
     The printer opaque data type (representation of printer model).
    typedef stp_family stp_family_t
     The printer opaque data type (representation of printer model).
    typedef stp_family stp_family_t

    Functions

    int stp_printer_model_count (void)
    int stp_printer_model_count (void)
     Get the number of available printer models.
    const stp_printer_t * stp_get_printer_by_index (int idx)
     Get the number of available printer models.
    const stp_printer_t * stp_get_printer_by_index (int idx)
     Get a printer model by its index number.
    const stp_printer_t * stp_get_printer_by_long_name (const char *long_name)
     Get a printer model by its index number.
    const stp_printer_t * stp_get_printer_by_long_name (const char *long_name)
     Get a printer model by its long (translated) name.
    const stp_printer_t * stp_get_printer_by_driver (const char *driver)
     Get a printer model by its long (translated) name.
    const stp_printer_t * stp_get_printer_by_driver (const char *driver)
     Get a printer model by its short name.
    const stp_printer_t * stp_get_printer (const stp_vars_t *v)
     Get a printer model by its short name.
    const stp_printer_t * stp_get_printer (const stp_vars_t *v)
     Get the printer model from a vars object.
    int stp_get_printer_index_by_driver (const char *driver)
     Get the printer model from a vars object.
    int stp_get_printer_index_by_driver (const char *driver)
     Get the printer index number from the printer model short (driver) name.
    const char * stp_printer_get_long_name (const stp_printer_t *p)
     Get the printer index number from the printer model short (driver) name.
    const char * stp_printer_get_long_name (const stp_printer_t *p)
     Get a printer model's long (translated) name.
    const char * stp_printer_get_driver (const stp_printer_t *p)
     Get a printer model's long (translated) name.
    const char * stp_printer_get_driver (const stp_printer_t *p)
     Get a printer model's short (driver) name.
    const char * stp_printer_get_family (const stp_printer_t *p)
     Get a printer model's short (driver) name.
    const char * stp_printer_get_family (const stp_printer_t *p)
     Get a printer model's family name.
    const char * stp_printer_get_manufacturer (const stp_printer_t *p)
     Get a printer model's family name.
    const char * stp_printer_get_manufacturer (const stp_printer_t *p)
     Get a printer model's manufacturer's name.
    int stp_printer_get_model (const stp_printer_t *p)
     Get a printer model's manufacturer's name.
    int stp_printer_get_model (const stp_printer_t *p)
     Get a printer model's model number.
    const stp_vars_t * stp_printer_get_defaults (const stp_printer_t *p)
     Get a printer model's model number.
    const stp_vars_t * stp_printer_get_defaults (const stp_printer_t *p)
     Get the default vars for a particular printer model.
    void stp_set_printer_defaults (stp_vars_t *v, const stp_printer_t *p)
     Get the default vars for a particular printer model.
    void stp_set_printer_defaults (stp_vars_t *v, const stp_printer_t *p)
     Set a vars object to use a particular driver, and set the parameter to its defaults.
    int stp_print (const stp_vars_t *v, stp_image_t *image)
     Set a vars object to use a particular driver, and set the parameter to its defaults.
    int stp_print (const stp_vars_t *v, stp_image_t *image)
     Print the image.
    int stp_start_job (const stp_vars_t *v, stp_image_t *image)
     Print the image.
    int stp_start_job (const stp_vars_t *v, stp_image_t *image)
     Start a print job.
    int stp_end_job (const stp_vars_t *v, stp_image_t *image)
     Start a print job.
    int stp_end_job (const stp_vars_t *v, stp_image_t *image)
     End a print job.
    int stp_get_model_id (const stp_vars_t *v)
     End a print job.
    int stp_get_model_id (const stp_vars_t *v)
    int stp_verify_printer_params (stp_vars_t *v)
    int stp_verify_printer_params (stp_vars_t *v)
    int stp_family_register (stp_list_t *family)
    int stp_family_register (stp_list_t *family)
    int stp_family_unregister (stp_list_t *family)
    int stp_family_unregister (stp_list_t *family)
    void stp_initialize_printer_defaults (void)
    void stp_initialize_printer_defaults (void)
    stp_parameter_list_t stp_printer_list_parameters (const stp_vars_t *v)
    stp_parameter_list_t stp_printer_list_parameters (const stp_vars_t *v)
    void stp_printer_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    void stp_printer_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    const char * stp_describe_output (const stp_vars_t *v)
    const char * stp_describe_output (const stp_vars_t *v)

    Detailed Description

    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

    -

    +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

    +

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

    +

    @@ -147,7 +138,7 @@ The printer opaque data type (representation of printer model).
    - +
    typedef struct stp_printer stp_printer_t typedef struct stp_printer stp_printer_t

    Function Documentation

    -

    +

    - + @@ -175,7 +166,7 @@ The printer opaque data type (representation of printer model).
    @@ -155,7 +146,7 @@ The printer opaque data type (representation of printer model).
    const char* stp_describe_output ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -217,11 +208,11 @@ End a print job.
    @@ -183,7 +174,7 @@ The printer opaque data type (representation of printer model).
    int stp_end_job ( const stp_vars_t * const stp_vars_t *  v,
    image the image to print.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -249,7 +240,7 @@ End a print job.
    @@ -229,7 +220,7 @@ End a print job.
    int stp_family_register ( stp_list_t * stp_list_t *  family  ) 
    -

    +

    - + @@ -277,7 +268,7 @@ End a print job.
    @@ -257,7 +248,7 @@ End a print job.
    int stp_family_unregister ( stp_list_t * stp_list_t *  family  ) 
    -

    +

    - + @@ -305,15 +296,15 @@ End a print job.
    @@ -285,7 +276,7 @@ End a print job.
    int stp_get_model_id ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + - + @@ -337,17 +328,17 @@ Get the printer model from a vars object.
    const stp_printer_t* stp_get_printer const stp_printer_t* stp_get_printer ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    -

    +

    - + @@ -373,17 +364,17 @@ Get a printer model by its short name.
    const stp_printer_t* stp_get_printer_by_driver const stp_printer_t* stp_get_printer_by_driver (  const char *  driver
    driver the printer model's short (driver) name.
    -
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    -

    +

    - + @@ -409,17 +400,17 @@ Get a printer model by its index number.
    const stp_printer_t* stp_get_printer_by_index const stp_printer_t* stp_get_printer_by_index (  int  idx
    idx the index number. This must not be greater than (total number of printers - 1).
    -
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    -

    +

    - + @@ -445,11 +436,11 @@ Get a printer model by its long (translated) name.
    const stp_printer_t* stp_get_printer_by_long_name const stp_printer_t* stp_get_printer_by_long_name (  const char *  long_name
    long_name the printer model's long (translated) name.
    -
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    +
    Returns:
    a pointer to the printer model, or NULL on failure. The pointer should not be freed.
    -

    +

    @@ -476,17 +467,17 @@ Get a printer model by its long (translated) name.

    Get the printer index number from the printer model short (driver) name.

    -

    Deprecated:
    There should never be any need to use this function.
    Parameters:
    +
    Deprecated:
    There should never be any need to use this function.
    +
    Parameters:
    driver the printer model's short (driver) name.
    -
    Returns:
    the index number, or -1 on failure.
    -
    +
    Returns:
    the index number, or -1 on failure.
    -

    +

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

    +

    - + @@ -557,11 +548,11 @@ Print the image.
    @@ -522,7 +513,7 @@ Get the printer index number from the printer model short (driver) name.
    int stp_print ( const stp_vars_t * const stp_vars_t *  v,
    image the image to print.
    -

    Returns:
    0 on failure, 1 on success, 2 on abort requested by the driver.
    +
    Returns:
    0 on failure, 1 on success, 2 on abort requested by the driver.
    -

    +

    - + @@ -604,15 +595,15 @@ Print the image.
    @@ -569,7 +560,7 @@ Print the image.
    void stp_printer_describe_parameter ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + - + @@ -636,11 +627,11 @@ The default vars should be copied to a new vars object and customised prior to p
    const stp_vars_t* stp_printer_get_defaults const stp_vars_t* stp_printer_get_defaults ( const stp_printer_t * const stp_printer_t *  p  ) 
    p the printer model to use.
    -
    Returns:
    the printer model's default vars.
    +
    Returns:
    the printer model's default vars.
    -

    +

    - + @@ -672,11 +663,11 @@ Get a printer model's short (driver) name.
    @@ -648,7 +639,7 @@ The default vars should be copied to a new vars object and customised prior to p
    const char* stp_printer_get_driver ( const stp_printer_t * const stp_printer_t *  p  ) 
    p the printer model to use.
    -

    Returns:
    the short name (should never be freed).
    +
    Returns:
    the short name (should never be freed).
    -

    +

    - + @@ -708,11 +699,11 @@ The family name is the name of the modular "family" driver this model uses.
    @@ -684,7 +675,7 @@ Get a printer model's short (driver) name.
    const char* stp_printer_get_family ( const stp_printer_t * const stp_printer_t *  p  )  p the printer model to use.
    -

    Returns:
    the family name (should never be freed).
    +
    Returns:
    the family name (should never be freed).
    -

    +

    - + @@ -744,11 +735,11 @@ Get a printer model's long (translated) name.
    @@ -720,7 +711,7 @@ The family name is the name of the modular "family" driver this model uses.
    		const char* stp_printer_get_long_name ( const stp_printer_t * const stp_printer_t *  p  ) 
    p the printer model to use.
    -

    Returns:
    the long name (should never be freed).
    +
    Returns:
    the long name (should never be freed).
    -

    +

    - + @@ -780,11 +771,11 @@ Get a printer model's manufacturer's name.
    @@ -756,7 +747,7 @@ Get a printer model's long (translated) name.
    const char* stp_printer_get_manufacturer ( const stp_printer_t * const stp_printer_t *  p  ) 
    p the printer model to use.
    -

    Returns:
    the manufacturer's name (should never be freed).
    +
    Returns:
    the manufacturer's name (should never be freed).
    -

    +

    - + @@ -816,19 +807,19 @@ The model number is used internally by the "family" driver module, and has no me
    @@ -792,7 +783,7 @@ Get a printer model's manufacturer's name.
    int stp_printer_get_model ( const stp_printer_t * const stp_printer_t *  p  ) 
    p the printer model to use.
    -

    Returns:
    the model number.
    +
    Returns:
    the model number.
    -

    +

    - + - + @@ -848,7 +839,7 @@ The model number is used internally by the "family" driver module, and has no me
    stp_parameter_list_t stp_printer_list_parameters stp_parameter_list_t stp_printer_list_parameters ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

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

    Get the number of available printer models.

    -

    Returns:
    the number of printer models.
    +
    Returns:
    the number of printer models.
    -

    +

    - + - + @@ -918,13 +909,13 @@ Set a vars object to use a particular driver, and set the parameter to its defau
    Parameters:
    @@ -887,13 +878,13 @@ Get the number of available printer models.
    void stp_set_printer_defaults ( stp_vars_t * stp_vars_t *  v,
    const stp_printer_t * const stp_printer_t *  p
    - +
    v the vars to use.
    p the printer model to use.
    p the printer model to use.
    -

    +

    - + @@ -960,18 +951,18 @@ Set a vars object to use a particular driver, and set the parameter to its defau

    Start a print job.

    -

    Warning:
    This function must be called prior to the first call to stp_print().
    +
    Warning:
    This function must be called prior to the first call to stp_print().
    Parameters:
    @@ -932,7 +923,7 @@ Set a vars object to use a particular driver, and set the parameter to its defau
    int stp_start_job ( const stp_vars_t * const stp_vars_t *  v,
    v the vars to use.
    image the image to print.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -999,8 +990,8 @@ Start a print job.
    @@ -979,7 +970,7 @@ Start a print job.
    int stp_verify_printer_params ( stp_vars_t * stp_vars_t *  v  ) 
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html index c9df74c..857f0f9 100644 --- a/doc/gutenprint/html/group__sequence.html +++ b/doc/gutenprint/html/group__sequence.html @@ -2,122 +2,113 @@ 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... - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Typedefs

    typedef stp_sequence stp_sequence_t
    typedef stp_sequence stp_sequence_t
     The sequence opaque data type.
     The sequence opaque data type.

    Functions

    stp_sequence_t * stp_sequence_create (void)
    stp_sequence_t * stp_sequence_create (void)
     Create a new sequence.
    void stp_sequence_destroy (stp_sequence_t *sequence)
     Create a new sequence.
    void stp_sequence_destroy (stp_sequence_t *sequence)
     Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source)
     Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source)
     Copy an sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence)
     Copy an sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence)
     Copy and allocate an sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)
     Copy and allocate an sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)
     Set the lower and upper bounds.
    void stp_sequence_get_bounds (const stp_sequence_t *sequence, double *low, double *high)
     Set the lower and upper bounds.
    void stp_sequence_get_bounds (const stp_sequence_t *sequence, double *low, double *high)
     Get the lower and upper bounds.
    void stp_sequence_get_range (const stp_sequence_t *sequence, double *low, double *high)
     Get the lower and upper bounds.
    void stp_sequence_get_range (const stp_sequence_t *sequence, double *low, double *high)
     Get range of values stored in the sequence.
    int stp_sequence_set_size (stp_sequence_t *sequence, size_t size)
     Get range of values stored in the sequence.
    int stp_sequence_set_size (stp_sequence_t *sequence, size_t size)
     Set the sequence size.
    size_t stp_sequence_get_size (const stp_sequence_t *sequence)
     Set the sequence size.
    size_t stp_sequence_get_size (const stp_sequence_t *sequence)
     Get the sequence size.
    int stp_sequence_set_data (stp_sequence_t *sequence, size_t count, const double *data)
     Get the sequence size.
    int stp_sequence_set_data (stp_sequence_t *sequence, size_t count, const double *data)
     Set the data in a sequence.
    int stp_sequence_set_subrange (stp_sequence_t *sequence, size_t where, size_t size, const double *data)
     Set the data in a sequence.
    int stp_sequence_set_subrange (stp_sequence_t *sequence, size_t where, size_t size, const double *data)
     Set the data in a subrange of a sequence.
    void stp_sequence_get_data (const stp_sequence_t *sequence, size_t *size, const double **data)
     Set the data in a subrange of a sequence.
    void stp_sequence_get_data (const stp_sequence_t *sequence, size_t *size, const double **data)
     Get the data in a sequence.
    int stp_sequence_set_point (stp_sequence_t *sequence, size_t where, double data)
     Get the data in a sequence.
    int stp_sequence_set_point (stp_sequence_t *sequence, size_t where, double data)
     Set the data at a single point in a sequence.
    int stp_sequence_get_point (const stp_sequence_t *sequence, size_t where, double *data)
     Set the data at a single point in a sequence.
    int stp_sequence_get_point (const stp_sequence_t *sequence, size_t where, double *data)
     Get the data at a single point in a sequence.
    int stp_sequence_set_float_data (stp_sequence_t *sequence, size_t count, const float *data)
     Get the data at a single point in a sequence.
    int stp_sequence_set_float_data (stp_sequence_t *sequence, size_t count, const float *data)
     Set the data in a sequence from float values.
    int stp_sequence_set_long_data (stp_sequence_t *sequence, size_t count, const long *data)
     Set the data in a sequence from float values.
    int stp_sequence_set_long_data (stp_sequence_t *sequence, size_t count, const long *data)
     Set the data in a sequence from long values.
    int stp_sequence_set_ulong_data (stp_sequence_t *sequence, size_t count, const unsigned long *data)
     Set the data in a sequence from long values.
    int stp_sequence_set_ulong_data (stp_sequence_t *sequence, size_t count, const unsigned long *data)
     Set the data in a sequence from unsigned long values.
    int stp_sequence_set_int_data (stp_sequence_t *sequence, size_t count, const int *data)
     Set the data in a sequence from unsigned long values.
    int stp_sequence_set_int_data (stp_sequence_t *sequence, size_t count, const int *data)
     Set the data in a sequence from int values.
    int stp_sequence_set_uint_data (stp_sequence_t *sequence, size_t count, const unsigned int *data)
     Set the data in a sequence from int values.
    int stp_sequence_set_uint_data (stp_sequence_t *sequence, size_t count, const unsigned int *data)
     Set the data in a sequence from unsigned int values.
    int stp_sequence_set_short_data (stp_sequence_t *sequence, size_t count, const short *data)
     Set the data in a sequence from unsigned int values.
    int stp_sequence_set_short_data (stp_sequence_t *sequence, size_t count, const short *data)
     Set the data in a sequence from short values.
    int stp_sequence_set_ushort_data (stp_sequence_t *sequence, size_t count, const unsigned short *data)
     Set the data in a sequence from short values.
    int stp_sequence_set_ushort_data (stp_sequence_t *sequence, size_t count, const unsigned short *data)
     Set the data in a sequence from unsigned short values.
    const float * stp_sequence_get_float_data (const stp_sequence_t *sequence, size_t *count)
     Set the data in a sequence from unsigned short values.
    const float * stp_sequence_get_float_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as float data.
    const long * stp_sequence_get_long_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as float data.
    const long * stp_sequence_get_long_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as long data.
    const unsigned long * stp_sequence_get_ulong_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as long data.
    const unsigned long * stp_sequence_get_ulong_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned long data.
    const int * stp_sequence_get_int_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned long data.
    const int * stp_sequence_get_int_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as int data.
    const unsigned int * stp_sequence_get_uint_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as int data.
    const unsigned int * stp_sequence_get_uint_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned int data.
    const short * stp_sequence_get_short_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned int data.
    const short * stp_sequence_get_short_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as short data.
    const unsigned short * stp_sequence_get_ushort_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as short data.
    const unsigned short * stp_sequence_get_ushort_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned short data.
     Get the data in a sequence as unsigned short data.

    Detailed Description

    The sequence is a simple "vector of numbers" data structure.

    Typedef Documentation

    -

    +

    @@ -137,7 +128,7 @@ The sequence opaque data type.
    - +
    typedef struct stp_sequence stp_sequence_t typedef struct stp_sequence stp_sequence_t

    Function Documentation

    -

    +

    - + - + @@ -173,22 +164,22 @@ The sequence opaque data type.

    Copy an sequence.

    -Both dest and source must be valid sequences previously created with stp_sequence_create().

    Parameters:
    +Both dest and source must be valid sequences previously created with stp_sequence_create().
    Parameters:
    @@ -145,13 +136,13 @@ The sequence opaque data type.
    void stp_sequence_copy ( stp_sequence_t * stp_sequence_t *  dest,
    const stp_sequence_t * const stp_sequence_t *  source
    - +
    dest the destination sequence.
    source the source sequence.
    source the source sequence.
    -

    +

    - + @@ -209,19 +200,19 @@ Both dest and source must be valid sequences previously created with

    +

    stp_sequence_t* stp_sequence_create stp_sequence_t* stp_sequence_create (  void 
    - + - + @@ -240,16 +231,16 @@ Create a new sequence.

    Copy and allocate an sequence.

    -A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with stp_sequence_create().

    Parameters:
    +A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with stp_sequence_create().
    Parameters:
    stp_sequence_t* stp_sequence_create_copy stp_sequence_t* stp_sequence_create_copy ( const stp_sequence_t * const stp_sequence_t *  sequence  ) 
    sequence the source sequence.
    -
    Returns:
    the new copy of the sequence.
    +
    Returns:
    the new copy of the sequence.
    -

    +

    - + @@ -278,13 +269,13 @@ Destroy a sequence.

    It is an error to destroy the sequence more than once.

    Parameters:
    @@ -257,7 +248,7 @@ A new sequence will be created, and then the contents of source will be copied i
    void stp_sequence_destroy ( stp_sequence_t * stp_sequence_t *  sequence  ) 
    - +
    sequence the sequence to destroy.
    sequence the sequence to destroy.
    -

    +

    - + @@ -330,13 +321,13 @@ The values are stored in the variables pointed to by low and high.
    <
    @@ -292,7 +283,7 @@ It is an error to destroy the sequence more than once.
    Parame
    void stp_sequence_get_bounds ( const stp_sequence_t * const stp_sequence_t *  sequence,
    - +
    sequence the sequence to work on.
    low a pointer to a double to store the low bound in.
    high a pointer to a double to store the high bound in.
    high a pointer to a double to store the high bound in.
    -

    +

    - + @@ -382,17 +373,17 @@ Get the data in a sequence.
    @@ -344,7 +335,7 @@ The values are stored in the variables pointed to by low and high.
    <
    void stp_sequence_get_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    - + stp_sequence_get_data(sequence, &size, &data); +
    sequence the sequence to get the data from.
    size the number of elements in the sequence are stored in the size_t pointed to.
    data a pointer to the first element of an sequence of doubles is stored in a pointer to double*. 
     stp_sequence_t *sequence;
+
    data a pointer to the first element of an sequence of doubles is stored in a pointer to double*. 
     stp_sequence_t *sequence;
  size_t size;
  double *data;
- stp_sequence_get_data(sequence, &size, &data);
-
    -

    +

    - + @@ -434,11 +425,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -400,7 +391,7 @@ Get the data in a sequence.
    const float* stp_sequence_get_float_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of floats is stored in a pointer to float*.
    +
    Returns:
    a pointer to the first element of an sequence of floats is stored in a pointer to float*.
    -

    +

    - + @@ -480,11 +471,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -446,7 +437,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    const int* stp_sequence_get_int_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of ints is stored in a pointer to int*.
    +
    Returns:
    a pointer to the first element of an sequence of ints is stored in a pointer to int*.
    -

    +

    - + @@ -526,11 +517,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -492,7 +483,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    const long* stp_sequence_get_long_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of longs is stored in a pointer to long*.
    +
    Returns:
    a pointer to the first element of an sequence of longs is stored in a pointer to long*.
    -

    +

    - + @@ -579,11 +570,11 @@ Get the data at a single point in a sequence.
    @@ -538,7 +529,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    int stp_sequence_get_point ( const stp_sequence_t * const stp_sequence_t *  sequence,
    data the datum is stored in the double pointed to.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -629,13 +620,13 @@ The values are stored in the variables pointed to by low and high.
    <
    @@ -591,7 +582,7 @@ Get the data at a single point in a sequence.
    void stp_sequence_get_range ( const stp_sequence_t * const stp_sequence_t *  sequence,
    - +
    sequence the sequence to work on.
    low a pointer to a double to store the low bound in.
    high a pointer to a double to store the high bound in.
    high a pointer to a double to store the high bound in.
    -

    +

    - + @@ -677,11 +668,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -643,7 +634,7 @@ The values are stored in the variables pointed to by low and high.
    <
    const short* stp_sequence_get_short_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of shorts is stored in a pointer to short*.
    +
    Returns:
    a pointer to the first element of an sequence of shorts is stored in a pointer to short*.
    -

    +

    - + @@ -708,11 +699,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be

    Get the sequence size.

    -

    Returns:
    the sequence size.
    +
    Returns:
    the sequence size.
    @@ -689,7 +680,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    size_t stp_sequence_get_size ( const stp_sequence_t * const stp_sequence_t *  sequence  ) 
    -

    +

    - + @@ -754,11 +745,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -720,7 +711,7 @@ Get the sequence size.
    const unsigned int* stp_sequence_get_uint_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*.
    +
    Returns:
    a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*.
    -

    +

    - + @@ -800,11 +791,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -766,7 +757,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    const unsigned long* stp_sequence_get_ulong_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*.
    +
    Returns:
    a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*.
    -

    +

    - + @@ -846,11 +837,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    @@ -812,7 +803,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    const unsigned short* stp_sequence_get_ushort_data ( const stp_sequence_t * const stp_sequence_t *  sequence,
    count the number of elements in the sequence are stored in the size_t pointed to.
    -

    Returns:
    a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*.
    +
    Returns:
    a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*.
    -

    +

    - + @@ -899,11 +890,11 @@ The lower and upper bounds set the minimum and maximum values that a point in th
    @@ -858,7 +849,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    int stp_sequence_set_bounds ( stp_sequence_t * stp_sequence_t *  sequence,
    high the upper bound.
    -

    Returns:
    1 on success, or 0 if the lower bound is greater than the upper bound.
    +
    Returns:
    1 on success, or 0 if the lower bound is greater than the upper bound.
    -

    +

    - + @@ -952,11 +943,11 @@ Set the data in a sequence.
    @@ -911,7 +902,7 @@ The lower and upper bounds set the minimum and maximum values that a point in th
    int stp_sequence_set_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1005,11 +996,11 @@ Set the data in a sequence from float values.
    @@ -964,7 +955,7 @@ Set the data in a sequence.
    int stp_sequence_set_float_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1058,11 +1049,11 @@ Set the data in a sequence from int values.
    @@ -1017,7 +1008,7 @@ Set the data in a sequence from float values.
    int stp_sequence_set_int_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1111,11 +1102,11 @@ Set the data in a sequence from long values.
    @@ -1070,7 +1061,7 @@ Set the data in a sequence from int values.
    int stp_sequence_set_long_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1164,11 +1155,11 @@ Set the data at a single point in a sequence.
    @@ -1123,7 +1114,7 @@ Set the data in a sequence from long values.
    int stp_sequence_set_point ( stp_sequence_t * stp_sequence_t *  sequence,
    data the datum to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1217,11 +1208,11 @@ Set the data in a sequence from short values.
    @@ -1176,7 +1167,7 @@ Set the data at a single point in a sequence.
    int stp_sequence_set_short_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1263,11 +1254,11 @@ The size is the number of elements the sequence contains. Note that resizing wil
    @@ -1229,7 +1220,7 @@ Set the data in a sequence from short values.
    int stp_sequence_set_size ( stp_sequence_t * stp_sequence_t *  sequence,
    size the size to set the sequence to.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1323,11 +1314,11 @@ Set the data in a subrange of a sequence.
    @@ -1275,7 +1266,7 @@ The size is the number of elements the sequence contains. Note that resizing wil
    int stp_sequence_set_subrange ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1376,11 +1367,11 @@ Set the data in a sequence from unsigned int values.
    @@ -1335,7 +1326,7 @@ Set the data in a subrange of a sequence.
    int stp_sequence_set_uint_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1429,11 +1420,11 @@ Set the data in a sequence from unsigned long values.
    @@ -1388,7 +1379,7 @@ Set the data in a sequence from unsigned int values.
    int stp_sequence_set_ulong_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -

    +

    - + @@ -1482,12 +1473,12 @@ Set the data in a sequence from unsigned short values.
    @@ -1441,7 +1432,7 @@ Set the data in a sequence from unsigned long values.
    int stp_sequence_set_ushort_data ( stp_sequence_t * stp_sequence_t *  sequence,
    data a pointer to the first member of a sequence containing the data to set.
    -

    Returns:
    1 on success, 0 on failure.
    +
    Returns:
    1 on success, 0 on failure.
    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html index 803f27c..4cae95c 100644 --- a/doc/gutenprint/html/group__util.html +++ b/doc/gutenprint/html/group__util.html @@ -2,143 +2,134 @@ libgutenprint API Reference: util - - -
    -
    + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    util

    Utility functions. More... - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - +

    Defines

    #define STP_DBG_LUT   0x1
    #define STP_DBG_LUT   0x1
    #define STP_DBG_COLORFUNC   0x2
    #define STP_DBG_COLORFUNC   0x2
    #define STP_DBG_INK   0x4
    #define STP_DBG_INK   0x4
    #define STP_DBG_PS   0x8
    #define STP_DBG_PS   0x8
    #define STP_DBG_PCL   0x10
    #define STP_DBG_PCL   0x10
    #define STP_DBG_ESCP2   0x20
    #define STP_DBG_ESCP2   0x20
    #define STP_DBG_CANON   0x40
    #define STP_DBG_CANON   0x40
    #define STP_DBG_LEXMARK   0x80
    #define STP_DBG_LEXMARK   0x80
    #define STP_DBG_WEAVE_PARAMS   0x100
    #define STP_DBG_WEAVE_PARAMS   0x100
    #define STP_DBG_ROWS   0x200
    #define STP_DBG_ROWS   0x200
    #define STP_DBG_MARK_FILE   0x400
    #define STP_DBG_MARK_FILE   0x400
    #define STP_DBG_LIST   0x800
    #define STP_DBG_LIST   0x800
    #define STP_DBG_MODULE   0x1000
    #define STP_DBG_MODULE   0x1000
    #define STP_DBG_PATH   0x2000
    #define STP_DBG_PATH   0x2000
    #define STP_DBG_PAPER   0x4000
    #define STP_DBG_PAPER   0x4000
    #define STP_DBG_PRINTERS   0x8000
    #define STP_DBG_PRINTERS   0x8000
    #define STP_DBG_XML   0x10000
    #define STP_DBG_XML   0x10000
    #define STP_DBG_VARS   0x20000
    #define STP_DBG_VARS   0x20000
    #define STP_DBG_OLYMPUS   0x40000
    #define STP_DBG_OLYMPUS   0x40000
    #define STP_DBG_CURVE   0x80000
    #define STP_DBG_CURVE   0x80000
    #define STP_DBG_CURVE_ERRORS   0x100000
    #define STP_DBG_CURVE_ERRORS   0x100000
    #define STP_SAFE_FREE(x)
    #define STP_SAFE_FREE(x)

    Functions

    int stp_init (void)
    int stp_init (void)
     Initialise libgimpprint.
    const char * stp_set_output_codeset (const char *codeset)
     Initialise libgimpprint.
    const char * stp_set_output_codeset (const char *codeset)
     Set the output encoding.
    stp_curve_t * stp_read_and_compose_curves (const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)
     Set the output encoding.
    stp_curve_t * stp_read_and_compose_curves (const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)
    void stp_abort (void)
    void stp_abort (void)
    void stp_prune_inactive_options (stp_vars_t *v)
    void stp_prune_inactive_options (stp_vars_t *v)
    void stp_zprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_zprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_zfwrite (const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)
    void void stp_zfwrite (const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)
    void stp_putc (int ch, const stp_vars_t *v)
    void stp_putc (int ch, const stp_vars_t *v)
    void stp_put16_le (unsigned short sh, const stp_vars_t *v)
    void stp_put16_le (unsigned short sh, const stp_vars_t *v)
    void stp_put16_be (unsigned short sh, const stp_vars_t *v)
    void stp_put16_be (unsigned short sh, const stp_vars_t *v)
    void stp_put32_le (unsigned int sh, const stp_vars_t *v)
    void stp_put32_le (unsigned int sh, const stp_vars_t *v)
    void stp_put32_be (unsigned int sh, const stp_vars_t *v)
    void stp_put32_be (unsigned int sh, const stp_vars_t *v)
    void stp_puts (const char *s, const stp_vars_t *v)
    void stp_puts (const char *s, const stp_vars_t *v)
    void stp_send_command (const stp_vars_t *v, const char *command, const char *format,...)
    void stp_send_command (const stp_vars_t *v, const char *command, const char *format,...)
    void stp_erputc (int ch)
    void stp_erputc (int ch)
    void stp_eprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_eprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_erprintf (const char *format,...) __attribute__((format(__printf__
    void void stp_erprintf (const char *format,...) __attribute__((format(__printf__
    void void void stp_asprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void stp_asprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void void stp_catprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void void stp_catprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    unsigned long stp_get_debug_level (void)
    unsigned long stp_get_debug_level (void)
    void stp_dprintf (unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_dprintf (unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_deprintf (unsigned long level, const char *format,...) __attribute__((format(__printf__
    void void stp_deprintf (unsigned long level, const char *format,...) __attribute__((format(__printf__
    void void void stp_init_debug_messages (stp_vars_t *v)
    void void void stp_init_debug_messages (stp_vars_t *v)
    void stp_flush_debug_messages (stp_vars_t *v)
    void stp_flush_debug_messages (stp_vars_t *v)
    void * stp_malloc (size_t)
    void * stp_malloc (size_t)
    void * stp_zalloc (size_t)
    void * stp_zalloc (size_t)
    void * stp_realloc (void *ptr, size_t)
    void * stp_realloc (void *ptr, size_t)
    void stp_free (void *ptr)
    void stp_free (void *ptr)
    size_t stp_strlen (const char *s)
    size_t stp_strlen (const char *s)
    char * stp_strndup (const char *s, int n)
    char * stp_strndup (const char *s, int n)
    char * stp_strdup (const char *s)
    char * stp_strdup (const char *s)
    const char * stp_get_version (void)
    const char * stp_get_version (void)
     Get the library version string (x.y.z).
    const char * stp_get_release_version (void)
     Get the library version string (x.y.z).
    const char * stp_get_release_version (void)
     Get the library release version string (x.y).
     Get the library release version string (x.y).

    Detailed Description

    Utility functions.

    Define Documentation

    -

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

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

    +

    @@ -649,14 +640,14 @@ Utility functions. Value:
    do                                              \
 {                                               \
   if ((x))                                      \
-    stp_free((char *)(x));                      \
+    stp_free((char *)(x));                      \
   ((x)) = NULL;                                 \
 } while (0)

    Function Documentation

    -

    +

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

    +

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

    +

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

    +

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

    +

    - + @@ -862,7 +853,7 @@ Utility functions.
    @@ -827,7 +818,7 @@ Utility functions.
    const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -905,7 +896,7 @@ Utility functions.
    @@ -870,7 +861,7 @@ Utility functions.
    void stp_eprintf ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

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

    +

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

    +

    - + @@ -998,7 +989,7 @@ Utility functions.
    @@ -978,7 +969,7 @@ Utility functions.
    void stp_flush_debug_messages ( stp_vars_t * stp_vars_t *  v  ) 
    -

    +

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

    +

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

    +

    @@ -1081,11 +1072,11 @@ Utility functions.

    Get the library release version string (x.y).

    -

    Returns:
    a pointer to the release name of the package, which must not be modified or freed.
    +
    Returns:
    a pointer to the release name of the package, which must not be modified or freed.
    -

    +

    @@ -1112,11 +1103,11 @@ Get the library release version string (x.y).

    Get the library version string (x.y.z).

    -

    Returns:
    a pointer to the version name of the package, which must not be modified or freed.
    +
    Returns:
    a pointer to the version name of the package, which must not be modified or freed.
    -

    +

    @@ -1143,11 +1134,11 @@ Get the library version string (x.y.z).

    Initialise libgimpprint.

    -This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures.

    Returns:
    0 on success, 1 on failure.
    +This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures.
    Returns:
    0 on success, 1 on failure.
    -

    +

    - + @@ -1175,7 +1166,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1155,7 +1146,7 @@ This function must be called prior to any other use of the library. It is respon
    void void void stp_init_debug_messages ( stp_vars_t * stp_vars_t *  v  ) 
    -

    +

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

    +

    - + @@ -1231,7 +1222,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1211,7 +1202,7 @@ This function must be called prior to any other use of the library. It is respon
    void stp_prune_inactive_options ( stp_vars_t * stp_vars_t *  v  ) 
    -

    +

    - + @@ -1268,7 +1259,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1245,7 +1236,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1305,7 +1296,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1282,7 +1273,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1342,7 +1333,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1319,7 +1310,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1379,7 +1370,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1356,7 +1347,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1416,7 +1407,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1393,7 +1384,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1453,13 +1444,13 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1430,7 +1421,7 @@ This function must be called prior to any other use of the library. It is respon
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1473,7 +1464,7 @@ This function must be called prior to any other use of the library. It is respon - + @@ -1502,7 +1493,7 @@ This function must be called prior to any other use of the library. It is respon
    stp_curve_t* stp_read_and_compose_curves stp_curve_t* stp_read_and_compose_curves (  const char *  s1,
    stp_curve_compose_t stp_curve_compose_t  comp,
    -

    +

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

    +

    - + @@ -1588,7 +1579,7 @@ This function must be called prior to any other use of the library. It is respon
    @@ -1547,7 +1538,7 @@ This function must be called prior to any other use of the library. It is respon
    void stp_send_command ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    @@ -1620,11 +1611,11 @@ This function sets the encoding that all strings translated by gettext are outpu
    codeset the standard name of the encoding, which must be usable with iconv_open(). For example, "US-ASCII" or "UTF-8". If NULL, the currently-selected codeset will be returned (or NULL if no codeset has been selected yet).
    -

    Returns:
    a string containing the selected codeset, or NULL on failure (errno is set accordingly).
    +
    Returns:
    a string containing the selected codeset, or NULL on failure (errno is set accordingly).
    -

    +

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

    +

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

    +

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

    +

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

    +

    - + @@ -1794,7 +1785,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    @@ -1771,7 +1762,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    const stp_vars_t * const stp_vars_t *  v
    -

    +

    - + @@ -1837,8 +1828,8 @@ This function sets the encoding that all strings translated by gettext are outpu
    @@ -1802,7 +1793,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    void stp_zprintf ( const stp_vars_t * const stp_vars_t *  v,
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html index 8e9b48d..a01bec1 100644 --- a/doc/gutenprint/html/group__vars.html +++ b/doc/gutenprint/html/group__vars.html @@ -2,18 +2,9 @@ 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... @@ -31,457 +22,457 @@ - + - - + + - - + + - - + + - - + + - + - + - - - + - - + - - + - - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - +
     Parameter description. More...

    Typedefs

    typedef stp_vars stp_vars_t
    typedef stp_vars stp_vars_t
     The vars opaque data type.
    typedef void * stp_parameter_list_t
     The vars opaque data type.
    typedef void * stp_parameter_list_t
     The parameter_list opaque data type.
    typedef const void * stp_const_parameter_list_t
     The parameter_list opaque data type.
    typedef const void * stp_const_parameter_list_t
     The constant parameter_list opaque data type.
    typedef void(* stp_outfunc_t )(void *data, const char *buffer, size_t bytes)
     The constant parameter_list opaque data type.
    typedef void(* stp_outfunc_t )(void *data, const char *buffer, size_t bytes)
     Output function supplied by the calling application.
    typedef void *(* stp_copy_data_func_t )(void *)
     Output function supplied by the calling application.
    typedef void *(* stp_copy_data_func_t )(void *)
    typedef void(* stp_free_data_func_t )(void *)
    typedef void(* stp_free_data_func_t )(void *)
    typedef stp_compdata compdata_t
    typedef stp_compdata compdata_t

    Enumerations

    enum  stp_parameter_type_t {
    -  STP_PARAMETER_TYPE_STRING_LIST, -STP_PARAMETER_TYPE_INT, -STP_PARAMETER_TYPE_BOOLEAN, -STP_PARAMETER_TYPE_DOUBLE, +
    enum  stp_parameter_type_t {
    +  STP_PARAMETER_TYPE_STRING_LIST, +STP_PARAMETER_TYPE_INT, +STP_PARAMETER_TYPE_BOOLEAN, +STP_PARAMETER_TYPE_DOUBLE,
    -  STP_PARAMETER_TYPE_CURVE, -STP_PARAMETER_TYPE_FILE, -STP_PARAMETER_TYPE_RAW, -STP_PARAMETER_TYPE_ARRAY, +  STP_PARAMETER_TYPE_CURVE, +STP_PARAMETER_TYPE_FILE, +STP_PARAMETER_TYPE_RAW, +STP_PARAMETER_TYPE_ARRAY,
    -  STP_PARAMETER_TYPE_DIMENSION, -STP_PARAMETER_TYPE_INVALID +  STP_PARAMETER_TYPE_DIMENSION, +STP_PARAMETER_TYPE_INVALID
    }
     Parameter types. More...
    enum  stp_parameter_class_t { STP_PARAMETER_CLASS_FEATURE, -STP_PARAMETER_CLASS_OUTPUT, -STP_PARAMETER_CLASS_CORE, -STP_PARAMETER_CLASS_INVALID +
     Parameter types. More...
    enum  stp_parameter_class_t { STP_PARAMETER_CLASS_FEATURE, +STP_PARAMETER_CLASS_OUTPUT, +STP_PARAMETER_CLASS_CORE, +STP_PARAMETER_CLASS_INVALID }
     Parameter class. More...
    enum  stp_parameter_level_t {
    -  STP_PARAMETER_LEVEL_BASIC, -STP_PARAMETER_LEVEL_ADVANCED, -STP_PARAMETER_LEVEL_ADVANCED1, -STP_PARAMETER_LEVEL_ADVANCED2, +
     Parameter class. More...
    enum  stp_parameter_level_t {
    +  STP_PARAMETER_LEVEL_BASIC, +STP_PARAMETER_LEVEL_ADVANCED, +STP_PARAMETER_LEVEL_ADVANCED1, +STP_PARAMETER_LEVEL_ADVANCED2,
    -  STP_PARAMETER_LEVEL_ADVANCED3, -STP_PARAMETER_LEVEL_ADVANCED4, -STP_PARAMETER_LEVEL_INTERNAL, -STP_PARAMETER_LEVEL_EXTERNAL, +  STP_PARAMETER_LEVEL_ADVANCED3, +STP_PARAMETER_LEVEL_ADVANCED4, +STP_PARAMETER_LEVEL_INTERNAL, +STP_PARAMETER_LEVEL_EXTERNAL,
    -  STP_PARAMETER_LEVEL_INVALID +  STP_PARAMETER_LEVEL_INVALID
    }
     Parameter level. More...
    enum  stp_parameter_activity_t { STP_PARAMETER_INACTIVE, -STP_PARAMETER_DEFAULTED, -STP_PARAMETER_ACTIVE +
     Parameter level. More...
    enum  stp_parameter_activity_t { STP_PARAMETER_INACTIVE, +STP_PARAMETER_DEFAULTED, +STP_PARAMETER_ACTIVE }
     Parameter activity. More...
    enum  stp_parameter_verify_t { PARAMETER_BAD, -PARAMETER_OK, -PARAMETER_INACTIVE +
     Parameter activity. More...
    enum  stp_parameter_verify_t { PARAMETER_BAD, +PARAMETER_OK, +PARAMETER_INACTIVE }

    Functions

    stp_vars_t * stp_vars_create (void)
    stp_vars_t * stp_vars_create (void)
     Create a new vars object.
    void stp_vars_copy (stp_vars_t *dest, const stp_vars_t *source)
     Create a new vars object.
    void stp_vars_copy (stp_vars_t *dest, const stp_vars_t *source)
     Copy a vars object.
    stp_vars_t * stp_vars_create_copy (const stp_vars_t *source)
     Copy a vars object.
    stp_vars_t * stp_vars_create_copy (const stp_vars_t *source)
     Copy and allocate a vars object.
    void stp_vars_destroy (stp_vars_t *v)
     Copy and allocate a vars object.
    void stp_vars_destroy (stp_vars_t *v)
     Destroy a vars object.
    void stp_set_driver (stp_vars_t *v, const char *val)
     Destroy a vars object.
    void stp_set_driver (stp_vars_t *v, const char *val)
     Set the name of the printer driver.
    void stp_set_driver_n (stp_vars_t *v, const char *val, int bytes)
     Set the name of the printer driver.
    void stp_set_driver_n (stp_vars_t *v, const char *val, int bytes)
     Set the name of the printer driver.
    const char * stp_get_driver (const stp_vars_t *v)
     Set the name of the printer driver.
    const char * stp_get_driver (const stp_vars_t *v)
     Get the name of the printer driver.
    void stp_set_color_conversion (stp_vars_t *v, const char *val)
     Get the name of the printer driver.
    void stp_set_color_conversion (stp_vars_t *v, const char *val)
     Set the name of the color conversion routine, if not the default.
    void stp_set_color_conversion_n (stp_vars_t *v, const char *val, int bytes)
     Set the name of the color conversion routine, if not the default.
    void stp_set_color_conversion_n (stp_vars_t *v, const char *val, int bytes)
     Set the name of the color conversion routine, if not the default.
    const char * stp_get_color_conversion (const stp_vars_t *v)
     Set the name of the color conversion routine, if not the default.
    const char * stp_get_color_conversion (const stp_vars_t *v)
     Get the name of the color conversion routine.
    void stp_set_left (stp_vars_t *v, int val)
     Get the name of the color conversion routine.
    void stp_set_left (stp_vars_t *v, int val)
     Set the left edge of the image.
    int stp_get_left (const stp_vars_t *v)
     Set the left edge of the image.
    int stp_get_left (const stp_vars_t *v)
     Get the left edge of the image.
    void stp_set_top (stp_vars_t *v, int val)
     Get the left edge of the image.
    void stp_set_top (stp_vars_t *v, int val)
     Set the top edge of the image.
    int stp_get_top (const stp_vars_t *v)
     Set the top edge of the image.
    int stp_get_top (const stp_vars_t *v)
     Get the top edge of the image.
    void stp_set_width (stp_vars_t *v, int val)
     Get the top edge of the image.
    void stp_set_width (stp_vars_t *v, int val)
     Set the width of the image.
    int stp_get_width (const stp_vars_t *v)
     Set the width of the image.
    int stp_get_width (const stp_vars_t *v)
     Get the width edge of the image.
    void stp_set_height (stp_vars_t *v, int val)
     Get the width edge of the image.
    void stp_set_height (stp_vars_t *v, int val)
     Set the height of the image.
    int stp_get_height (const stp_vars_t *v)
     Set the height of the image.
    int stp_get_height (const stp_vars_t *v)
     Get the height of the image.
    void stp_set_page_width (stp_vars_t *v, int val)
     Get the height of the image.
    void stp_set_page_width (stp_vars_t *v, int val)
     Set the page width.
    int stp_get_page_width (const stp_vars_t *v)
     Set the page width.
    int stp_get_page_width (const stp_vars_t *v)
     Get the page width.
    void stp_set_page_height (stp_vars_t *v, int val)
     Get the page width.
    void stp_set_page_height (stp_vars_t *v, int val)
     Set the page height.
    int stp_get_page_height (const stp_vars_t *v)
     Set the page height.
    int stp_get_page_height (const stp_vars_t *v)
     Get the page height.
    void stp_set_outfunc (stp_vars_t *v, stp_outfunc_t val)
     Get the page height.
    void stp_set_outfunc (stp_vars_t *v, stp_outfunc_t val)
     Set the function used to print output information.
    stp_outfunc_t stp_get_outfunc (const stp_vars_t *v)
     Set the function used to print output information.
    stp_outfunc_t stp_get_outfunc (const stp_vars_t *v)
     Get the function used to print output information.
    void stp_set_errfunc (stp_vars_t *v, stp_outfunc_t val)
     Get the function used to print output information.
    void stp_set_errfunc (stp_vars_t *v, stp_outfunc_t val)
     Set the function used to print error and diagnostic information.
    stp_outfunc_t stp_get_errfunc (const stp_vars_t *v)
     Set the function used to print error and diagnostic information.
    stp_outfunc_t stp_get_errfunc (const stp_vars_t *v)
     Get the function used to print output information.
    void stp_set_outdata (stp_vars_t *v, void *val)
     Get the function used to print output information.
    void stp_set_outdata (stp_vars_t *v, void *val)
     Set the output data.
    void * stp_get_outdata (const stp_vars_t *v)
     Set the output data.
    void * stp_get_outdata (const stp_vars_t *v)
     Get the output data.
    void stp_set_errdata (stp_vars_t *v, void *val)
     Get the output data.
    void stp_set_errdata (stp_vars_t *v, void *val)
     Set the error data.
    void * stp_get_errdata (const stp_vars_t *v)
     Set the error data.
    void * stp_get_errdata (const stp_vars_t *v)
     Get the error data.
    void stp_merge_printvars (stp_vars_t *user, const stp_vars_t *print)
     Get the error data.
    void stp_merge_printvars (stp_vars_t *user, const stp_vars_t *print)
     Merge defaults for a printer with user-chosen settings.
    stp_parameter_list_t stp_get_parameter_list (const stp_vars_t *v)
     Merge defaults for a printer with user-chosen settings.
    stp_parameter_list_t stp_get_parameter_list (const stp_vars_t *v)
     List the available parameters for the currently chosen settings.
    size_t stp_parameter_list_count (stp_const_parameter_list_t list)
     List the available parameters for the currently chosen settings.
    size_t stp_parameter_list_count (stp_const_parameter_list_t list)
     List the number of available parameters for the currently chosen settings.
    const stp_parameter_t * stp_parameter_find (stp_const_parameter_list_t list, const char *name)
     List the number of available parameters for the currently chosen settings.
    const stp_parameter_t * stp_parameter_find (stp_const_parameter_list_t list, const char *name)
     Find a parameter by its name.
    const stp_parameter_t * stp_parameter_list_param (stp_const_parameter_list_t list, size_t item)
     Find a parameter by its name.
    const stp_parameter_t * stp_parameter_list_param (stp_const_parameter_list_t list, size_t item)
     Find a parameter by its index number.
    void stp_parameter_list_destroy (stp_parameter_list_t list)
     Find a parameter by its index number.
    void stp_parameter_list_destroy (stp_parameter_list_t list)
     Destroy a parameter_list.
    stp_parameter_list_t stp_parameter_list_create (void)
     Destroy a parameter_list.
    stp_parameter_list_t stp_parameter_list_create (void)
     Create a parameter_list.
    void stp_parameter_list_add_param (stp_parameter_list_t list, const stp_parameter_t *item)
     Create a parameter_list.
    void stp_parameter_list_add_param (stp_parameter_list_t list, const stp_parameter_t *item)
     Add a parameter to a parameter_list.
    stp_parameter_list_t stp_parameter_list_copy (stp_const_parameter_list_t list)
     Add a parameter to a parameter_list.
    stp_parameter_list_t stp_parameter_list_copy (stp_const_parameter_list_t list)
     Copy and allocate a parameter_list.
    void stp_parameter_list_append (stp_parameter_list_t list, stp_const_parameter_list_t append)
     Copy and allocate a parameter_list.
    void stp_parameter_list_append (stp_parameter_list_t list, stp_const_parameter_list_t append)
     Append one parameter_list to another.
    void stp_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
     Append one parameter_list to another.
    void stp_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
     Describe a parameter in detail.
    void stp_parameter_description_destroy (stp_parameter_t *description)
     Describe a parameter in detail.
    void stp_parameter_description_destroy (stp_parameter_t *description)
     Destroy a parameter description.
    const stp_parameter_t * stp_parameter_find_in_settings (const stp_vars_t *v, const char *name)
     Destroy a parameter description.
    const stp_parameter_t * stp_parameter_find_in_settings (const stp_vars_t *v, const char *name)
     Find a parameter by its name from a vars object.
    void stp_set_string_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Find a parameter by its name from a vars object.
    void stp_set_string_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a string parameter.
    void stp_set_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a string parameter.
    void stp_set_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a string parameter.
    void stp_set_file_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a string parameter.
    void stp_set_file_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a file parameter.
    void stp_set_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a file parameter.
    void stp_set_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a file parameter.
    void stp_set_float_parameter (stp_vars_t *v, const char *parameter, double value)
     Set a file parameter.
    void stp_set_float_parameter (stp_vars_t *v, const char *parameter, double value)
     Set a float parameter.
    void stp_set_int_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a float parameter.
    void stp_set_int_parameter (stp_vars_t *v, const char *parameter, int value)
     Set an integer parameter.
    void stp_set_dimension_parameter (stp_vars_t *v, const char *parameter, int value)
     Set an integer parameter.
    void stp_set_dimension_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a dimension parameter.
    void stp_set_boolean_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a dimension parameter.
    void stp_set_boolean_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a boolean parameter.
    void stp_set_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value)
     Set a boolean parameter.
    void stp_set_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value)
     Set a curve parameter.
    void stp_set_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value)
     Set a curve parameter.
    void stp_set_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value)
     Set an array parameter.
    void stp_set_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes)
     Set an array parameter.
    void stp_set_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes)
     Set a raw parameter.
    void stp_scale_float_parameter (stp_vars_t *v, const char *parameter, double scale)
     Set a raw parameter.
    void stp_scale_float_parameter (stp_vars_t *v, const char *parameter, double scale)
     Multiply the value of a float parameter by a scaling factor.
    void stp_set_default_string_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Multiply the value of a float parameter by a scaling factor.
    void stp_set_default_string_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a default string parameter.
    void stp_set_default_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a default string parameter.
    void stp_set_default_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a default string parameter.
    void stp_set_default_file_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a default string parameter.
    void stp_set_default_file_parameter (stp_vars_t *v, const char *parameter, const char *value)
     Set a default file parameter.
    void stp_set_default_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a default file parameter.
    void stp_set_default_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes)
     Set a default file parameter.
    void stp_set_default_float_parameter (stp_vars_t *v, const char *parameter, double value)
     Set a default file parameter.
    void stp_set_default_float_parameter (stp_vars_t *v, const char *parameter, double value)
     Set a default float parameter.
    void stp_set_default_int_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default float parameter.
    void stp_set_default_int_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default integer parameter.
    void stp_set_default_dimension_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default integer parameter.
    void stp_set_default_dimension_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default dimension parameter.
    void stp_set_default_boolean_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default dimension parameter.
    void stp_set_default_boolean_parameter (stp_vars_t *v, const char *parameter, int value)
     Set a default boolean parameter.
    void stp_set_default_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value)
     Set a default boolean parameter.
    void stp_set_default_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value)
     Set a default curve parameter.
    void stp_set_default_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value)
     Set a default curve parameter.
    void stp_set_default_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value)
     Set a default array parameter.
    void stp_set_default_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes)
     Set a default array parameter.
    void stp_set_default_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes)
     Set a default raw parameter.
    const char * stp_get_string_parameter (const stp_vars_t *v, const char *parameter)
     Set a default raw parameter.
    const char * stp_get_string_parameter (const stp_vars_t *v, const char *parameter)
     Get a string parameter.
    const char * stp_get_file_parameter (const stp_vars_t *v, const char *parameter)
     Get a string parameter.
    const char * stp_get_file_parameter (const stp_vars_t *v, const char *parameter)
     Get a file parameter.
    double stp_get_float_parameter (const stp_vars_t *v, const char *parameter)
     Get a file parameter.
    double stp_get_float_parameter (const stp_vars_t *v, const char *parameter)
     Get a float parameter.
    int stp_get_int_parameter (const stp_vars_t *v, const char *parameter)
     Get a float parameter.
    int stp_get_int_parameter (const stp_vars_t *v, const char *parameter)
     Get an integer parameter.
    int stp_get_dimension_parameter (const stp_vars_t *v, const char *parameter)
     Get an integer parameter.
    int stp_get_dimension_parameter (const stp_vars_t *v, const char *parameter)
     Get a dimension parameter.
    int stp_get_boolean_parameter (const stp_vars_t *v, const char *parameter)
     Get a dimension parameter.
    int stp_get_boolean_parameter (const stp_vars_t *v, const char *parameter)
     Get a boolean parameter.
    const stp_curve_t * stp_get_curve_parameter (const stp_vars_t *v, const char *parameter)
     Get a boolean parameter.
    const stp_curve_t * stp_get_curve_parameter (const stp_vars_t *v, const char *parameter)
     Get a curve parameter.
    const stp_array_t * stp_get_array_parameter (const stp_vars_t *v, const char *parameter)
     Get a curve parameter.
    const stp_array_t * stp_get_array_parameter (const stp_vars_t *v, const char *parameter)
     Get an array parameter.
    const stp_raw_t * stp_get_raw_parameter (const stp_vars_t *v, const char *parameter)
     Get an array parameter.
    const stp_raw_t * stp_get_raw_parameter (const stp_vars_t *v, const char *parameter)
     Get a raw parameter.
    void stp_clear_string_parameter (stp_vars_t *v, const char *parameter)
     Get a raw parameter.
    void stp_clear_string_parameter (stp_vars_t *v, const char *parameter)
     Clear a string parameter.
    void stp_clear_file_parameter (stp_vars_t *v, const char *parameter)
     Clear a string parameter.
    void stp_clear_file_parameter (stp_vars_t *v, const char *parameter)
     Clear a file parameter.
    void stp_clear_float_parameter (stp_vars_t *v, const char *parameter)
     Clear a file parameter.
    void stp_clear_float_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a float parameter.
    void stp_clear_int_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a float parameter.
    void stp_clear_int_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) an integer parameter.
    void stp_clear_dimension_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) an integer parameter.
    void stp_clear_dimension_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a dimension parameter.
    void stp_clear_boolean_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a dimension parameter.
    void stp_clear_boolean_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a boolean parameter.
    void stp_clear_curve_parameter (stp_vars_t *v, const char *parameter)
     Clear (remove) a boolean parameter.
    void stp_clear_curve_parameter (stp_vars_t *v, const char *parameter)
     Clear a curve parameter.
    void stp_clear_array_parameter (stp_vars_t *v, const char *parameter)
     Clear a curve parameter.
    void stp_clear_array_parameter (stp_vars_t *v, const char *parameter)
     Clear an array parameter.
    void stp_clear_raw_parameter (stp_vars_t *v, const char *parameter)
     Clear an array parameter.
    void stp_clear_raw_parameter (stp_vars_t *v, const char *parameter)
     Clear a raw parameter.
    void stp_set_string_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Clear a raw parameter.
    void stp_set_string_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a string parameter.
    void stp_set_file_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a string parameter.
    void stp_set_file_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a file parameter.
    void stp_set_float_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a file parameter.
    void stp_set_float_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a float parameter.
    void stp_set_int_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a float parameter.
    void stp_set_int_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of an integer parameter.
    void stp_set_dimension_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of an integer parameter.
    void stp_set_dimension_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a dimension parameter.
    void stp_set_boolean_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a dimension parameter.
    void stp_set_boolean_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a boolean parameter.
    void stp_set_curve_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a boolean parameter.
    void stp_set_curve_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a curveparameter.
    void stp_set_array_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a curveparameter.
    void stp_set_array_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of an array parameter.
    void stp_set_raw_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of an array parameter.
    void stp_set_raw_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a raw parameter.
    int stp_check_string_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Set the activity of a raw parameter.
    int stp_check_string_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a string parameter is set.
    int stp_check_file_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a string parameter is set.
    int stp_check_file_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a file parameter is set.
    int stp_check_float_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a file parameter is set.
    int stp_check_float_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a float parameter is set.
    int stp_check_int_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a float parameter is set.
    int stp_check_int_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if an integer parameter is set.
    int stp_check_dimension_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if an integer parameter is set.
    int stp_check_dimension_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a dimension parameter is set.
    int stp_check_boolean_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a dimension parameter is set.
    int stp_check_boolean_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a boolean parameter is set.
    int stp_check_curve_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a boolean parameter is set.
    int stp_check_curve_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a curve parameter is set.
    int stp_check_array_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a curve parameter is set.
    int stp_check_array_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if an array parameter is set.
    int stp_check_raw_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if an array parameter is set.
    int stp_check_raw_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)
     Check if a raw parameter is set.
    stp_parameter_activity_t stp_get_string_parameter_active (const stp_vars_t *v, const char *parameter)
     Check if a raw parameter is set.
    stp_parameter_activity_t stp_get_string_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a string parameter.
    stp_parameter_activity_t stp_get_file_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a string parameter.
    stp_parameter_activity_t stp_get_file_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a file parameter.
    stp_parameter_activity_t stp_get_float_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a file parameter.
    stp_parameter_activity_t stp_get_float_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a float parameter.
    stp_parameter_activity_t stp_get_int_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a float parameter.
    stp_parameter_activity_t stp_get_int_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of an integer parameter.
    stp_parameter_activity_t stp_get_dimension_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of an integer parameter.
    stp_parameter_activity_t stp_get_dimension_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a dimension parameter.
    stp_parameter_activity_t stp_get_boolean_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a dimension parameter.
    stp_parameter_activity_t stp_get_boolean_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a boolean parameter.
    stp_parameter_activity_t stp_get_curve_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a boolean parameter.
    stp_parameter_activity_t stp_get_curve_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a curve parameter.
    stp_parameter_activity_t stp_get_array_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a curve parameter.
    stp_parameter_activity_t stp_get_array_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of an array parameter.
    stp_parameter_activity_t stp_get_raw_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of an array parameter.
    stp_parameter_activity_t stp_get_raw_parameter_active (const stp_vars_t *v, const char *parameter)
     Get the activity status of a raw parameter.
    void stp_get_media_size (const stp_vars_t *v, int *width, int *height)
     Get the activity status of a raw parameter.
    void stp_get_media_size (const stp_vars_t *v, int *width, int *height)
     Get the media (paper) size.
    void stp_get_imageable_area (const stp_vars_t *v, int *left, int *right, int *bottom, int *top)
     Get the media (paper) size.
    void stp_get_imageable_area (const stp_vars_t *v, int *left, int *right, int *bottom, int *top)
     Get the imagable area of the page.
    void stp_get_size_limit (const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)
     Get the imagable area of the page.
    void stp_get_size_limit (const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)
     Get the media size limits.
    void stp_describe_resolution (const stp_vars_t *v, int *x, int *y)
     Get the media size limits.
    void stp_describe_resolution (const stp_vars_t *v, int *x, int *y)
     Retrieve the printing resolution of the selected resolution.
    int stp_verify (stp_vars_t *v)
     Retrieve the printing resolution of the selected resolution.
    int stp_verify (stp_vars_t *v)
     Verify parameters.
    const stp_vars_t * stp_default_settings (void)
     Verify parameters.
    const stp_vars_t * stp_default_settings (void)
     Get default global settings.
    void stp_allocate_component_data (stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)
     Get default global settings.
    void stp_allocate_component_data (stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)
    void stp_destroy_component_data (stp_vars_t *v, const char *name)
    void stp_destroy_component_data (stp_vars_t *v, const char *name)
    void * stp_get_component_data (const stp_vars_t *v, const char *name)
    void * stp_get_component_data (const stp_vars_t *v, const char *name)
    stp_parameter_verify_t stp_verify_parameter (const stp_vars_t *v, const char *parameter, int quiet)
    stp_parameter_verify_t stp_verify_parameter (const stp_vars_t *v, const char *parameter, int quiet)
    int stp_get_verified (const stp_vars_t *v)
    int stp_get_verified (const stp_vars_t *v)
    void stp_set_verified (stp_vars_t *v, int value)
    void stp_set_verified (stp_vars_t *v, int value)
    void stp_copy_options (stp_vars_t *vd, const stp_vars_t *vs)
    void stp_copy_options (stp_vars_t *vd, const stp_vars_t *vs)
    void stp_fill_parameter_settings (stp_parameter_t *desc, const stp_parameter_t *param)
    void stp_fill_parameter_settings (stp_parameter_t *desc, const stp_parameter_t *param)

    Detailed Description

    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.

    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

    -

    +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

    +

    @@ -498,13 +489,13 @@ The representation of printer settings has changed dramatically from 4.2. All (w
    - +
    typedef struct stp_compdata compdata_t typedef struct stp_compdata compdata_t
    -

    +

    @@ -523,13 +514,13 @@ The constant parameter_list opaque data type.
    - +
    typedef const void* stp_const_parameter_list_t typedef const void* stp_const_parameter_list_t
    -

    +

    @@ -546,13 +537,13 @@ The constant parameter_list opaque data type.
    - +
    typedef void*(* stp_copy_data_func_t)(void *) typedef void*(* stp_copy_data_func_t)(void *)
    -

    +

    @@ -569,13 +560,13 @@ The constant parameter_list opaque data type.
    - +
    typedef void(* stp_free_data_func_t)(void *) typedef void(* stp_free_data_func_t)(void *)
    -

    +

    @@ -595,19 +586,19 @@ There are two output functions supplied by the caller, one to send output data a
    - +
    typedef void(* stp_outfunc_t)(void *data, const char *buffer, size_t bytes) typedef void(* stp_outfunc_t)(void *data, const char *buffer, size_t bytes)
    - +
    data a pointer to an opaque object owned by the calling application.
    buffer the data to output.
    bytes the size of buffer (in bytes).
    bytes the size of buffer (in bytes).
    -

    +

    @@ -626,13 +617,13 @@ The parameter_list opaque data type.
    - +
    typedef void* stp_parameter_list_t typedef void* stp_parameter_list_t
    -

    +

    @@ -652,13 +643,13 @@ The vars opaque data type.
    - +
    typedef struct stp_vars stp_vars_t typedef struct stp_vars stp_vars_t

    Enumeration Type Documentation

    -

    +

    @@ -674,26 +665,26 @@ The vars opaque data type.

    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:
    +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:
    - +
    enum stp_parameter_activity_t enum stp_parameter_activity_t
    - - -
    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).
    -

    +

    @@ -709,28 +700,28 @@ Parameter is active (used).

    Parameter class.

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

    Enumerator:
    +What kind of setting this is, for the purpose of user interface representation.
    Enumerator:
    - +
    enum stp_parameter_class_t enum stp_parameter_class_t
    - - - -
    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).
    -

    +

    @@ -746,38 +737,38 @@ Invalid class (should never be used).

    Parameter level.

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

    Enumerator:
    +What "level" a setting is at, for UI design.
    Enumerator:
    - +
    enum stp_parameter_level_t enum stp_parameter_level_t
    - - - - - - - - -
    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).
    -

    +

    @@ -793,40 +784,40 @@ Invalid level (should never be used).

    Parameter types.

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

    Enumerator:
    +The following types are permitted for a printer setting. Not all are currently implemented.
    Enumerator:
    - +
    enum stp_parameter_type_t enum stp_parameter_type_t
    - - - - - - - - - -
    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).
    -

    +

    @@ -842,11 +833,11 @@ Invalid type (should never be used).

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

    Function Documentation

    -

    +

    - + @@ -874,13 +865,13 @@ Invalid type (should never be used). - + - + @@ -909,7 +900,7 @@ Invalid type (should never be used).
    @@ -862,7 +853,7 @@ Invalid type (should never be used).
    void stp_allocate_component_data ( stp_vars_t * stp_vars_t *  v,
    stp_copy_data_func_t stp_copy_data_func_t  copyfunc,
    stp_free_data_func_t stp_free_data_func_t  freefunc,
    -

    +

    - + @@ -929,7 +920,7 @@ Invalid type (should never be used). - + @@ -955,13 +946,13 @@ Check if an array parameter is set.
    @@ -917,7 +908,7 @@ Invalid type (should never be used).
    int stp_check_array_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -981,7 +972,7 @@ Check if an array parameter is set. - + @@ -1007,13 +998,13 @@ Check if a boolean parameter is set.
    @@ -969,7 +960,7 @@ Check if an array parameter is set.
    int stp_check_boolean_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1033,7 +1024,7 @@ Check if a boolean parameter is set. - + @@ -1059,13 +1050,13 @@ Check if a curve parameter is set.
    @@ -1021,7 +1012,7 @@ Check if a boolean parameter is set.
    int stp_check_curve_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1085,7 +1076,7 @@ Check if a curve parameter is set. - + @@ -1111,13 +1102,13 @@ Check if a dimension parameter is set.
    @@ -1073,7 +1064,7 @@ Check if a curve parameter is set.
    int stp_check_dimension_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1137,7 +1128,7 @@ Check if a dimension parameter is set. - + @@ -1163,13 +1154,13 @@ Check if a file parameter is set.
    @@ -1125,7 +1116,7 @@ Check if a dimension parameter is set.
    int stp_check_file_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1189,7 +1180,7 @@ Check if a file parameter is set. - + @@ -1215,13 +1206,13 @@ Check if a float parameter is set.
    @@ -1177,7 +1168,7 @@ Check if a file parameter is set.
    int stp_check_float_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1241,7 +1232,7 @@ Check if a float parameter is set. - + @@ -1267,13 +1258,13 @@ Check if an integer parameter is set.
    @@ -1229,7 +1220,7 @@ Check if a float parameter is set.
    int stp_check_int_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1293,7 +1284,7 @@ Check if an integer parameter is set. - + @@ -1319,13 +1310,13 @@ Check if a raw parameter is set.
    @@ -1281,7 +1272,7 @@ Check if an integer parameter is set.
    int stp_check_raw_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1345,7 +1336,7 @@ Check if a raw parameter is set. - + @@ -1371,13 +1362,13 @@ Check if a string parameter is set.
    @@ -1333,7 +1324,7 @@ Check if a raw parameter is set.
    int stp_check_string_parameter ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the minimum activity status.
    active the minimum activity status.
    -

    +

    - + @@ -1416,13 +1407,13 @@ Clear an array parameter. The parameter is set to NULL.
    Parameters:
    @@ -1385,7 +1376,7 @@ Check if a string parameter is set.
    void stp_clear_array_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1461,13 +1452,13 @@ Clear (remove) a boolean parameter.
    Parameters:
    @@ -1430,7 +1421,7 @@ The parameter is set to NULL.
    Parameters:
    void stp_clear_boolean_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1506,13 +1497,13 @@ Clear a curve parameter. The parameter is set to NULL.
    Parameters:
    @@ -1475,7 +1466,7 @@ Clear (remove) a boolean parameter.
    void stp_clear_curve_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1551,13 +1542,13 @@ Clear (remove) a dimension parameter.
    Parameters:
    @@ -1520,7 +1511,7 @@ The parameter is set to NULL.
    Parameters:
    void stp_clear_dimension_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1596,13 +1587,13 @@ Clear a file parameter. The parameter is set to NULL.
    Parameters:
    @@ -1565,7 +1556,7 @@ Clear (remove) a dimension parameter.
    void stp_clear_file_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1641,13 +1632,13 @@ Clear (remove) a float parameter.
    Parameters:
    @@ -1610,7 +1601,7 @@ The parameter is set to NULL.
    Parameters:
    void stp_clear_float_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1686,13 +1677,13 @@ Clear (remove) an integer parameter.
    Parameters:
    @@ -1655,7 +1646,7 @@ Clear (remove) a float parameter.
    void stp_clear_int_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1731,13 +1722,13 @@ Clear a raw parameter. The parameter is set to NULL.
    Parameters:
    @@ -1700,7 +1691,7 @@ Clear (remove) an integer parameter.
    void stp_clear_raw_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + @@ -1776,13 +1767,13 @@ Clear a string parameter. The parameter is set to NULL.
    Parameters:
    @@ -1745,7 +1736,7 @@ The parameter is set to NULL.
    Parameters:
    void stp_clear_string_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    parameter the name of the parameter.
    -

    +

    - + - + @@ -1819,13 +1810,13 @@ The parameter is set to NULL.
    Parameters:
    @@ -1790,13 +1781,13 @@ The parameter is set to NULL.
    Parameters:
    void stp_copy_options ( stp_vars_t * stp_vars_t *  vd,
    const stp_vars_t * const stp_vars_t *  vs
    -

    +

    - + @@ -1846,11 +1837,11 @@ The parameter is set to NULL.
    Parameters:

    Get default global settings.

    -The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer.

    Returns:
    the default settings.
    +The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer.
    Returns:
    the default settings.
    const stp_vars_t* stp_default_settings const stp_vars_t* stp_default_settings (  void 
    -

    +

    - + @@ -1896,13 +1887,13 @@ All of the parameter fields will be populated.
    Parameters:
    - +
    @@ -1858,7 +1849,7 @@ The main use of this is to provide a usable stp_vars_t for purposes of parameter
    void stp_describe_parameter ( const stp_vars_t * const stp_vars_t *  v,
    v the vars to use.
    name the name of the parameter.
    description a pointer to an stp_parameter_t to store the parameter description in.
    description a pointer to an stp_parameter_t to store the parameter description in.
    -

    +

    - + @@ -1948,13 +1939,13 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    @@ -1910,7 +1901,7 @@ All of the parameter fields will be populated.
    Parameters:
    		void stp_describe_resolution ( const stp_vars_t * const stp_vars_t *  v,
    - +
    v the vars to use.
    x a pointer to a int to store the horizontal resolution in.
    y a pointer to a int to store the vertical resolution in.
    y a pointer to a int to store the vertical resolution in.
    -

    +

    - + @@ -1991,7 +1982,7 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    @@ -1962,7 +1953,7 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    void stp_destroy_component_data ( stp_vars_t * stp_vars_t *  v,
    -

    +

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

    +

    - + - + @@ -2070,19 +2061,19 @@ Get an array parameter.
    const stp_array_t* stp_get_array_parameter const stp_array_t* stp_get_array_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the array, or NULL if no parameter was found.
    +
    Returns:
    the array, or NULL if no parameter was found.
    -

    +

    - + - + @@ -2116,11 +2107,11 @@ Get the activity status of an array parameter.
    stp_parameter_activity_t stp_get_array_parameter_active stp_parameter_activity_t stp_get_array_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2162,19 +2153,19 @@ Get a boolean parameter.
    @@ -2128,7 +2119,7 @@ Get the activity status of an array parameter.
    int stp_get_boolean_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the boolean value.
    +
    Returns:
    the boolean value.
    -

    +

    - + - + @@ -2208,11 +2199,11 @@ Get the activity status of a boolean parameter.
    stp_parameter_activity_t stp_get_boolean_parameter_active stp_parameter_activity_t stp_get_boolean_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2239,11 +2230,11 @@ Get the activity status of a boolean parameter.

    Get the name of the color conversion routine.

    -

    Returns:
    the name of the color conversion routine (must not be freed).
    +
    Returns:
    the name of the color conversion routine (must not be freed).
    @@ -2220,7 +2211,7 @@ Get the activity status of a boolean parameter.
    const char* stp_get_color_conversion ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -2280,15 +2271,15 @@ Get the name of the color conversion routine.
    @@ -2251,7 +2242,7 @@ Get the name of the color conversion routine.
    void* stp_get_component_data ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + - + @@ -2322,19 +2313,19 @@ Get a curve parameter.
    const stp_curve_t* stp_get_curve_parameter const stp_curve_t* stp_get_curve_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the curve, or NULL if no parameter was found.
    +
    Returns:
    the curve, or NULL if no parameter was found.
    -

    +

    - + - + @@ -2368,11 +2359,11 @@ Get the activity status of a curve parameter.
    stp_parameter_activity_t stp_get_curve_parameter_active stp_parameter_activity_t stp_get_curve_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2414,19 +2405,19 @@ Get a dimension parameter.
    @@ -2380,7 +2371,7 @@ Get the activity status of a curve parameter.
    int stp_get_dimension_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the dimension (integer) value.
    +
    Returns:
    the dimension (integer) value.
    -

    +

    - + - + @@ -2460,11 +2451,11 @@ Get the activity status of a dimension parameter.
    stp_parameter_activity_t stp_get_dimension_parameter_active stp_parameter_activity_t stp_get_dimension_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2491,11 +2482,11 @@ Get the activity status of a dimension parameter.

    Get the name of the printer driver.

    -

    Returns:
    the name of the printer driver (must not be freed).
    +
    Returns:
    the name of the printer driver (must not be freed).
    @@ -2472,7 +2463,7 @@ Get the activity status of a dimension parameter.
    const char* stp_get_driver ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -2527,19 +2518,19 @@ Get the error data.
    @@ -2503,7 +2494,7 @@ Get the name of the printer driver.
    void* stp_get_errdata ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -

    Returns:
    the output data.
    +
    Returns:
    the output data.
    -

    +

    - + - + @@ -2563,11 +2554,11 @@ Get the function used to print output information.
    stp_outfunc_t stp_get_errfunc stp_outfunc_t stp_get_errfunc ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -
    Returns:
    the outfunc.
    +
    Returns:
    the outfunc.
    -

    +

    - + @@ -2609,19 +2600,19 @@ Get a file parameter.
    @@ -2575,7 +2566,7 @@ Get the function used to print output information.
    const char* stp_get_file_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the filename, or NULL if no parameter was found.
    +
    Returns:
    the filename, or NULL if no parameter was found.
    -

    +

    - + - + @@ -2655,11 +2646,11 @@ Get the activity status of a file parameter.
    stp_parameter_activity_t stp_get_file_parameter_active stp_parameter_activity_t stp_get_file_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2701,19 +2692,19 @@ Get a float parameter.
    @@ -2667,7 +2658,7 @@ Get the activity status of a file parameter.
    double stp_get_float_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the float value.
    +
    Returns:
    the float value.
    -

    +

    - + - + @@ -2747,11 +2738,11 @@ Get the activity status of a float parameter.
    stp_parameter_activity_t stp_get_float_parameter_active stp_parameter_activity_t stp_get_float_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2778,11 +2769,11 @@ Get the activity status of a float parameter.

    Get the height of the image.

    -

    Returns:
    the left edge.
    +
    Returns:
    the left edge.
    @@ -2759,7 +2750,7 @@ Get the activity status of a float parameter.
    int stp_get_height ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -2845,13 +2836,13 @@ If the media size stored in V is invalid, the return values will be indeterminat - +
    @@ -2790,7 +2781,7 @@ Get the height of the image.
    void stp_get_imageable_area ( const stp_vars_t * const stp_vars_t *  v,
    left a pointer to a int to store the left edge in.
    right a pointer to a int to store the right edge in.
    bottom a pointer to a int to store the bottom edge in.
    top a pointer to a int to store the top edge in.
    top a pointer to a int to store the top edge in.
    -

    +

    - + @@ -2893,19 +2884,19 @@ Get an integer parameter.
    @@ -2859,7 +2850,7 @@ If the media size stored in V is invalid, the return values will be indeterminat
    int stp_get_int_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the integer value.
    +
    Returns:
    the integer value.
    -

    +

    - + - + @@ -2939,11 +2930,11 @@ Get the activity status of an integer parameter.
    stp_parameter_activity_t stp_get_int_parameter_active stp_parameter_activity_t stp_get_int_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -2970,11 +2961,11 @@ Get the activity status of an integer parameter.

    Get the left edge of the image.

    -

    Returns:
    the left edge.
    +
    Returns:
    the left edge.
    @@ -2951,7 +2942,7 @@ Get the activity status of an integer parameter.
    int stp_get_left ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -3020,13 +3011,13 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
    @@ -2982,7 +2973,7 @@ Get the left edge of the image.
    void stp_get_media_size ( const stp_vars_t * const stp_vars_t *  v,
    - +
    v the vars to use.
    width a pointer to an int to store the media width in.
    height a pointer to an int to store the media height in.
    height a pointer to an int to store the media height in.
    -

    +

    - + @@ -3058,19 +3049,19 @@ Get the output data.
    @@ -3034,7 +3025,7 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
    void* stp_get_outdata ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -

    Returns:
    the output data.
    +
    Returns:
    the output data.
    -

    +

    - + - + @@ -3094,11 +3085,11 @@ Get the function used to print output information.
    stp_outfunc_t stp_get_outfunc stp_outfunc_t stp_get_outfunc ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -
    Returns:
    the outfunc.
    +
    Returns:
    the outfunc.
    -

    +

    - + @@ -3125,11 +3116,11 @@ Get the function used to print output information.

    Get the page height.

    -

    Returns:
    the page height.
    +
    Returns:
    the page height.
    @@ -3106,7 +3097,7 @@ Get the function used to print output information.
    int stp_get_page_height ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -3156,19 +3147,19 @@ Get the page height.

    Get the page width.

    -

    Returns:
    the page width.
    +
    Returns:
    the page width.
    @@ -3137,7 +3128,7 @@ Get the page height.
    int stp_get_page_width ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + - + @@ -3192,11 +3183,11 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
    stp_parameter_list_t stp_get_parameter_list stp_parameter_list_t stp_get_parameter_list ( const stp_vars_t * const stp_vars_t *  v  ) 
    v the vars to use.
    -
    Returns:
    a list of available parameters (must be freed with stp_parameter_list_destroy()).
    +
    Returns:
    a list of available parameters (must be freed with stp_parameter_list_destroy()).
    -

    +

    - + @@ -3238,19 +3229,19 @@ Get a raw parameter.
    @@ -3204,7 +3195,7 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
    const stp_raw_t* stp_get_raw_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the raw data, or NULL if no parameter was found.
    +
    Returns:
    the raw data, or NULL if no parameter was found.
    -

    +

    - + - + @@ -3284,11 +3275,11 @@ Get the activity status of a raw parameter.
    stp_parameter_activity_t stp_get_raw_parameter_active stp_parameter_activity_t stp_get_raw_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -3348,13 +3339,13 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur - +
    @@ -3296,7 +3287,7 @@ Get the activity status of a raw parameter.
    void stp_get_size_limit ( const stp_vars_t * const stp_vars_t *  v,
    max_width a pointer to a int to store the maximum width in.
    max_height a pointer to a int to store the maximum height in.
    min_width a pointer to a int to store the minimum width in.
    min_height a pointer to a int to store the minimum height in.
    min_height a pointer to a int to store the minimum height in.
    -

    +

    - + @@ -3396,19 +3387,19 @@ Get a string parameter.
    @@ -3362,7 +3353,7 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
    const char* stp_get_string_parameter ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -

    Returns:
    the string, or NULL if no parameter was found.
    +
    Returns:
    the string, or NULL if no parameter was found.
    -

    +

    - + - + @@ -3442,11 +3433,11 @@ Get the activity status of a string parameter.
    stp_parameter_activity_t stp_get_string_parameter_active stp_parameter_activity_t stp_get_string_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    parameter the name of the parameter.
    -
    Returns:
    the activity status.
    +
    Returns:
    the activity status.
    -

    +

    - + @@ -3473,11 +3464,11 @@ Get the activity status of a string parameter.

    Get the top edge of the image.

    -

    Returns:
    the left edge.
    +
    Returns:
    the left edge.
    @@ -3454,7 +3445,7 @@ Get the activity status of a string parameter.
    int stp_get_top ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -3505,7 +3496,7 @@ Get the top edge of the image.
    @@ -3485,7 +3476,7 @@ Get the top edge of the image.
    int stp_get_verified ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + @@ -3532,11 +3523,11 @@ Get the top edge of the image.

    Get the width edge of the image.

    -

    Returns:
    the left edge.
    +
    Returns:
    the left edge.
    @@ -3513,7 +3504,7 @@ Get the top edge of the image.
    int stp_get_width ( const stp_vars_t * const stp_vars_t *  v  ) 
    -

    +

    - + - + @@ -3572,17 +3563,17 @@ Get the width edge of the image.

    Merge defaults for a printer with user-chosen settings.

    -

    Deprecated:
    This is likely to go away.
    Parameters:
    +
    Deprecated:
    This is likely to go away.
    +
    Parameters:
    @@ -3544,13 +3535,13 @@ Get the width edge of the image.
    void stp_merge_printvars ( stp_vars_t * stp_vars_t *  user,
    const stp_vars_t * const stp_vars_t *  print
    - +
    user the destination vars.
    print the vars to merge into user.
    print the vars to merge into user.
    - -

    +

    @@ -3611,13 +3602,13 @@ Destroy a parameter description.

    This must be called even if the stp_parameter_t was not allocated with malloc, since some members are dynamically allocated.

    Parameters:
    - +
    description the parameter description to destroy.
    description the parameter description to destroy.
    -

    +

    - + @@ -3659,11 +3650,11 @@ Find a parameter by its name.
    @@ -3625,7 +3616,7 @@ This must be called even if the const stp_parameter_t* stp_parameter_find ( stp_const_parameter_list_t stp_const_parameter_list_t  list,
    name the name of the parameter.
    -

    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    +
    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    -

    +

    - + @@ -3705,11 +3696,11 @@ Find a parameter by its name from a vars object.
    @@ -3671,7 +3662,7 @@ Find a parameter by its name.
    const stp_parameter_t* stp_parameter_find_in_settings ( const stp_vars_t * const stp_vars_t *  v,
    name the name of the parameter.
    -

    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    +
    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    -

    +

    - + @@ -3748,13 +3739,13 @@ Add a parameter to a parameter_list.
    Parameters:
    @@ -3717,7 +3708,7 @@ Find a parameter by its name from a vars object.
    void stp_parameter_list_add_param ( stp_parameter_list_t stp_parameter_list_t  list,
    - +
    list the parameter_list to use.
    item the parameter to add.
    item the parameter to add.
    -

    +

    - + - + @@ -3793,21 +3784,21 @@ Append one parameter_list to another.
    Parameters:
    @@ -3762,13 +3753,13 @@ Add a parameter to a parameter_list.
    void stp_parameter_list_append ( stp_parameter_list_t stp_parameter_list_t  list,
    stp_const_parameter_list_t stp_const_parameter_list_t  append
    - +
    list the destination list (to append to).
    append the list of paramters to append. Each item that does not already exist in list will be appended.
    append the list of paramters to append. Each item that does not already exist in list will be appended.
    -

    +

    - + - + @@ -3831,11 +3822,11 @@ A new parameter_list will be created, and then the contents of source will be co
    stp_parameter_list_t stp_parameter_list_copy stp_parameter_list_t stp_parameter_list_copy ( stp_const_parameter_list_t stp_const_parameter_list_t  list  ) 
    list the source parameter_list.
    -
    Returns:
    the new copy of the parameter_list.
    +
    Returns:
    the new copy of the parameter_list.
    -

    +

    - + @@ -3867,17 +3858,17 @@ List the number of available parameters for the currently chosen settings.
    @@ -3843,7 +3834,7 @@ A new parameter_list will be created, and then the contents of source will be co
    size_t stp_parameter_list_count ( stp_const_parameter_list_t stp_const_parameter_list_t  list  ) 
    list the parameter_list to use.
    -

    Returns:
    the number of parameters.
    +
    Returns:
    the number of parameters.
    -

    +

    - + @@ -3898,11 +3889,11 @@ List the number of available parameters for the currently chosen settings.

    Create a parameter_list.

    -

    Returns:
    the newly created parameter_list.
    +
    Returns:
    the newly created parameter_list.
    stp_parameter_list_t stp_parameter_list_create stp_parameter_list_t stp_parameter_list_create (  void 
    -

    +

    - + @@ -3931,13 +3922,13 @@ Destroy a parameter_list.

    It is an error to destroy the parameter_list more than once.

    Parameters:
    @@ -3910,7 +3901,7 @@ Create a parameter_list.
    void stp_parameter_list_destroy ( stp_parameter_list_t stp_parameter_list_t  list  ) 
    - +
    list the parameter_list to destroy.
    list the parameter_list to destroy.
    -

    +

    - + @@ -3979,11 +3970,11 @@ Find a parameter by its index number.
    @@ -3945,7 +3936,7 @@ It is an error to destroy the parameter_list more than once.
    const stp_parameter_t* stp_parameter_list_param ( stp_const_parameter_list_t stp_const_parameter_list_t  list,
    item the index number of the parameter (must not be greater than stp_parameter_list_count - 1).
    -

    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    +
    Returns:
    a pointer to the parameter (must not be freed), or NULL if no parameter was found.
    -

    +

    - + @@ -4029,13 +4020,13 @@ Multiply the value of a float parameter by a scaling factor.
    @@ -3991,7 +3982,7 @@ Find a parameter by its index number.
    void stp_scale_float_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    scale the factor to multiply the value by.
    scale the factor to multiply the value by.
    -

    +

    - + @@ -4055,7 +4046,7 @@ Multiply the value of a float parameter by a scaling factor. - + @@ -4081,13 +4072,13 @@ Set an array parameter.
    @@ -4043,7 +4034,7 @@ Multiply the value of a float parameter by a scaling factor.
    void stp_set_array_parameter ( stp_vars_t * stp_vars_t *  v,
    const stp_array_t * const stp_array_t *  value
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4107,7 +4098,7 @@ Set an array parameter. - + @@ -4133,13 +4124,13 @@ Set the activity of an array parameter.
    @@ -4095,7 +4086,7 @@ Set an array parameter.
    void stp_set_array_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -4185,13 +4176,13 @@ Set a boolean parameter.
    @@ -4147,7 +4138,7 @@ Set the activity of an array parameter.
    void stp_set_boolean_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4211,7 +4202,7 @@ Set a boolean parameter. - + @@ -4237,13 +4228,13 @@ Set the activity of a boolean parameter.
    @@ -4199,7 +4190,7 @@ Set a boolean parameter.
    void stp_set_boolean_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -4282,13 +4273,13 @@ Set the name of the color conversion routine, if not the default.
    Parameters:
    @@ -4251,7 +4242,7 @@ Set the activity of a boolean parameter.
    void stp_set_color_conversion ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the name to set.
    val the name to set.
    -

    +

    - + @@ -4334,13 +4325,13 @@ Set the name of the color conversion routine, if not the default.
    @@ -4296,7 +4287,7 @@ Set the name of the color conversion routine, if not the default.
    void stp_set_color_conversion_n ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the name to set.
    bytes the length of val (in bytes).
    bytes the length of val (in bytes).
    -

    +

    - + @@ -4360,7 +4351,7 @@ Set the name of the color conversion routine, if not the default. - + @@ -4386,13 +4377,13 @@ Set a curve parameter.
    @@ -4348,7 +4339,7 @@ Set the name of the color conversion routine, if not the default.
    void stp_set_curve_parameter ( stp_vars_t * stp_vars_t *  v,
    const stp_curve_t * const stp_curve_t *  value
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4412,7 +4403,7 @@ Set a curve parameter. - + @@ -4438,13 +4429,13 @@ Set the activity of a curveparameter.
    @@ -4400,7 +4391,7 @@ Set a curve parameter.
    void stp_set_curve_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -4464,7 +4455,7 @@ Set the activity of a curveparameter. - + @@ -4490,13 +4481,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4452,7 +4443,7 @@ Set the activity of a curveparameter.
    void stp_set_default_array_parameter ( stp_vars_t * stp_vars_t *  v,
    const stp_array_t * const stp_array_t *  value
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4542,13 +4533,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4504,7 +4495,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_boolean_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4568,7 +4559,7 @@ The value is set if the parameter is not already set. This avoids having to chec - + @@ -4594,13 +4585,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4556,7 +4547,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_curve_parameter ( stp_vars_t * stp_vars_t *  v,
    const stp_curve_t * const stp_curve_t *  value
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4646,13 +4637,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4608,7 +4599,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_dimension_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4698,13 +4689,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4660,7 +4651,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_file_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4757,13 +4748,13 @@ The value is set if the parameter is not already set. This avoids having to chec - +
    @@ -4712,7 +4703,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_file_parameter_n ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set (must not contain NUL).
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -4809,13 +4800,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4771,7 +4762,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_float_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4861,13 +4852,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4823,7 +4814,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_int_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -4920,13 +4911,13 @@ The value is set if the parameter is not already set. This avoids having to chec - +
    @@ -4875,7 +4866,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_raw_parameter ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -4972,13 +4963,13 @@ The value is set if the parameter is not already set. This avoids having to chec
    @@ -4934,7 +4925,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_string_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -5031,13 +5022,13 @@ The value is set if the parameter is not already set. This avoids having to chec - +
    @@ -4986,7 +4977,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_default_string_parameter_n ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set (must not contain NUL).
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -5083,13 +5074,13 @@ Set a dimension parameter.
    @@ -5045,7 +5036,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    void stp_set_dimension_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -5109,7 +5100,7 @@ Set a dimension parameter. - + @@ -5135,13 +5126,13 @@ Set the activity of a dimension parameter.
    @@ -5097,7 +5088,7 @@ Set a dimension parameter.
    void stp_set_dimension_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -5180,13 +5171,13 @@ Set the name of the printer driver.
    Parameters:
    @@ -5149,7 +5140,7 @@ Set the activity of a dimension parameter.
    void stp_set_driver ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the name to set.
    val the name to set.
    -

    +

    - + @@ -5232,13 +5223,13 @@ Set the name of the printer driver.
    @@ -5194,7 +5185,7 @@ Set the name of the printer driver.
    void stp_set_driver_n ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the name to set.
    bytes the length of val (in bytes).
    bytes the length of val (in bytes).
    -

    +

    - + @@ -5277,13 +5268,13 @@ Set the error data.
    Parameters:
    @@ -5246,7 +5237,7 @@ Set the name of the printer driver.
    void stp_set_errdata ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.
    val the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.
    -

    +

    - + - + @@ -5322,13 +5313,13 @@ Set the function used to print error and diagnostic information. These must be supplied by the caller. errdata is passed as an arguments to errfunc; typically it will be a file descriptor.
    Parameters:
    @@ -5291,13 +5282,13 @@ Set the error data.
    void stp_set_errfunc ( stp_vars_t * stp_vars_t *  v,
    stp_outfunc_t stp_outfunc_t  val
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -5374,13 +5365,13 @@ Set a file parameter.
    @@ -5336,7 +5327,7 @@ These must be supplied by the caller. errdata is passed as an arguments to errfu
    void stp_set_file_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -5400,7 +5391,7 @@ Set a file parameter. - + @@ -5426,13 +5417,13 @@ Set the activity of a file parameter.
    @@ -5388,7 +5379,7 @@ Set a file parameter.
    void stp_set_file_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -5485,13 +5476,13 @@ Set a file parameter. - +
    @@ -5440,7 +5431,7 @@ Set the activity of a file parameter.
    void stp_set_file_parameter_n ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set (must not contain NUL).
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -5537,13 +5528,13 @@ Set a float parameter.
    @@ -5499,7 +5490,7 @@ Set a file parameter.
    void stp_set_float_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -5563,7 +5554,7 @@ Set a float parameter. - + @@ -5589,13 +5580,13 @@ Set the activity of a float parameter.
    @@ -5551,7 +5542,7 @@ Set a float parameter.
    void stp_set_float_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -5634,13 +5625,13 @@ Set the height of the image.
    Parameters:
    @@ -5603,7 +5594,7 @@ Set the activity of a float parameter.
    void stp_set_height ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -5686,13 +5677,13 @@ Set an integer parameter.
    @@ -5648,7 +5639,7 @@ Set the height of the image.
    void stp_set_int_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -5712,7 +5703,7 @@ Set an integer parameter. - + @@ -5738,13 +5729,13 @@ Set the activity of an integer parameter.
    @@ -5700,7 +5691,7 @@ Set an integer parameter.
    void stp_set_int_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -5783,13 +5774,13 @@ Set the left edge of the image.
    Parameters:
    @@ -5752,7 +5743,7 @@ Set the activity of an integer parameter.
    void stp_set_left ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -5828,13 +5819,13 @@ Set the output data.
    Parameters:
    @@ -5797,7 +5788,7 @@ Set the left edge of the image.
    void stp_set_outdata ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.
    val the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.
    -

    +

    - + - + @@ -5873,13 +5864,13 @@ Set the function used to print output information. These must be supplied by the caller. outdata is passed as an arguments to outfunc; typically it will be a file descriptor.
    Parameters:
    @@ -5842,13 +5833,13 @@ Set the output data.
    void stp_set_outfunc ( stp_vars_t * stp_vars_t *  v,
    stp_outfunc_t stp_outfunc_t  val
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -5918,13 +5909,13 @@ Set the page height.
    Parameters:
    @@ -5887,7 +5878,7 @@ These must be supplied by the caller. outdata is passed as an arguments to outfu
    void stp_set_page_height ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -5963,13 +5954,13 @@ Set the page width.
    Parameters:
    @@ -5932,7 +5923,7 @@ Set the page height.
    void stp_set_page_width ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -6022,13 +6013,13 @@ Set a raw parameter. - +
    @@ -5977,7 +5968,7 @@ Set the page width.
    void stp_set_raw_parameter ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -6048,7 +6039,7 @@ Set a raw parameter. - + @@ -6074,13 +6065,13 @@ Set the activity of a raw parameter.
    @@ -6036,7 +6027,7 @@ Set a raw parameter.
    void stp_set_raw_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -6126,13 +6117,13 @@ Set a string parameter.
    @@ -6088,7 +6079,7 @@ Set the activity of a raw parameter.
    void stp_set_string_parameter ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    parameter the name of the parameter.
    value the value to set.
    value the value to set.
    -

    +

    - + @@ -6152,7 +6143,7 @@ Set a string parameter. - + @@ -6178,13 +6169,13 @@ Set the activity of a string parameter.
    @@ -6140,7 +6131,7 @@ Set a string parameter.
    void stp_set_string_parameter_active ( const stp_vars_t * const stp_vars_t *  v,
    stp_parameter_activity_t stp_parameter_activity_t  active
    - +
    v the vars to use.
    parameter the name of the parameter.
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    active the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
    -

    +

    - + @@ -6237,13 +6228,13 @@ Set a string parameter. - +
    @@ -6192,7 +6183,7 @@ Set the activity of a string parameter.
    void stp_set_string_parameter_n ( stp_vars_t * stp_vars_t *  v,
    v the vars to use.
    parameter the name of the parameter.
    value the value to set (must not contain NUL).
    bytes the length of value (in bytes).
    bytes the length of value (in bytes).
    -

    +

    - + @@ -6282,13 +6273,13 @@ Set the top edge of the image.
    Parameters:
    @@ -6251,7 +6242,7 @@ Set a string parameter.
    void stp_set_top ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + @@ -6325,7 +6316,7 @@ Set the top edge of the image.
    @@ -6296,7 +6287,7 @@ Set the top edge of the image.
    void stp_set_verified ( stp_vars_t * stp_vars_t *  v,
    -

    +

    - + @@ -6364,13 +6355,13 @@ Set the width of the image.
    Parameters:
    @@ -6333,7 +6324,7 @@ Set the top edge of the image.
    void stp_set_width ( stp_vars_t * stp_vars_t *  v,
    - +
    v the vars to use.
    val the value to set.
    val the value to set.
    -

    +

    - + - + @@ -6406,22 +6397,22 @@ Set the width of the image.

    Copy a vars object.

    -Both dest and source must be valid vars objects previously created with stp_vars_create().

    Parameters:
    +Both dest and source must be valid vars objects previously created with stp_vars_create().
    Parameters:
    @@ -6378,13 +6369,13 @@ Set the width of the image.
    void stp_vars_copy ( stp_vars_t * stp_vars_t *  dest,
    const stp_vars_t * const stp_vars_t *  source
    - +
    dest the destination vars.
    source the source vars.
    source the source vars.
    -

    +

    - + @@ -6442,19 +6433,19 @@ Both dest and source must be valid vars objects previously created with Create a new vars object.

    -

    Returns:
    the newly created vars object.
    +
    Returns:
    the newly created vars object.
    stp_vars_t* stp_vars_create stp_vars_t* stp_vars_create (  void 
    -

    +

    - + - + @@ -6473,16 +6464,16 @@ Create a new vars object.

    Copy and allocate a vars object.

    -source must be a valid vars object previously created with stp_vars_create().

    Parameters:
    +source must be a valid vars object previously created with stp_vars_create().
    Parameters:
    stp_vars_t* stp_vars_create_copy stp_vars_t* stp_vars_create_copy ( const stp_vars_t * const stp_vars_t *  source  ) 
    source the source vars.
    -
    Returns:
    the new copy of the vars.
    +
    Returns:
    the new copy of the vars.
    -

    +

    - + @@ -6511,13 +6502,13 @@ Destroy a vars object.

    It is an error to destroy the vars more than once.

    Parameters:
    @@ -6490,7 +6481,7 @@ source must be a valid vars object previously created with void stp_vars_destroy ( stp_vars_t * stp_vars_t *  v  ) 
    - +
    v the vars to destroy.
    v the vars to destroy.
    -

    +

    - + @@ -6549,19 +6540,19 @@ Verify that the parameters selected are consistent with those allowed by the dri
    @@ -6525,7 +6516,7 @@ It is an error to destroy the vars more than once.
    Parameters
    int stp_verify ( stp_vars_t * stp_vars_t *  v  ) 
    v the vars to use.
    -

    Returns:
    0 on failure, 1 on success; other status values are reserved.
    +
    Returns:
    0 on failure, 1 on success; other status values are reserved.
    -

    +

    - + - + @@ -6596,8 +6587,8 @@ Verify that the parameters selected are consistent with those allowed by the dri
    stp_parameter_verify_t stp_verify_parameter stp_parameter_verify_t stp_verify_parameter ( const stp_vars_t * const stp_vars_t *  v,
    -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html index e63d74e..99cd7cd 100644 --- a/doc/gutenprint/html/group__version.html +++ b/doc/gutenprint/html/group__version.html @@ -2,65 +2,56 @@ libgutenprint API Reference: version - - -
    -
    + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    version

    Version information. More... - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - +

    Defines

    #define STP_MAJOR_VERSION   (5)
    #define STP_MAJOR_VERSION   (5)
    #define STP_MINOR_VERSION   (0)
    #define STP_MINOR_VERSION   (0)
    #define STP_MICRO_VERSION   (0)
    #define STP_MICRO_VERSION   (0)
    #define STP_CURRENT_INTERFACE   (2)
    #define STP_CURRENT_INTERFACE   (2)
    #define STP_BINARY_AGE   (0)
    #define STP_BINARY_AGE   (0)
    #define STP_INTERFACE_AGE   (0)
    #define STP_INTERFACE_AGE   (0)
    #define STP_CHECK_VERSION(major, minor, micro)
    #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)
    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.
     Check whether the library provides the requested version.

    Variables

    const unsigned int stp_major_version
    const unsigned int stp_major_version
     The library major version number.
    const unsigned int stp_minor_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 minor version number.
    const unsigned int stp_micro_version
     The library micro version number.
    const unsigned int stp_current_interface
     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 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 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).
     The library ABI interface age number (number of revisions of this ABI).

    Detailed Description

    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

    -

    +Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants.

    Define Documentation

    +

    @@ -83,7 +74,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -114,16 +105,16 @@ Version information may be used to check the library version at compile-time, us

    -Value:

    (STP_MAJOR_VERSION >  (major) ||                \
-  (STP_MAJOR_VERSION == (major) &&              \
-   STP_MINOR_VERSION > (minor)) ||              \
-  (STP_MAJOR_VERSION == (major) &&              \
-   STP_MINOR_VERSION == (minor) &&              \
-   STP_MICRO_VERSION >= (micro)))
+Value:
    (STP_MAJOR_VERSION >  (major) ||                \
+  (STP_MAJOR_VERSION == (major) &&              \
+   STP_MINOR_VERSION > (minor)) ||              \
+  (STP_MAJOR_VERSION == (major) &&              \
+   STP_MINOR_VERSION == (minor) &&              \
+   STP_MICRO_VERSION >= (micro)))
    -

    +

    @@ -146,7 +137,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -169,7 +160,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -192,7 +183,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -215,7 +206,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -239,7 +230,7 @@ Version information may be used to check the library version at compile-time, us

    Function Documentation

    -

    +

    @@ -288,18 +279,18 @@ Check whether the library provides the requested version.
    required_micro the minimum micro revision.
    -

    Returns:
    NULL if the version matches, or else a description of the error if the library is too old or too new.
    +
    Returns:
    NULL if the version matches, or else a description of the error if the library is too old or too new.

    Variable Documentation

    -

    +

    @@ -318,13 +309,13 @@ The library ABI binary age number (number of forward-compatible revisions).
    - +
    const unsigned int stp_binary_age const unsigned int stp_binary_age
    -

    +

    @@ -343,13 +334,13 @@ The library ABI revision number (number of incompatible revisions).
    - +
    const unsigned int stp_current_interface const unsigned int stp_current_interface
    -

    +

    @@ -368,13 +359,13 @@ The library ABI interface age number (number of revisions of this ABI).
    - +
    const unsigned int stp_interface_age const unsigned int stp_interface_age
    -

    +

    @@ -393,13 +384,13 @@ The library major version number.
    - +
    const unsigned int stp_major_version const unsigned int stp_major_version
    -

    +

    @@ -418,13 +409,13 @@ The library micro version number.
    - +
    const unsigned int stp_micro_version const unsigned int stp_micro_version
    -

    +

    @@ -443,8 +434,8 @@ The library minor version number.
    - +
    const unsigned int stp_minor_version const unsigned int stp_minor_version
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html index 81f3ee8..15282a1 100644 --- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html +++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html @@ -2,51 +2,37 @@ 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
    +include » gutenprint

    gutenprint-intl-internal.h File Reference

    Internationalisation functions. More...

    #include <locale.h>
    - + - + - + - + - + - + - +

    Defines

    #define textdomain(String)   (String)
    #define textdomain(String)   (String)
    #define gettext(String)   (String)
    #define gettext(String)   (String)
    #define dgettext(Domain, Message)   (Message)
    #define dgettext(Domain, Message)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define _(String)   (String)
    #define _(String)   (String)
    #define N_(String)   (String)
    #define N_(String)   (String)

    Detailed Description

    Internationalisation functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html index 0a87444..5127e52 100644 --- a/doc/gutenprint/html/gutenprint-intl_8h.html +++ b/doc/gutenprint/html/gutenprint-intl_8h.html @@ -2,51 +2,37 @@ 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
    +include » gutenprint

    gutenprint-intl.h File Reference

    Internationalisation functions. More...

    #include <locale.h>
    - + - + - + - + - + - + - +

    Defines

    #define textdomain(String)   (String)
    #define textdomain(String)   (String)
    #define gettext(String)   (String)
    #define gettext(String)   (String)
    #define dgettext(Domain, Message)   (Message)
    #define dgettext(Domain, Message)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define dcgettext(Domain, Message, Type)   (Message)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define bindtextdomain(Domain, Directory)   (Domain)
    #define _(String)   (String)
    #define _(String)   (String)
    #define N_(String)   (String)
    #define N_(String)   (String)

    Detailed Description

    Internationalisation functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html index b6d6c59..c05fdc3 100644 --- a/doc/gutenprint/html/gutenprint-module_8h.html +++ b/doc/gutenprint/html/gutenprint-module_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    gutenprint-module.h File Reference

    Gutenprint module header. More...

    #include <gutenprint/gutenprint.h>
    @@ -36,14 +22,14 @@ - +

    Defines

    #define STP_MODULE   1
    #define STP_MODULE   1

    Detailed Description

    Gutenprint module header.

    -This header includes all of the public headers used by modules.

    Define Documentation

    -

    +This header includes all of the public headers used by modules.

    Define Documentation

    +

    @@ -66,8 +52,8 @@ This header includes all of the public headers used by modules.

    Define D

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html index a9be052..61df7f6 100644 --- a/doc/gutenprint/html/gutenprint-version_8h.html +++ b/doc/gutenprint/html/gutenprint-version_8h.html @@ -2,73 +2,59 @@ 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
    +include » gutenprint

    gutenprint-version.h File Reference

    Version functions. More...

    - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - +

    Defines

    #define STP_MAJOR_VERSION   (5)
    #define STP_MAJOR_VERSION   (5)
    #define STP_MINOR_VERSION   (0)
    #define STP_MINOR_VERSION   (0)
    #define STP_MICRO_VERSION   (0)
    #define STP_MICRO_VERSION   (0)
    #define STP_CURRENT_INTERFACE   (2)
    #define STP_CURRENT_INTERFACE   (2)
    #define STP_BINARY_AGE   (0)
    #define STP_BINARY_AGE   (0)
    #define STP_INTERFACE_AGE   (0)
    #define STP_INTERFACE_AGE   (0)
    #define STP_CHECK_VERSION(major, minor, micro)
    #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)
    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.
     Check whether the library provides the requested version.

    Variables

    const unsigned int stp_major_version
    const unsigned int stp_major_version
     The library major version number.
    const unsigned int stp_minor_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 minor version number.
    const unsigned int stp_micro_version
     The library micro version number.
    const unsigned int stp_current_interface
     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 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 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).
     The library ABI interface age number (number of revisions of this ABI).

    Detailed Description

    Version functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html index 7991ae3..1e29c7c 100644 --- a/doc/gutenprint/html/gutenprint_8h.html +++ b/doc/gutenprint/html/gutenprint_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    gutenprint.h File Reference

    Gutenprint master header. More...

    #include <stddef.h>
    @@ -41,8 +27,8 @@

    Detailed Description

    Gutenprint master header.

    -This header includes all of the public headers.

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +This header includes all of the public headers.
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html index 2f7de76..bb254e2 100644 --- a/doc/gutenprint/html/image_8h.html +++ b/doc/gutenprint/html/image_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    image.h File Reference

    Image functions. More...

    @@ -30,39 +16,39 @@ - + - + - + - - + - + - + - + - + - + - + - +
     The image type is an abstract data type for interfacing with the image creation program. More...

    Defines

    #define STP_CHANNEL_LIMIT   (32)
    #define STP_CHANNEL_LIMIT   (32)

    Typedefs

    typedef stp_image stp_image_t
    typedef stp_image stp_image_t
     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.

    Enumerations

    enum  stp_image_status_t { STP_IMAGE_STATUS_OK, -STP_IMAGE_STATUS_ABORT +
    enum  stp_image_status_t { STP_IMAGE_STATUS_OK, +STP_IMAGE_STATUS_ABORT }
     Image status. More...
     Image status. More...

    Functions

    void stp_image_init (stp_image_t *image)
    void stp_image_init (stp_image_t *image)
    void stp_image_reset (stp_image_t *image)
    void stp_image_reset (stp_image_t *image)
    int stp_image_width (stp_image_t *image)
    int stp_image_width (stp_image_t *image)
    int stp_image_height (stp_image_t *image)
    int stp_image_height (stp_image_t *image)
    stp_image_status_t stp_image_get_row (stp_image_t *image, unsigned char *data, size_t limit, int row)
    stp_image_status_t stp_image_get_row (stp_image_t *image, unsigned char *data, size_t limit, int row)
    const char * stp_image_get_appname (stp_image_t *image)
    const char * stp_image_get_appname (stp_image_t *image)
    void stp_image_conclude (stp_image_t *image)
    void stp_image_conclude (stp_image_t *image)

    Detailed Description

    Image functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html index f9cae59..12b5b75 100644 --- a/doc/gutenprint/html/index.html +++ b/doc/gutenprint/html/index.html @@ -2,22 +2,13 @@ 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-rc2

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +

    5.0.0-rc2

    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html index 470db26..3b7938f 100644 --- a/doc/gutenprint/html/list_8h.html +++ b/doc/gutenprint/html/list_8h.html @@ -2,133 +2,119 @@ 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
    +include » gutenprint

    list.h File Reference

    Generic list functions. More...

    - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Typedefs

    typedef stp_list_item stp_list_item_t
    typedef stp_list_item stp_list_item_t
     The list item opaque data type.
    typedef stp_list stp_list_t
     The list item opaque data type.
    typedef stp_list stp_list_t
     The list opaque data type.
    typedef void(* stp_node_freefunc )(void *)
     The list opaque data type.
    typedef void(* stp_node_freefunc )(void *)
     A callback function to free the data a node contains.
    typedef void *(* stp_node_copyfunc )(const void *)
     A callback function to free the data a node contains.
    typedef void *(* stp_node_copyfunc )(const void *)
     A callback function to copy the data a node contains.
    typedef const char *(* stp_node_namefunc )(const void *)
     A callback function to copy the data a node contains.
    typedef const char *(* stp_node_namefunc )(const void *)
     A callback function to get the name of a node.
    typedef int(* stp_node_sortfunc )(const void *, const void *)
     A callback function to get the name of a node.
    typedef int(* stp_node_sortfunc )(const void *, const void *)
     A callback function to compare two nodes.
     A callback function to compare two nodes.

    Functions

    void stp_list_node_free_data (void *item)
    void stp_list_node_free_data (void *item)
     Free node data allocated with stp_malloc.
    stp_list_t * stp_list_create (void)
     Free node data allocated with stp_malloc.
    stp_list_t * stp_list_create (void)
     Create a new list object.
    stp_list_t * stp_list_copy (const stp_list_t *list)
     Create a new list object.
    stp_list_t * stp_list_copy (const stp_list_t *list)
     Copy and allocate a list object.
    int stp_list_destroy (stp_list_t *list)
     Copy and allocate a list object.
    int stp_list_destroy (stp_list_t *list)
     Destroy a list object.
    stp_list_item_t * stp_list_get_start (const stp_list_t *list)
     Destroy a list object.
    stp_list_item_t * stp_list_get_start (const stp_list_t *list)
     Find the first item in a list.
    stp_list_item_t * stp_list_get_end (const stp_list_t *list)
     Find the first item in a list.
    stp_list_item_t * stp_list_get_end (const stp_list_t *list)
     Find the last item in a list.
    stp_list_item_t * stp_list_get_item_by_index (const stp_list_t *list, int idx)
     Find the last item in a list.
    stp_list_item_t * stp_list_get_item_by_index (const stp_list_t *list, int idx)
     Find an item in a list by its index.
    stp_list_item_t * stp_list_get_item_by_name (const stp_list_t *list, const char *name)
     Find an item in a list by its index.
    stp_list_item_t * stp_list_get_item_by_name (const stp_list_t *list, const char *name)
     Find an item in a list by its name.
    stp_list_item_t * stp_list_get_item_by_long_name (const stp_list_t *list, const char *long_name)
     Find an item in a list by its name.
    stp_list_item_t * stp_list_get_item_by_long_name (const stp_list_t *list, const char *long_name)
     Find an item in a list by its long name.
    int stp_list_get_length (const stp_list_t *list)
     Find an item in a list by its long name.
    int stp_list_get_length (const stp_list_t *list)
     Get the length of a list.
    void stp_list_set_freefunc (stp_list_t *list, stp_node_freefunc freefunc)
     Get the length of a list.
    void stp_list_set_freefunc (stp_list_t *list, stp_node_freefunc freefunc)
     Set a list node free function.
    stp_node_freefunc stp_list_get_freefunc (const stp_list_t *list)
     Set a list node free function.
    stp_node_freefunc stp_list_get_freefunc (const stp_list_t *list)
     Get a list node free function.
    void stp_list_set_copyfunc (stp_list_t *list, stp_node_copyfunc copyfunc)
     Get a list node free function.
    void stp_list_set_copyfunc (stp_list_t *list, stp_node_copyfunc copyfunc)
     Set a list node copy function.
    stp_node_copyfunc stp_list_get_copyfunc (const stp_list_t *list)
     Set a list node copy function.
    stp_node_copyfunc stp_list_get_copyfunc (const stp_list_t *list)
     Get a list node copy function.
    void stp_list_set_namefunc (stp_list_t *list, stp_node_namefunc namefunc)
     Get a list node copy function.
    void stp_list_set_namefunc (stp_list_t *list, stp_node_namefunc namefunc)
     Set a list node name function.
    stp_node_namefunc stp_list_get_namefunc (const stp_list_t *list)
     Set a list node name function.
    stp_node_namefunc stp_list_get_namefunc (const stp_list_t *list)
     Get a list node name function.
    void stp_list_set_long_namefunc (stp_list_t *list, stp_node_namefunc long_namefunc)
     Get a list node name function.
    void stp_list_set_long_namefunc (stp_list_t *list, stp_node_namefunc long_namefunc)
     Set a list node long name function.
    stp_node_namefunc stp_list_get_long_namefunc (const stp_list_t *list)
     Set a list node long name function.
    stp_node_namefunc stp_list_get_long_namefunc (const stp_list_t *list)
     Get a list node long name function.
    void stp_list_set_sortfunc (stp_list_t *list, stp_node_sortfunc sortfunc)
     Get a list node long name function.
    void stp_list_set_sortfunc (stp_list_t *list, stp_node_sortfunc sortfunc)
     Set a list node sort function.
    stp_node_sortfunc stp_list_get_sortfunc (const stp_list_t *list)
     Set a list node sort function.
    stp_node_sortfunc stp_list_get_sortfunc (const stp_list_t *list)
     Get a list node sort function.
    int stp_list_item_create (stp_list_t *list, stp_list_item_t *next, const void *data)
     Get a list node sort function.
    int stp_list_item_create (stp_list_t *list, stp_list_item_t *next, const void *data)
     Create a new list item.
    int stp_list_item_destroy (stp_list_t *list, stp_list_item_t *item)
     Create a new list item.
    int stp_list_item_destroy (stp_list_t *list, stp_list_item_t *item)
     Destroy a list item.
    stp_list_item_t * stp_list_item_prev (const stp_list_item_t *item)
     Destroy a list item.
    stp_list_item_t * stp_list_item_prev (const stp_list_item_t *item)
     Get the previous item in the list.
    stp_list_item_t * stp_list_item_next (const stp_list_item_t *item)
     Get the previous item in the list.
    stp_list_item_t * stp_list_item_next (const stp_list_item_t *item)
     Get the next item in the list.
    void * stp_list_item_get_data (const stp_list_item_t *item)
     Get the next item in the list.
    void * stp_list_item_get_data (const stp_list_item_t *item)
     Get the data associated with a list item.
    int stp_list_item_set_data (stp_list_item_t *item, void *data)
     Get the data associated with a list item.
    int stp_list_item_set_data (stp_list_item_t *item, void *data)
     Set the data associated with a list item.
     Set the data associated with a list item.

    Detailed Description

    Generic list functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html index 244163d..d3174c8 100644 --- a/doc/gutenprint/html/module_8h.html +++ b/doc/gutenprint/html/module_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    module.h File Reference

    Module functions. More...

    #include <gutenprint/list.h>
    @@ -32,40 +18,40 @@ struct  stp_module

    Typedefs

    -typedef stp_module_version stp_module_version_t +typedef stp_module_version stp_module_version_t -typedef stp_module stp_module_t +typedef stp_module stp_module_t

    Enumerations

    -enum  stp_module_class_t {
    -  STP_MODULE_CLASS_INVALID, -STP_MODULE_CLASS_MISC, -STP_MODULE_CLASS_FAMILY, -STP_MODULE_CLASS_COLOR, +enum  stp_module_class_t {
    +  STP_MODULE_CLASS_INVALID, +STP_MODULE_CLASS_MISC, +STP_MODULE_CLASS_FAMILY, +STP_MODULE_CLASS_COLOR,
    -  STP_MODULE_CLASS_DITHER +  STP_MODULE_CLASS_DITHER
    }

    Functions

    -int stp_module_load (void) +int stp_module_load (void) -int stp_module_exit (void) +int stp_module_exit (void) -int stp_module_open (const char *modulename) +int stp_module_open (const char *modulename) -int stp_module_init (void) +int stp_module_init (void) -int stp_module_close (stp_list_item_t *module) +int stp_module_close (stp_list_item_t *module) -stp_list_t * stp_module_get_class (stp_module_class_t class) +stp_list_t * stp_module_get_class (stp_module_class_t class)

    Detailed Description

    Module functions.

    Typedef Documentation

    -

    +

    @@ -88,7 +74,7 @@ Module functions.
    -

    +

    @@ -112,13 +98,13 @@ Module functions.

    Enumeration Type Documentation

    -

    +

    @@ -134,15 +120,15 @@ Module functions.

    Enumerator:
    - +
    enum stp_module_class_t enum stp_module_class_t
    - - - - -
    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 
    @@ -150,7 +136,7 @@ Module functions.

    Function Documentation

    -

    +

    - + @@ -178,7 +164,7 @@ Module functions.
    @@ -158,7 +144,7 @@ Module functions.
    int stp_module_close ( stp_list_item_t * stp_list_item_t *  module  ) 
    -

    +

    @@ -206,15 +192,15 @@ Module functions.
    -

    +

    - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    - + - + @@ -234,7 +220,7 @@ Module functions.
    stp_list_t* stp_module_get_class stp_list_t* stp_module_get_class ( stp_module_class_t stp_module_class_t  class  ) 
    -

    +

    @@ -262,7 +248,7 @@ Module functions.
    -

    +

    @@ -290,7 +276,7 @@ Module functions.
    -

    +

    @@ -318,8 +304,8 @@ Module functions.
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html index fe35819..a1acb0e 100644 --- a/doc/gutenprint/html/modules.html +++ b/doc/gutenprint/html/modules.html @@ -2,18 +2,9 @@ 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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html index 857fdf1..ca600fe 100644 --- a/doc/gutenprint/html/mxml_8h.html +++ b/doc/gutenprint/html/mxml_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    mxml.h File Reference

    Mini-XML XML parsing functions. More...

    #include <stdio.h>
    @@ -42,101 +28,101 @@

    struct  stp_mxml_node_s

    Defines

    #define STP_MXML_WRAP   70
    #define STP_MXML_WRAP   70
    #define STP_MXML_TAB   8
    #define STP_MXML_TAB   8
    #define STP_MXML_NO_CALLBACK   0
    #define STP_MXML_NO_CALLBACK   0
    #define STP_MXML_NO_PARENT   0
    #define STP_MXML_NO_PARENT   0
    #define STP_MXML_DESCEND   1
    #define STP_MXML_DESCEND   1
    #define STP_MXML_NO_DESCEND   0
    #define STP_MXML_NO_DESCEND   0
    #define STP_MXML_DESCEND_FIRST   -1
    #define STP_MXML_DESCEND_FIRST   -1
    #define STP_MXML_WS_BEFORE_OPEN   0
    #define STP_MXML_WS_BEFORE_OPEN   0
    #define STP_MXML_WS_AFTER_OPEN   1
    #define STP_MXML_WS_AFTER_OPEN   1
    #define STP_MXML_WS_BEFORE_CLOSE   2
    #define STP_MXML_WS_BEFORE_CLOSE   2
    #define STP_MXML_WS_AFTER_CLOSE   3
    #define STP_MXML_WS_AFTER_CLOSE   3
    #define STP_MXML_ADD_BEFORE   0
    #define STP_MXML_ADD_BEFORE   0
    #define STP_MXML_ADD_AFTER   1
    #define STP_MXML_ADD_AFTER   1
    #define STP_MXML_ADD_TO_PARENT   NULL
    #define STP_MXML_ADD_TO_PARENT   NULL

    Typedefs

    typedef enum stp_mxml_type_e stp_mxml_type_t
    typedef enum stp_mxml_type_e stp_mxml_type_t
    typedef stp_mxml_attr_s stp_mxml_attr_t
    typedef stp_mxml_attr_s stp_mxml_attr_t
    typedef stp_mxml_value_s stp_mxml_element_t
    typedef stp_mxml_value_s stp_mxml_element_t
    typedef stp_mxml_text_s stp_mxml_text_t
    typedef stp_mxml_text_s stp_mxml_text_t
    typedef stp_mxml_value_u stp_mxml_value_t
    typedef stp_mxml_value_u stp_mxml_value_t
    typedef stp_mxml_node_s stp_mxml_node_t
    typedef stp_mxml_node_s stp_mxml_node_t

    Enumerations

    enum  stp_mxml_type_e {
    -  STP_MXML_ELEMENT, -STP_MXML_INTEGER, -STP_MXML_OPAQUE, -STP_MXML_REAL, +
    enum  stp_mxml_type_e {
    +  STP_MXML_ELEMENT, +STP_MXML_INTEGER, +STP_MXML_OPAQUE, +STP_MXML_REAL,
    -  STP_MXML_TEXT +  STP_MXML_TEXT
    }

    Functions

    void stp_mxmlAdd (stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)
    void stp_mxmlAdd (stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)
    void stp_mxmlDelete (stp_mxml_node_t *node)
    void stp_mxmlDelete (stp_mxml_node_t *node)
    const char * stp_mxmlElementGetAttr (stp_mxml_node_t *node, const char *name)
    const char * stp_mxmlElementGetAttr (stp_mxml_node_t *node, const char *name)
    void stp_mxmlElementSetAttr (stp_mxml_node_t *node, const char *name, const char *value)
    void stp_mxmlElementSetAttr (stp_mxml_node_t *node, const char *name, const char *value)
    stp_mxml_node_t * stp_mxmlFindElement (stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)
    stp_mxml_node_t * stp_mxmlFindElement (stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)
    stp_mxml_node_t * stp_mxmlLoadFile (stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))
    stp_mxml_node_t * stp_mxmlLoadFile (stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))
    stp_mxml_node_t * stp_mxmlLoadString (stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))
    stp_mxml_node_t * stp_mxmlLoadString (stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))
    stp_mxml_node_t * stp_mxmlNewElement (stp_mxml_node_t *parent, const char *name)
    stp_mxml_node_t * stp_mxmlNewElement (stp_mxml_node_t *parent, const char *name)
    stp_mxml_node_t * stp_mxmlNewInteger (stp_mxml_node_t *parent, int integer)
    stp_mxml_node_t * stp_mxmlNewInteger (stp_mxml_node_t *parent, int integer)
    stp_mxml_node_t * stp_mxmlNewOpaque (stp_mxml_node_t *parent, const char *opaque)
    stp_mxml_node_t * stp_mxmlNewOpaque (stp_mxml_node_t *parent, const char *opaque)
    stp_mxml_node_t * stp_mxmlNewReal (stp_mxml_node_t *parent, double real)
    stp_mxml_node_t * stp_mxmlNewReal (stp_mxml_node_t *parent, double real)
    stp_mxml_node_t * stp_mxmlNewText (stp_mxml_node_t *parent, int whitespace, const char *string)
    stp_mxml_node_t * stp_mxmlNewText (stp_mxml_node_t *parent, int whitespace, const char *string)
    void stp_mxmlRemove (stp_mxml_node_t *node)
    void stp_mxmlRemove (stp_mxml_node_t *node)
    char * stp_mxmlSaveAllocString (stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))
    char * stp_mxmlSaveAllocString (stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))
    int stp_mxmlSaveFile (stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))
    int stp_mxmlSaveFile (stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))
    int stp_mxmlSaveString (stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))
    int stp_mxmlSaveString (stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))
    stp_mxml_node_t * stp_mxmlWalkNext (stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)
    stp_mxml_node_t * stp_mxmlWalkNext (stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)
    stp_mxml_node_t * stp_mxmlWalkPrev (stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)
    stp_mxml_node_t * stp_mxmlWalkPrev (stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)

    Detailed Description

    Mini-XML XML parsing functions.

    Define Documentation

    -

    +

    @@ -159,7 +145,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -182,7 +168,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -205,7 +191,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -228,7 +214,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -251,7 +237,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -274,7 +260,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -297,7 +283,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -320,7 +306,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -343,7 +329,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -366,7 +352,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -389,7 +375,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -412,7 +398,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -435,7 +421,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -459,7 +445,7 @@ Mini-XML XML parsing functions.

    Typedef Documentation

    -

    +

    @@ -482,7 +468,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -505,7 +491,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -528,7 +514,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -551,13 +537,13 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -574,7 +560,7 @@ Mini-XML XML parsing functions.
    - +
    typedef enum stp_mxml_type_e stp_mxml_type_t typedef enum stp_mxml_type_e stp_mxml_type_t
    -

    +

    @@ -598,13 +584,13 @@ Mini-XML XML parsing functions.

    Enumeration Type Documentation

    -

    +

    @@ -620,15 +606,15 @@ Mini-XML XML parsing functions.

    Enumerator:
    - +
    enum stp_mxml_type_e enum stp_mxml_type_e
    - - - - -
    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 
    @@ -636,7 +622,7 @@ Mini-XML XML parsing functions.

    Function Documentation

    -

    +

    @@ -685,7 +671,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -713,7 +699,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -750,7 +736,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -793,7 +779,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -854,7 +840,7 @@ Mini-XML XML parsing functions.
    -

    +

    - + @@ -897,7 +883,7 @@ Mini-XML XML parsing functions.
    @@ -874,7 +860,7 @@ Mini-XML XML parsing functions.
    stp_mxml_type_t(*)(stp_mxml_node_t *) stp_mxml_type_t(*)(stp_mxml_node_t *)  cb
    -

    +

    - + @@ -940,7 +926,7 @@ Mini-XML XML parsing functions.
    @@ -917,7 +903,7 @@ Mini-XML XML parsing functions.
    stp_mxml_type_t(*)(stp_mxml_node_t *) stp_mxml_type_t(*)(stp_mxml_node_t *)  cb
    -

    +

    @@ -977,7 +963,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1014,7 +1000,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1051,7 +1037,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1088,7 +1074,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1131,7 +1117,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1159,7 +1145,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1196,7 +1182,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1239,7 +1225,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1288,7 +1274,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1331,7 +1317,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1374,8 +1360,8 @@ Mini-XML XML parsing functions.
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html index cf711ee..8aba885 100644 --- a/doc/gutenprint/html/pages.html +++ b/doc/gutenprint/html/pages.html @@ -2,24 +2,15 @@ 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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html index cef07ec..c987743 100644 --- a/doc/gutenprint/html/paper_8h.html +++ b/doc/gutenprint/html/paper_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    paper.h File Reference

    Paper size functions. More...

    #include <gutenprint/vars.h>
    @@ -31,34 +17,34 @@  The papersize data type. More...

    Enumerations

    -enum  stp_papersize_unit_t { PAPERSIZE_ENGLISH_STANDARD, -PAPERSIZE_METRIC_STANDARD, -PAPERSIZE_ENGLISH_EXTENDED, -PAPERSIZE_METRIC_EXTENDED +enum  stp_papersize_unit_t { PAPERSIZE_ENGLISH_STANDARD, +PAPERSIZE_METRIC_STANDARD, +PAPERSIZE_ENGLISH_EXTENDED, +PAPERSIZE_METRIC_EXTENDED } - Units of measurement. More...
    + Units of measurement. More...

    Functions

    -int stp_known_papersizes (void) +int stp_known_papersizes (void) - Get the number of available papersizes.
    -const stp_papersize_t * stp_get_papersize_by_name (const char *name) + Get the number of available papersizes.
    +const stp_papersize_t * stp_get_papersize_by_name (const char *name) - Get a papersize by name.
    -const stp_papersize_t * stp_get_papersize_by_size (int length, int width) + Get a papersize by name.
    +const stp_papersize_t * stp_get_papersize_by_size (int length, int width) - Get a papersize by size.
    -const stp_papersize_t * stp_get_papersize_by_index (int idx) + Get a papersize by size.
    +const stp_papersize_t * stp_get_papersize_by_index (int idx) - Get a papersize by its index number.
    -void stp_default_media_size (const stp_vars_t *v, int *width, int *height) + Get a papersize by its index number.
    +void stp_default_media_size (const stp_vars_t *v, int *width, int *height)

    Detailed Description

    Paper size functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html index bb6083c..8bd6b7f 100644 --- a/doc/gutenprint/html/path_8h.html +++ b/doc/gutenprint/html/path_8h.html @@ -2,48 +2,34 @@ 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
    +include » gutenprint

    path.h File Reference

    Simple directory path functions. More...

    - + - +

    Functions

    stp_list_t * stp_path_search (stp_list_t *dirlist, const char *suffix)
    stp_list_t * stp_path_search (stp_list_t *dirlist, const char *suffix)
    void stp_path_split (stp_list_t *list, const char *path)
    void stp_path_split (stp_list_t *list, const char *path)

    Detailed Description

    Simple directory path functions.

    Function Documentation

    -

    +

    - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - +
    - + - + @@ -72,7 +58,7 @@ Simple directory path functions.
    stp_list_t* stp_path_search stp_list_t* stp_path_search ( stp_list_t * stp_list_t *  dirlist,
    -

    +

    - + @@ -109,8 +95,8 @@ Simple directory path functions.
    @@ -80,7 +66,7 @@ Simple directory path functions.
    void stp_path_split ( stp_list_t * stp_list_t *  list,
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html index ef20727..5afc427 100644 --- a/doc/gutenprint/html/printers_8h.html +++ b/doc/gutenprint/html/printers_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    printers.h File Reference

    Printer functions. More...

    #include <gutenprint/list.h>
    @@ -33,82 +19,82 @@

    struct  stp_family

    Typedefs

    typedef stp_printer stp_printer_t
    typedef stp_printer stp_printer_t
     The printer opaque data type (representation of printer model).
    typedef stp_family stp_family_t
     The printer opaque data type (representation of printer model).
    typedef stp_family stp_family_t

    Functions

    int stp_printer_model_count (void)
    int stp_printer_model_count (void)
     Get the number of available printer models.
    const stp_printer_t * stp_get_printer_by_index (int idx)
     Get the number of available printer models.
    const stp_printer_t * stp_get_printer_by_index (int idx)
     Get a printer model by its index number.
    const stp_printer_t * stp_get_printer_by_long_name (const char *long_name)
     Get a printer model by its index number.
    const stp_printer_t * stp_get_printer_by_long_name (const char *long_name)
     Get a printer model by its long (translated) name.
    const stp_printer_t * stp_get_printer_by_driver (const char *driver)
     Get a printer model by its long (translated) name.
    const stp_printer_t * stp_get_printer_by_driver (const char *driver)
     Get a printer model by its short name.
    const stp_printer_t * stp_get_printer (const stp_vars_t *v)
     Get a printer model by its short name.
    const stp_printer_t * stp_get_printer (const stp_vars_t *v)
     Get the printer model from a vars object.
    int stp_get_printer_index_by_driver (const char *driver)
     Get the printer model from a vars object.
    int stp_get_printer_index_by_driver (const char *driver)
     Get the printer index number from the printer model short (driver) name.
    const char * stp_printer_get_long_name (const stp_printer_t *p)
     Get the printer index number from the printer model short (driver) name.
    const char * stp_printer_get_long_name (const stp_printer_t *p)
     Get a printer model's long (translated) name.
    const char * stp_printer_get_driver (const stp_printer_t *p)
     Get a printer model's long (translated) name.
    const char * stp_printer_get_driver (const stp_printer_t *p)
     Get a printer model's short (driver) name.
    const char * stp_printer_get_family (const stp_printer_t *p)
     Get a printer model's short (driver) name.
    const char * stp_printer_get_family (const stp_printer_t *p)
     Get a printer model's family name.
    const char * stp_printer_get_manufacturer (const stp_printer_t *p)
     Get a printer model's family name.
    const char * stp_printer_get_manufacturer (const stp_printer_t *p)
     Get a printer model's manufacturer's name.
    int stp_printer_get_model (const stp_printer_t *p)
     Get a printer model's manufacturer's name.
    int stp_printer_get_model (const stp_printer_t *p)
     Get a printer model's model number.
    const stp_vars_t * stp_printer_get_defaults (const stp_printer_t *p)
     Get a printer model's model number.
    const stp_vars_t * stp_printer_get_defaults (const stp_printer_t *p)
     Get the default vars for a particular printer model.
    void stp_set_printer_defaults (stp_vars_t *v, const stp_printer_t *p)
     Get the default vars for a particular printer model.
    void stp_set_printer_defaults (stp_vars_t *v, const stp_printer_t *p)
     Set a vars object to use a particular driver, and set the parameter to its defaults.
    int stp_print (const stp_vars_t *v, stp_image_t *image)
     Set a vars object to use a particular driver, and set the parameter to its defaults.
    int stp_print (const stp_vars_t *v, stp_image_t *image)
     Print the image.
    int stp_start_job (const stp_vars_t *v, stp_image_t *image)
     Print the image.
    int stp_start_job (const stp_vars_t *v, stp_image_t *image)
     Start a print job.
    int stp_end_job (const stp_vars_t *v, stp_image_t *image)
     Start a print job.
    int stp_end_job (const stp_vars_t *v, stp_image_t *image)
     End a print job.
    int stp_get_model_id (const stp_vars_t *v)
     End a print job.
    int stp_get_model_id (const stp_vars_t *v)
    int stp_verify_printer_params (stp_vars_t *v)
    int stp_verify_printer_params (stp_vars_t *v)
    int stp_family_register (stp_list_t *family)
    int stp_family_register (stp_list_t *family)
    int stp_family_unregister (stp_list_t *family)
    int stp_family_unregister (stp_list_t *family)
    void stp_initialize_printer_defaults (void)
    void stp_initialize_printer_defaults (void)
    stp_parameter_list_t stp_printer_list_parameters (const stp_vars_t *v)
    stp_parameter_list_t stp_printer_list_parameters (const stp_vars_t *v)
    void stp_printer_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    void stp_printer_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description)
    const char * stp_describe_output (const stp_vars_t *v)
    const char * stp_describe_output (const stp_vars_t *v)

    Detailed Description

    Printer functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html index f07d513..fc6a343 100644 --- a/doc/gutenprint/html/sequence_8h.html +++ b/doc/gutenprint/html/sequence_8h.html @@ -2,124 +2,110 @@ 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
    +include » gutenprint

    sequence.h File Reference

    Sequence functions. More...

    - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Typedefs

    typedef stp_sequence stp_sequence_t
    typedef stp_sequence stp_sequence_t
     The sequence opaque data type.
     The sequence opaque data type.

    Functions

    stp_sequence_t * stp_sequence_create (void)
    stp_sequence_t * stp_sequence_create (void)
     Create a new sequence.
    void stp_sequence_destroy (stp_sequence_t *sequence)
     Create a new sequence.
    void stp_sequence_destroy (stp_sequence_t *sequence)
     Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source)
     Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source)
     Copy an sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence)
     Copy an sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence)
     Copy and allocate an sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)
     Copy and allocate an sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)
     Set the lower and upper bounds.
    void stp_sequence_get_bounds (const stp_sequence_t *sequence, double *low, double *high)
     Set the lower and upper bounds.
    void stp_sequence_get_bounds (const stp_sequence_t *sequence, double *low, double *high)
     Get the lower and upper bounds.
    void stp_sequence_get_range (const stp_sequence_t *sequence, double *low, double *high)
     Get the lower and upper bounds.
    void stp_sequence_get_range (const stp_sequence_t *sequence, double *low, double *high)
     Get range of values stored in the sequence.
    int stp_sequence_set_size (stp_sequence_t *sequence, size_t size)
     Get range of values stored in the sequence.
    int stp_sequence_set_size (stp_sequence_t *sequence, size_t size)
     Set the sequence size.
    size_t stp_sequence_get_size (const stp_sequence_t *sequence)
     Set the sequence size.
    size_t stp_sequence_get_size (const stp_sequence_t *sequence)
     Get the sequence size.
    int stp_sequence_set_data (stp_sequence_t *sequence, size_t count, const double *data)
     Get the sequence size.
    int stp_sequence_set_data (stp_sequence_t *sequence, size_t count, const double *data)
     Set the data in a sequence.
    int stp_sequence_set_subrange (stp_sequence_t *sequence, size_t where, size_t size, const double *data)
     Set the data in a sequence.
    int stp_sequence_set_subrange (stp_sequence_t *sequence, size_t where, size_t size, const double *data)
     Set the data in a subrange of a sequence.
    void stp_sequence_get_data (const stp_sequence_t *sequence, size_t *size, const double **data)
     Set the data in a subrange of a sequence.
    void stp_sequence_get_data (const stp_sequence_t *sequence, size_t *size, const double **data)
     Get the data in a sequence.
    int stp_sequence_set_point (stp_sequence_t *sequence, size_t where, double data)
     Get the data in a sequence.
    int stp_sequence_set_point (stp_sequence_t *sequence, size_t where, double data)
     Set the data at a single point in a sequence.
    int stp_sequence_get_point (const stp_sequence_t *sequence, size_t where, double *data)
     Set the data at a single point in a sequence.
    int stp_sequence_get_point (const stp_sequence_t *sequence, size_t where, double *data)
     Get the data at a single point in a sequence.
    int stp_sequence_set_float_data (stp_sequence_t *sequence, size_t count, const float *data)
     Get the data at a single point in a sequence.
    int stp_sequence_set_float_data (stp_sequence_t *sequence, size_t count, const float *data)
     Set the data in a sequence from float values.
    int stp_sequence_set_long_data (stp_sequence_t *sequence, size_t count, const long *data)
     Set the data in a sequence from float values.
    int stp_sequence_set_long_data (stp_sequence_t *sequence, size_t count, const long *data)
     Set the data in a sequence from long values.
    int stp_sequence_set_ulong_data (stp_sequence_t *sequence, size_t count, const unsigned long *data)
     Set the data in a sequence from long values.
    int stp_sequence_set_ulong_data (stp_sequence_t *sequence, size_t count, const unsigned long *data)
     Set the data in a sequence from unsigned long values.
    int stp_sequence_set_int_data (stp_sequence_t *sequence, size_t count, const int *data)
     Set the data in a sequence from unsigned long values.
    int stp_sequence_set_int_data (stp_sequence_t *sequence, size_t count, const int *data)
     Set the data in a sequence from int values.
    int stp_sequence_set_uint_data (stp_sequence_t *sequence, size_t count, const unsigned int *data)
     Set the data in a sequence from int values.
    int stp_sequence_set_uint_data (stp_sequence_t *sequence, size_t count, const unsigned int *data)
     Set the data in a sequence from unsigned int values.
    int stp_sequence_set_short_data (stp_sequence_t *sequence, size_t count, const short *data)
     Set the data in a sequence from unsigned int values.
    int stp_sequence_set_short_data (stp_sequence_t *sequence, size_t count, const short *data)
     Set the data in a sequence from short values.
    int stp_sequence_set_ushort_data (stp_sequence_t *sequence, size_t count, const unsigned short *data)
     Set the data in a sequence from short values.
    int stp_sequence_set_ushort_data (stp_sequence_t *sequence, size_t count, const unsigned short *data)
     Set the data in a sequence from unsigned short values.
    const float * stp_sequence_get_float_data (const stp_sequence_t *sequence, size_t *count)
     Set the data in a sequence from unsigned short values.
    const float * stp_sequence_get_float_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as float data.
    const long * stp_sequence_get_long_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as float data.
    const long * stp_sequence_get_long_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as long data.
    const unsigned long * stp_sequence_get_ulong_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as long data.
    const unsigned long * stp_sequence_get_ulong_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned long data.
    const int * stp_sequence_get_int_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned long data.
    const int * stp_sequence_get_int_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as int data.
    const unsigned int * stp_sequence_get_uint_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as int data.
    const unsigned int * stp_sequence_get_uint_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned int data.
    const short * stp_sequence_get_short_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned int data.
    const short * stp_sequence_get_short_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as short data.
    const unsigned short * stp_sequence_get_ushort_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as short data.
    const unsigned short * stp_sequence_get_ushort_data (const stp_sequence_t *sequence, size_t *count)
     Get the data in a sequence as unsigned short data.
     Get the data in a sequence as unsigned short data.

    Detailed Description

    Sequence functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html index 69c9620..ed0752b 100644 --- a/doc/gutenprint/html/string-list_8h.html +++ b/doc/gutenprint/html/string-list_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    string-list.h File Reference

    String list functions. More...

    @@ -30,42 +16,42 @@ - + - + - + - + - + - + - + - + - + - + - + - +
     String parameter. More...

    Typedefs

    typedef stp_string_list stp_string_list_t
    typedef stp_string_list stp_string_list_t
     The string_list opaque data type.
     The string_list opaque data type.

    Functions

    stp_string_list_t * stp_string_list_create (void)
    stp_string_list_t * stp_string_list_create (void)
    void stp_string_list_destroy (stp_string_list_t *list)
    void stp_string_list_destroy (stp_string_list_t *list)
    stp_param_string_t * stp_string_list_param (const stp_string_list_t *list, size_t element)
    stp_param_string_t * stp_string_list_param (const stp_string_list_t *list, size_t element)
    stp_param_string_t * stp_string_list_find (const stp_string_list_t *list, const char *name)
    stp_param_string_t * stp_string_list_find (const stp_string_list_t *list, const char *name)
    size_t stp_string_list_count (const stp_string_list_t *list)
    size_t stp_string_list_count (const stp_string_list_t *list)
    stp_string_list_t * stp_string_list_create_copy (const stp_string_list_t *list)
    stp_string_list_t * stp_string_list_create_copy (const stp_string_list_t *list)
    void stp_string_list_add_string (stp_string_list_t *list, const char *name, const char *text)
    void stp_string_list_add_string (stp_string_list_t *list, const char *name, const char *text)
    void stp_string_list_remove_string (stp_string_list_t *list, const char *name)
    void stp_string_list_remove_string (stp_string_list_t *list, const char *name)
    stp_string_list_t * stp_string_list_create_from_params (const stp_param_string_t *list, size_t count)
    stp_string_list_t * stp_string_list_create_from_params (const stp_param_string_t *list, size_t count)
    int stp_string_list_is_present (const stp_string_list_t *list, const char *value)
    int stp_string_list_is_present (const stp_string_list_t *list, const char *value)

    Detailed Description

    String list functions.

    Typedef Documentation

    -

    +

    @@ -85,7 +71,7 @@ The string_list opaque data type.
    - +
    typedef struct stp_string_list stp_string_list_t typedef struct stp_string_list stp_string_list_t

    Function Documentation

    -

    +

    - + @@ -128,7 +114,7 @@ The string_list opaque data type.
    @@ -93,7 +79,7 @@ The string_list opaque data type.
    void stp_string_list_add_string ( stp_string_list_t * stp_string_list_t *  list,
    -

    +

    - + @@ -156,13 +142,13 @@ The string_list opaque data type.
    @@ -136,7 +122,7 @@ The string_list opaque data type.
    size_t stp_string_list_count ( const stp_string_list_t * const stp_string_list_t *  list  ) 
    -

    +

    - + @@ -184,15 +170,15 @@ The string_list opaque data type.
    stp_string_list_t* stp_string_list_create stp_string_list_t* stp_string_list_create (  void 
    -

    +

    - + - + @@ -212,13 +198,13 @@ The string_list opaque data type.
    stp_string_list_t* stp_string_list_create_copy stp_string_list_t* stp_string_list_create_copy ( const stp_string_list_t * const stp_string_list_t *  list  ) 
    -

    +

    - + @@ -249,7 +235,7 @@ The string_list opaque data type.
    stp_string_list_t* stp_string_list_create_from_params stp_string_list_t* stp_string_list_create_from_params (  const stp_param_string_t *  list,
    -

    +

    - + @@ -277,7 +263,7 @@ The string_list opaque data type.
    @@ -257,7 +243,7 @@ The string_list opaque data type.
    void stp_string_list_destroy ( stp_string_list_t * stp_string_list_t *  list  ) 
    -

    +

    - + @@ -314,7 +300,7 @@ The string_list opaque data type.
    @@ -285,7 +271,7 @@ The string_list opaque data type.
    stp_param_string_t* stp_string_list_find ( const stp_string_list_t * const stp_string_list_t *  list,
    -

    +

    - + @@ -351,7 +337,7 @@ The string_list opaque data type.
    @@ -322,7 +308,7 @@ The string_list opaque data type.
    int stp_string_list_is_present ( const stp_string_list_t * const stp_string_list_t *  list,
    -

    +

    - + @@ -388,7 +374,7 @@ The string_list opaque data type.
    @@ -359,7 +345,7 @@ The string_list opaque data type.
    stp_param_string_t* stp_string_list_param ( const stp_string_list_t * const stp_string_list_t *  list,
    -

    +

    - + @@ -425,8 +411,8 @@ The string_list opaque data type.
    @@ -396,7 +382,7 @@ The string_list opaque data type.
    void stp_string_list_remove_string ( stp_string_list_t * stp_string_list_t *  list,
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html index 90c736e..8c60728 100644 --- a/doc/gutenprint/html/structdither__matrix__impl.html +++ b/doc/gutenprint/html/structdither__matrix__impl.html @@ -2,68 +2,53 @@ 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>

    - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

    Data Fields

    int base
    int base
    int exp
    int exp
    int x_size
    int x_size
    int y_size
    int y_size
    int total_size
    int total_size
    int last_x
    int last_x
    int last_x_mod
    int last_x_mod
    int last_y
    int last_y
    int last_y_mod
    int last_y_mod
    int index
    int index
    int i_own
    int i_own
    int x_offset
    int x_offset
    int y_offset
    int y_offset
    unsigned fast_mask
    unsigned fast_mask
    unsigned * matrix
    unsigned * matrix

    Field Documentation

    -

    +

    @@ -80,13 +65,13 @@
    - +
    int dither_matrix_impl::base int dither_matrix_impl::base
    -

    +

    @@ -103,13 +88,13 @@
    - +
    int dither_matrix_impl::exp int dither_matrix_impl::exp
    -

    +

    @@ -126,13 +111,13 @@
    - +
    unsigned dither_matrix_impl::fast_mask unsigned dither_matrix_impl::fast_mask
    -

    +

    @@ -149,13 +134,13 @@
    - +
    int dither_matrix_impl::i_own int dither_matrix_impl::i_own
    -

    +

    @@ -172,13 +157,13 @@
    - +
    int dither_matrix_impl::index int dither_matrix_impl::index
    -

    +

    @@ -195,13 +180,13 @@
    - +
    int dither_matrix_impl::last_x int dither_matrix_impl::last_x
    -

    +

    @@ -218,13 +203,13 @@
    - +
    int dither_matrix_impl::last_x_mod int dither_matrix_impl::last_x_mod
    -

    +

    @@ -241,13 +226,13 @@
    - +
    int dither_matrix_impl::last_y int dither_matrix_impl::last_y
    -

    +

    @@ -264,13 +249,13 @@
    - +
    int dither_matrix_impl::last_y_mod int dither_matrix_impl::last_y_mod
    -

    +

    @@ -287,13 +272,13 @@
    - +
    unsigned* dither_matrix_impl::matrix unsigned* dither_matrix_impl::matrix
    -

    +

    @@ -310,13 +295,13 @@
    - +
    int dither_matrix_impl::total_size int dither_matrix_impl::total_size
    -

    +

    @@ -333,13 +318,13 @@
    - +
    int dither_matrix_impl::x_offset int dither_matrix_impl::x_offset
    -

    +

    @@ -356,13 +341,13 @@
    - +
    int dither_matrix_impl::x_size int dither_matrix_impl::x_size
    -

    +

    @@ -379,13 +364,13 @@
    - +
    int dither_matrix_impl::y_offset int dither_matrix_impl::y_offset
    -

    +

    @@ -404,8 +389,8 @@
    - +
    int dither_matrix_impl::y_size int dither_matrix_impl::y_size

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html index af05a28..ab5987c 100644 --- a/doc/gutenprint/html/structstp__cached__curve__t.html +++ b/doc/gutenprint/html/structstp__cached__curve__t.html @@ -2,46 +2,31 @@ 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>

    - + - + - + - +

    Data Fields

    stp_curve_t * curve
    stp_curve_t * curve
    const double * d_cache
    const double * d_cache
    const unsigned short * s_cache
    const unsigned short * s_cache
    size_t count
    size_t count

    Field Documentation

    -

    +

    @@ -58,13 +43,13 @@
    - +
    size_t stp_cached_curve_t::count size_t stp_cached_curve_t::count
    -

    +

    @@ -81,13 +66,13 @@
    - +
    stp_curve_t* stp_cached_curve_t::curve stp_curve_t* stp_cached_curve_t::curve
    -

    +

    @@ -104,13 +89,13 @@
    - +
    const double* stp_cached_curve_t::d_cache const double* stp_cached_curve_t::d_cache
    -

    +

    @@ -129,8 +114,8 @@
    - +
    const unsigned short* stp_cached_curve_t::s_cache const unsigned short* stp_cached_curve_t::s_cache

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html index 1b8d608..5fd1475 100644 --- a/doc/gutenprint/html/structstp__color.html +++ b/doc/gutenprint/html/structstp__color.html @@ -2,24 +2,9 @@ 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] @@ -28,21 +13,21 @@ - + - + - +

    Data Fields

    const char * short_name
    const char * short_name
    const char * long_name
    const char * long_name
    const stp_colorfuncs_t * colorfuncs
    const stp_colorfuncs_t * colorfuncs

    Field Documentation

    -

    +

    @@ -59,13 +44,13 @@
    - +
    const stp_colorfuncs_t* stp_color::colorfuncs const stp_colorfuncs_t* stp_color::colorfuncs
    -

    +

    @@ -82,13 +67,13 @@
    - +
    const char* stp_color::long_name const char* stp_color::long_name
    -

    +

    @@ -107,8 +92,8 @@
    - +
    const char* stp_color::short_name const char* stp_color::short_name

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html index e5582f0..f87b829 100644 --- a/doc/gutenprint/html/structstp__colorfuncs__t.html +++ b/doc/gutenprint/html/structstp__colorfuncs__t.html @@ -2,24 +2,9 @@ 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] @@ -28,23 +13,23 @@ - + - + - + - +

    Data Fields

    int(* init )(stp_vars_t *v, stp_image_t *image, size_t steps)
    int(* init )(stp_vars_t *v, stp_image_t *image, size_t steps)
    int(* get_row )(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
    int(* get_row )(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
    stp_parameter_list_t(* list_parameters )(const stp_vars_t *v)
    stp_parameter_list_t(* list_parameters )(const stp_vars_t *v)
    void(* describe_parameter )(const stp_vars_t *v, const char *name, stp_parameter_t *description)
    void(* describe_parameter )(const stp_vars_t *v, const char *name, stp_parameter_t *description)

    Field Documentation

    -

    +

    @@ -61,13 +46,13 @@
    - +
    void(* stp_colorfuncs_t::describe_parameter)(const stp_vars_t *v, const char *name, stp_parameter_t *description) void(* stp_colorfuncs_t::describe_parameter)(const stp_vars_t *v, const char *name, stp_parameter_t *description)
    -

    +

    @@ -84,13 +69,13 @@
    - +
    int(* stp_colorfuncs_t::get_row)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask) int(* stp_colorfuncs_t::get_row)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)
    -

    +

    @@ -107,13 +92,13 @@
    - +
    int(* stp_colorfuncs_t::init)(stp_vars_t *v, stp_image_t *image, size_t steps) int(* stp_colorfuncs_t::init)(stp_vars_t *v, stp_image_t *image, size_t steps)
    -

    +

    @@ -132,8 +117,8 @@
    - +
    stp_parameter_list_t(* stp_colorfuncs_t::list_parameters)(const stp_vars_t *v) stp_parameter_list_t(* stp_colorfuncs_t::list_parameters)(const stp_vars_t *v)

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html index 5b950ee..62a667b 100644 --- a/doc/gutenprint/html/structstp__curve__point__t.html +++ b/doc/gutenprint/html/structstp__curve__point__t.html @@ -2,24 +2,9 @@ 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] @@ -31,24 +16,24 @@ - + - - + + - +

    Data Fields

    double x
    double x
     Horizontal position.
    double y
     Horizontal position.
    double y
     Vertical position.
     Vertical position.

    Detailed Description

    Point (x,y) for piecewise curve.

    Field Documentation

    -

    +

    @@ -67,13 +52,13 @@ Horizontal position.
    - +
    double stp_curve_point_t::x double stp_curve_point_t::x
    -

    +

    @@ -94,8 +79,8 @@ Vertical position.
    - +
    double stp_curve_point_t::y double stp_curve_point_t::y

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html index 419065f..2e41381 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__generic.html +++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html @@ -2,48 +2,33 @@ 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>

    - + - + - + - + - +

    Data Fields

    int x
    int x
    int y
    int y
    int bytes
    int bytes
    int prescaled
    int prescaled
    const void * data
    const void * data

    Field Documentation

    -

    +

    @@ -60,13 +45,13 @@
    - +
    int stp_dither_matrix_generic::bytes int stp_dither_matrix_generic::bytes
    -

    +

    @@ -83,13 +68,13 @@
    - +
    const void* stp_dither_matrix_generic::data const void* stp_dither_matrix_generic::data
    -

    +

    @@ -106,13 +91,13 @@
    - +
    int stp_dither_matrix_generic::prescaled int stp_dither_matrix_generic::prescaled
    -

    +

    @@ -129,13 +114,13 @@
    - +
    int stp_dither_matrix_generic::x int stp_dither_matrix_generic::x
    -

    +

    @@ -154,8 +139,8 @@
    - +
    int stp_dither_matrix_generic::y int stp_dither_matrix_generic::y

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html index 070c3fc..5651f5a 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__normal.html +++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html @@ -2,48 +2,33 @@ 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>

    - + - + - + - + - +

    Data Fields

    int x
    int x
    int y
    int y
    int bytes
    int bytes
    int prescaled
    int prescaled
    const unsigned * data
    const unsigned * data

    Field Documentation

    -

    +

    @@ -60,13 +45,13 @@
    - +
    int stp_dither_matrix_normal::bytes int stp_dither_matrix_normal::bytes
    -

    +

    @@ -83,13 +68,13 @@
    - +
    const unsigned* stp_dither_matrix_normal::data const unsigned* stp_dither_matrix_normal::data
    -

    +

    @@ -106,13 +91,13 @@
    - +
    int stp_dither_matrix_normal::prescaled int stp_dither_matrix_normal::prescaled
    -

    +

    @@ -129,13 +114,13 @@
    - +
    int stp_dither_matrix_normal::x int stp_dither_matrix_normal::x
    -

    +

    @@ -154,8 +139,8 @@
    - +
    int stp_dither_matrix_normal::y int stp_dither_matrix_normal::y

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html index aeef647..831ba2d 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__short.html +++ b/doc/gutenprint/html/structstp__dither__matrix__short.html @@ -2,48 +2,33 @@ 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>

    - + - + - + - + - +

    Data Fields

    int x
    int x
    int y
    int y
    int bytes
    int bytes
    int prescaled
    int prescaled
    const unsigned short * data
    const unsigned short * data

    Field Documentation

    -

    +

    @@ -60,13 +45,13 @@
    - +
    int stp_dither_matrix_short::bytes int stp_dither_matrix_short::bytes
    -

    +

    @@ -83,13 +68,13 @@
    - +
    const unsigned short* stp_dither_matrix_short::data const unsigned short* stp_dither_matrix_short::data
    -

    +

    @@ -106,13 +91,13 @@
    - +
    int stp_dither_matrix_short::prescaled int stp_dither_matrix_short::prescaled
    -

    +

    @@ -129,13 +114,13 @@
    - +
    int stp_dither_matrix_short::x int stp_dither_matrix_short::x
    -

    +

    @@ -154,8 +139,8 @@
    - +
    int stp_dither_matrix_short::y int stp_dither_matrix_short::y

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html index da485d3..1797d6d 100644 --- a/doc/gutenprint/html/structstp__dotsize.html +++ b/doc/gutenprint/html/structstp__dotsize.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    unsigned bit_pattern
    unsigned bit_pattern
    double value
    double value

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    unsigned stp_dotsize::bit_pattern unsigned stp_dotsize::bit_pattern
    -

    +

    @@ -79,8 +64,8 @@
    - +
    double stp_dotsize::value double stp_dotsize::value

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html index b9115bd..b9bf4f2 100644 --- a/doc/gutenprint/html/structstp__double__bound__t.html +++ b/doc/gutenprint/html/structstp__double__bound__t.html @@ -2,24 +2,9 @@ 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] @@ -30,23 +15,23 @@

    - - + + - +

    Public Types

    typedef double lower

    Data Fields

    double lower
    typedef double upper
    double upper

    Detailed Description

    double_bound (range) parameter.

    -

    Member Typedef Documentation

    -

    +

    Field Documentation

    +

    @@ -63,13 +48,13 @@ double_bound (range) parameter. Lower bound.
    - +
    typedef double stp_double_bound_t::lower double stp_double_bound_t::lower
    -

    +

    @@ -88,8 +73,8 @@ Upper bound.
    - +
    typedef double stp_double_bound_t::upper double stp_double_bound_t::upper

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html index d16bdb9..5d7f701 100644 --- a/doc/gutenprint/html/structstp__family.html +++ b/doc/gutenprint/html/structstp__family.html @@ -2,24 +2,9 @@ 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] @@ -28,19 +13,19 @@ - + - +

    Data Fields

    const stp_printfuncs_t * printfuncs
    const stp_printfuncs_t * printfuncs
    stp_list_t * printer_list
    stp_list_t * printer_list

    Field Documentation

    -

    +

    @@ -57,13 +42,13 @@
    - +
    stp_list_t* stp_family::printer_list stp_list_t* stp_family::printer_list
    -

    +

    @@ -82,8 +67,8 @@
    - +
    const stp_printfuncs_t* stp_family::printfuncs const stp_printfuncs_t* stp_family::printfuncs

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html index 3e90ed5..fabceaf 100644 --- a/doc/gutenprint/html/structstp__image.html +++ b/doc/gutenprint/html/structstp__image.html @@ -2,24 +2,9 @@ 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] @@ -31,44 +16,44 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Data Fields

    void(* init )(struct stp_image *image)
    void(* init )(struct stp_image *image)
     This callback is used to perform any initialization required by the image layer for the image.
    void(* reset )(struct stp_image *image)
     This callback is used to perform any initialization required by the image layer for the image.
    void(* reset )(struct stp_image *image)
     This callback is called to reset the image to the beginning.
    int(* width )(struct stp_image *image)
     This callback is called to reset the image to the beginning.
    int(* width )(struct stp_image *image)
     This callback returns the width of the image in pixels.
    int(* height )(struct stp_image *image)
     This callback returns the width of the image in pixels.
    int(* height )(struct stp_image *image)
     This callback returns the height of the image in pixels.
    stp_image_status_t(* get_row )(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)
     This callback returns the height of the image in pixels.
    stp_image_status_t(* get_row )(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)
     This callback transfers the data from the image to the gimp-print library.
    const char *(* get_appname )(struct stp_image *image)
     This callback transfers the data from the image to the gimp-print library.
    const char *(* get_appname )(struct stp_image *image)
     This callback returns the name of the application.
    void(* conclude )(struct stp_image *image)
     This callback returns the name of the application.
    void(* conclude )(struct stp_image *image)
     This callback is called at the end of each page.
    void * rep
     This callback is called at the end of each page.
    void * rep
     A pointer to an application-specific state information that might need to be associated with the image object.
     A pointer to an application-specific state information that might need to be associated with the image object.

    Detailed Description

    The image type is an abstract data type for interfacing with the image creation program.

    -It provides callbacks to functions defined within the client application which are called while printing the image. +It provides callbacks to functions defined within the client application which are called while printing the image.

    Field Documentation

    -

    +

    @@ -87,13 +72,13 @@ This callback is called at the end of each page.
    - +
    void(* stp_image::conclude)(struct stp_image *image) void(* stp_image::conclude)(struct stp_image *image)
    -

    +

    @@ -109,16 +94,16 @@ This callback is called at the end of each page.

    This callback returns the name of the application.

    -This is embedded in the output by some drivers. +This is embedded in the output by some drivers.

    - +
    const char*(* stp_image::get_appname)(struct stp_image *image) const char*(* stp_image::get_appname)(struct stp_image *image)
    -

    +

    @@ -134,24 +119,24 @@ This is embedded in the output by some drivers.

    This callback transfers the data from the image to the gimp-print library.

    -It is called from the driver layer. It should copy WIDTH (as returned by the width() member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output).

    Parameters:
    +It is called from the driver layer. It should copy WIDTH (as returned by the width() member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output).
    Parameters:
    - +
    stp_image_status_t(* stp_image::get_row)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row) stp_image_status_t(* stp_image::get_row)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)
    - + - +
    image the image in use.
    data a pointer to width() bytes of pixel data.
    data a pointer to width() bytes of pixel data.
    byte_limit (image width * number of channels).
    row (unused).
    row (unused).
    -

    +

    @@ -169,19 +154,19 @@ This callback returns the height of the image in pixels.

    Parameters:
    - +
    int(* stp_image::height)(struct stp_image *image) int(* stp_image::height)(struct stp_image *image)
    - +
    image the image in use.
    image the image in use.
    -

    +

    @@ -199,19 +184,19 @@ This callback is used to perform any initialization required by the image layer

    It will be called once per image.

    Parameters:
    - +
    void(* stp_image::init)(struct stp_image *image) void(* stp_image::init)(struct stp_image *image)
    - +
    image the image in use.
    image the image in use.
    -

    +

    @@ -230,13 +215,13 @@ A pointer to an application-specific state information that might need to be ass
    - +
    void* stp_image::rep void* stp_image::rep
    -

    +

    @@ -252,22 +237,22 @@ A pointer to an application-specific state information that might need to be ass

    This callback is called to reset the image to the beginning.

    -It may (in principle) be called multiple times if a page is being printed more than once.

    Warning:
    The reset() call may be removed in the future.
    +It may (in principle) be called multiple times if a page is being printed more than once.
    Warning:
    The reset() call may be removed in the future.
    Parameters:
    - +
    void(* stp_image::reset)(struct stp_image *image) void(* stp_image::reset)(struct stp_image *image)
    - +
    image the image in use.
    image the image in use.
    -

    +

    @@ -285,7 +270,7 @@ This callback returns the width of the image in pixels.

    Parameters:
    - +
    int(* stp_image::width)(struct stp_image *image) int(* stp_image::width)(struct stp_image *image)
    - +
    image the image in use.
    image the image in use.
    @@ -293,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html index fd170f6..2c5fb30 100644 --- a/doc/gutenprint/html/structstp__int__bound__t.html +++ b/doc/gutenprint/html/structstp__int__bound__t.html @@ -2,24 +2,9 @@ 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] @@ -30,23 +15,23 @@

    - - + + - +

    Public Types

    typedef int lower

    Data Fields

    int lower
    typedef int upper
    int upper

    Detailed Description

    int_bound (range) parameter.

    -

    Member Typedef Documentation

    -

    +

    Field Documentation

    +

    @@ -63,13 +48,13 @@ int_bound (range) parameter. Lower bound.
    - +
    typedef int stp_int_bound_t::lower int stp_int_bound_t::lower
    -

    +

    @@ -88,8 +73,8 @@ Upper bound.
    - +
    typedef int stp_int_bound_t::upper int stp_int_bound_t::upper

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html index b23a6d0..2b20501 100644 --- a/doc/gutenprint/html/structstp__lineactive__t.html +++ b/doc/gutenprint/html/structstp__lineactive__t.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int ncolors
    int ncolors
    char * v
    char * v

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    int stp_lineactive_t::ncolors int stp_lineactive_t::ncolors
    -

    +

    @@ -79,8 +64,8 @@
    - +
    char* stp_lineactive_t::v char* stp_lineactive_t::v

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html index 778745a..5abb32a 100644 --- a/doc/gutenprint/html/structstp__linebounds__t.html +++ b/doc/gutenprint/html/structstp__linebounds__t.html @@ -2,44 +2,29 @@ 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>

    - + - + - +

    Data Fields

    int ncolors
    int ncolors
    int * start_pos
    int * start_pos
    int * end_pos
    int * end_pos

    Field Documentation

    -

    +

    @@ -56,13 +41,13 @@
    - +
    int* stp_linebounds_t::end_pos int* stp_linebounds_t::end_pos
    -

    +

    @@ -79,13 +64,13 @@
    - +
    int stp_linebounds_t::ncolors int stp_linebounds_t::ncolors
    -

    +

    @@ -104,8 +89,8 @@
    - +
    int* stp_linebounds_t::start_pos int* stp_linebounds_t::start_pos

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html index 0891576..3efe6c8 100644 --- a/doc/gutenprint/html/structstp__linebufs__t.html +++ b/doc/gutenprint/html/structstp__linebufs__t.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int ncolors
    int ncolors
    unsigned char ** v
    unsigned char ** v

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    int stp_linebufs_t::ncolors int stp_linebufs_t::ncolors
    -

    +

    @@ -79,8 +64,8 @@
    - +
    unsigned char** stp_linebufs_t::v unsigned char** stp_linebufs_t::v

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html index ce4b8fa..cecf414 100644 --- a/doc/gutenprint/html/structstp__linecount__t.html +++ b/doc/gutenprint/html/structstp__linecount__t.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int ncolors
    int ncolors
    int * v
    int * v

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    int stp_linecount_t::ncolors int stp_linecount_t::ncolors
    -

    +

    @@ -79,8 +64,8 @@
    - +
    int* stp_linecount_t::v int* stp_linecount_t::v

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html index 353fed2..7b7a832 100644 --- a/doc/gutenprint/html/structstp__lineoff__t.html +++ b/doc/gutenprint/html/structstp__lineoff__t.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int ncolors
    int ncolors
    unsigned long * v
    unsigned long * v

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    int stp_lineoff_t::ncolors int stp_lineoff_t::ncolors
    -

    +

    @@ -79,8 +64,8 @@
    - +
    unsigned long* stp_lineoff_t::v unsigned long* stp_lineoff_t::v

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html index 2f5a996..61911f7 100644 --- a/doc/gutenprint/html/structstp__module.html +++ b/doc/gutenprint/html/structstp__module.html @@ -2,54 +2,39 @@ 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>

    - + - + - + - + - + - + - + - +

    Data Fields

    const char * name
    const char * name
    const char * version
    const char * version
    const char * comment
    const char * comment
    stp_module_class_t class
    stp_module_class_t class
    void * handle
    void * handle
    int(* init )(void)
    int(* init )(void)
    int(* fini )(void)
    int(* fini )(void)
    void * syms
    void * syms

    Field Documentation

    -

    +

    @@ -66,13 +51,13 @@
    - +
    stp_module_class_t stp_module::class stp_module_class_t stp_module::class
    -

    +

    @@ -89,13 +74,13 @@
    - +
    const char* stp_module::comment const char* stp_module::comment
    -

    +

    @@ -112,13 +97,13 @@
    - +
    int(* stp_module::fini)(void) int(* stp_module::fini)(void)
    -

    +

    @@ -135,13 +120,13 @@
    - +
    void* stp_module::handle void* stp_module::handle
    -

    +

    @@ -158,13 +143,13 @@
    - +
    int(* stp_module::init)(void) int(* stp_module::init)(void)
    -

    +

    @@ -181,13 +166,13 @@
    - +
    const char* stp_module::name const char* stp_module::name
    -

    +

    @@ -204,13 +189,13 @@
    - +
    void* stp_module::syms void* stp_module::syms
    -

    +

    @@ -229,8 +214,8 @@
    - +
    const char* stp_module::version const char* stp_module::version

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html index 68379a6..c23f3ab 100644 --- a/doc/gutenprint/html/structstp__module__version.html +++ b/doc/gutenprint/html/structstp__module__version.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int major
    int major
    int minor
    int minor

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    int stp_module_version::major int stp_module_version::major
    -

    +

    @@ -79,8 +64,8 @@
    - +
    int stp_module_version::minor int stp_module_version::minor

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html index 9686548..979521b 100644 --- a/doc/gutenprint/html/structstp__mxml__attr__s.html +++ b/doc/gutenprint/html/structstp__mxml__attr__s.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    char * name
    char * name
    char * value
    char * value

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    char* stp_mxml_attr_s::name char* stp_mxml_attr_s::name
    -

    +

    @@ -79,8 +64,8 @@
    - +
    char* stp_mxml_attr_s::value char* stp_mxml_attr_s::value

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html index afb2a32..6f8bc86 100644 --- a/doc/gutenprint/html/structstp__mxml__node__s.html +++ b/doc/gutenprint/html/structstp__mxml__node__s.html @@ -2,52 +2,37 @@ 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>

    - + - + - + - + - + - + - +

    Data Fields

    stp_mxml_type_t type
    stp_mxml_type_t type
    stp_mxml_node_t * next
    stp_mxml_node_t * next
    stp_mxml_node_t * prev
    stp_mxml_node_t * prev
    stp_mxml_node_t * parent
    stp_mxml_node_t * parent
    stp_mxml_node_t * child
    stp_mxml_node_t * child
    stp_mxml_node_t * last_child
    stp_mxml_node_t * last_child
    stp_mxml_value_t value
    stp_mxml_value_t value

    Field Documentation

    -

    +

    @@ -64,13 +49,13 @@
    - +
    stp_mxml_node_t* stp_mxml_node_s::child stp_mxml_node_t* stp_mxml_node_s::child
    -

    +

    @@ -87,13 +72,13 @@
    - +
    stp_mxml_node_t* stp_mxml_node_s::last_child stp_mxml_node_t* stp_mxml_node_s::last_child
    -

    +

    @@ -110,13 +95,13 @@
    - +
    stp_mxml_node_t* stp_mxml_node_s::next stp_mxml_node_t* stp_mxml_node_s::next
    -

    +

    @@ -133,13 +118,13 @@
    - +
    stp_mxml_node_t* stp_mxml_node_s::parent stp_mxml_node_t* stp_mxml_node_s::parent
    -

    +

    @@ -156,13 +141,13 @@
    - +
    stp_mxml_node_t* stp_mxml_node_s::prev stp_mxml_node_t* stp_mxml_node_s::prev
    -

    +

    @@ -179,13 +164,13 @@
    - +
    stp_mxml_type_t stp_mxml_node_s::type stp_mxml_type_t stp_mxml_node_s::type
    -

    +

    @@ -204,8 +189,8 @@
    - +
    stp_mxml_value_t stp_mxml_node_s::value stp_mxml_value_t stp_mxml_node_s::value

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html index 8b23c53..528d820 100644 --- a/doc/gutenprint/html/structstp__mxml__text__s.html +++ b/doc/gutenprint/html/structstp__mxml__text__s.html @@ -2,42 +2,27 @@ 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>

    - + - +

    Data Fields

    int whitespace
    int whitespace
    char * string
    char * string

    Field Documentation

    -

    +

    @@ -54,13 +39,13 @@
    - +
    char* stp_mxml_text_s::string char* stp_mxml_text_s::string
    -

    +

    @@ -79,8 +64,8 @@
    - +
    int stp_mxml_text_s::whitespace int stp_mxml_text_s::whitespace

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html index df0857f..1dcc51f 100644 --- a/doc/gutenprint/html/structstp__mxml__value__s.html +++ b/doc/gutenprint/html/structstp__mxml__value__s.html @@ -2,44 +2,29 @@ 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>

    - + - + - +

    Data Fields

    char * name
    char * name
    int num_attrs
    int num_attrs
    stp_mxml_attr_t * attrs
    stp_mxml_attr_t * attrs

    Field Documentation

    -

    +

    @@ -56,13 +41,13 @@
    - +
    stp_mxml_attr_t* stp_mxml_value_s::attrs stp_mxml_attr_t* stp_mxml_value_s::attrs
    -

    +

    @@ -79,13 +64,13 @@
    - +
    char* stp_mxml_value_s::name char* stp_mxml_value_s::name
    -

    +

    @@ -104,8 +89,8 @@
    - +
    int stp_mxml_value_s::num_attrs int stp_mxml_value_s::num_attrs

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html index 6cc253d..46fbb58 100644 --- a/doc/gutenprint/html/structstp__papersize__t.html +++ b/doc/gutenprint/html/structstp__papersize__t.html @@ -2,24 +2,9 @@ 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] @@ -31,48 +16,48 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +

    Data Fields

    char * name
    char * name
     Short unique name (not translated).
    char * text
     Short unique name (not translated).
    char * text
     Long descriptive name (translated).
    char * comment
     Long descriptive name (translated).
    char * comment
     Comment.
    unsigned width
     Comment.
    unsigned width
     Paper width.
    unsigned height
     Paper width.
    unsigned height
     Paper height.
    unsigned top
     Paper height.
    unsigned top
     Top margin.
    unsigned left
     Top margin.
    unsigned left
     Left margin.
    unsigned bottom
     Left margin.
    unsigned bottom
     Bottom margin.
    unsigned right
     Bottom margin.
    unsigned right
     Right margin.
    stp_papersize_unit_t paper_unit
     Right margin.
    stp_papersize_unit_t paper_unit
     Units of measurement.
     Units of measurement.

    Detailed Description

    The papersize data type.

    Field Documentation

    -

    +

    @@ -91,13 +76,13 @@ Bottom margin.
    - +
    unsigned stp_papersize_t::bottom unsigned stp_papersize_t::bottom
    -

    +

    @@ -116,13 +101,13 @@ Comment.
    - +
    char* stp_papersize_t::comment char* stp_papersize_t::comment
    -

    +

    @@ -141,13 +126,13 @@ Paper height.
    - +
    unsigned stp_papersize_t::height unsigned stp_papersize_t::height
    -

    +

    @@ -166,13 +151,13 @@ Left margin.
    - +
    unsigned stp_papersize_t::left unsigned stp_papersize_t::left
    -

    +

    @@ -191,13 +176,13 @@ Short unique name (not translated).
    - +
    char* stp_papersize_t::name char* stp_papersize_t::name
    -

    +

    @@ -216,13 +201,13 @@ Units of measurement.
    - +
    stp_papersize_unit_t stp_papersize_t::paper_unit stp_papersize_unit_t stp_papersize_t::paper_unit
    -

    +

    @@ -241,13 +226,13 @@ Right margin.
    - +
    unsigned stp_papersize_t::right unsigned stp_papersize_t::right
    -

    +

    @@ -266,13 +251,13 @@ Long descriptive name (translated).
    - +
    char* stp_papersize_t::text char* stp_papersize_t::text
    -

    +

    @@ -291,13 +276,13 @@ Top margin.
    - +
    unsigned stp_papersize_t::top unsigned stp_papersize_t::top
    -

    +

    @@ -318,8 +303,8 @@ Paper width.
    - +
    unsigned stp_papersize_t::width unsigned stp_papersize_t::width

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html index a47c363..6e09bdd 100644 --- a/doc/gutenprint/html/structstp__param__string__t.html +++ b/doc/gutenprint/html/structstp__param__string__t.html @@ -2,24 +2,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. More...

    @@ -28,24 +13,24 @@ - + - +

    Data Fields

    const char * name
    const char * name
    const char * text
    const char * text

    Detailed Description

    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. +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

    -

    +

    @@ -62,13 +47,13 @@ Representation of a choice list of strings. The choices themselves consist of a Option name (key, untranslated).
    - +
    const char* stp_param_string_t::name const char* stp_param_string_t::name
    -

    +

    @@ -87,8 +72,8 @@ Human-readable (translated) text.
    - +
    const char * stp_param_string_t::text const char * stp_param_string_t::text

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html index b8a226a..18b6491 100644 --- a/doc/gutenprint/html/structstp__parameter__t.html +++ b/doc/gutenprint/html/structstp__parameter__t.html @@ -2,24 +2,9 @@ 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] @@ -30,78 +15,77 @@

    - - + + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

    Public Types

    typedef const char * name

    Data Fields

    const char * name
    typedef const char * text
    const char * text
    typedef const char * category
    const char * category
    typedef const char * help
    const char * help
    typedef stp_parameter_type_t p_type
    stp_parameter_type_t p_type
    typedef stp_parameter_class_t p_class
    stp_parameter_class_t p_class
    typedef stp_parameter_level_t p_level
    stp_parameter_level_t p_level
    typedef unsigned char is_mandatory
    unsigned char is_mandatory
    typedef unsigned char is_active
    unsigned char is_active
    typedef unsigned char channel
    unsigned char channel
    typedef unsigned char verify_this_parameter
    unsigned char verify_this_parameter
    typedef unsigned char read_only
    unsigned char read_only

    Data Fields

    union {
       stp_curve_t *   curve
       stp_curve_t *   curve
       stp_double_bound_t   dbl
       stp_double_bound_t   dbl
       stp_int_bound_t   integer
       stp_int_bound_t   integer
       stp_int_bound_t   dimension
       stp_int_bound_t   dimension
       stp_string_list_t *   str
       stp_string_list_t *   str
       stp_array_t *   array
       stp_array_t *   array
    } bounds
    } bounds
    union {
       stp_curve_t *   curve
       stp_curve_t *   curve
       double   dbl
       double   dbl
       int   dimension
       int   dimension
       int   integer
       int   integer
       int   boolean
       int   boolean
       const char *   str
       const char *   str
       stp_array_t *   array
       stp_array_t *   array
    } deflt
    } deflt

    Detailed Description

    Parameter description.

    -

    Member Typedef Documentation

    -

    +

    Field Documentation

    +

    @@ -115,16 +99,16 @@ Parameter description. +Default array parameter value.
    - +
    typedef const char* stp_parameter_t::category stp_array_t* stp_parameter_t::array

    -User-visible category name.

    -

    +

    @@ -138,16 +122,16 @@ User-visible category name. +array parameter value.
    - +
    typedef unsigned char stp_parameter_t::channel stp_array_t* stp_parameter_t::array

    -The channel to which this parameter applies

    -

    +

    @@ -161,16 +145,16 @@ The channel to which this parameter applies +Default boolean parameter value.
    - +
    typedef const char* stp_parameter_t::help int stp_parameter_t::boolean

    -Help string.

    -

    +

    @@ -184,16 +168,16 @@ Help string. +Limits on the values the parameter may take.
    - +
    typedef unsigned char stp_parameter_t::is_active union { ... } stp_parameter_t::bounds

    -Is the parameter active?

    -

    +

    @@ -207,16 +191,16 @@ Is the parameter active? +User-visible category name.
    - +
    typedef unsigned char stp_parameter_t::is_mandatory const char* stp_parameter_t::category

    -The parameter is required, even when set inactive.

    -

    +

    @@ -230,16 +214,16 @@ The parameter is required, even when set inactive. +The channel to which this parameter applies
    - +
    typedef const char* stp_parameter_t::name unsigned char stp_parameter_t::channel

    -Internal name (key).

    -

    +

    @@ -253,16 +237,16 @@ Internal name (key). +Default curve parameter value.
    - +
    typedef stp_parameter_class_t stp_parameter_t::p_class stp_curve_t* stp_parameter_t::curve

    -Parameter class.

    -

    +

    @@ -276,16 +260,16 @@ Parameter class. +curve parameter value.
    - +
    typedef stp_parameter_level_t stp_parameter_t::p_level stp_curve_t* stp_parameter_t::curve

    -Parameter level.

    -

    +

    @@ -299,16 +283,16 @@ Parameter level. +Default double parameter value.
    - +
    typedef stp_parameter_type_t stp_parameter_t::p_type double stp_parameter_t::dbl

    -Parameter type.

    -

    +

    @@ -322,16 +306,16 @@ Parameter type. +double_bound parameter value.
    - +
    typedef unsigned char stp_parameter_t::read_only stp_double_bound_t stp_parameter_t::dbl

    -

    -

    +

    @@ -345,16 +329,16 @@ Parameter type. +Default value of the parameter.
    - +
    typedef const char* stp_parameter_t::text union { ... } stp_parameter_t::deflt

    -User-visible name.

    -

    +

    @@ -368,17 +352,16 @@ User-visible name. +Default dimension parameter value.
    - +
    typedef unsigned char stp_parameter_t::verify_this_parameter int stp_parameter_t::dimension

    -Should the verify system check this parameter?

    -

    Field Documentation

    -

    +

    @@ -392,16 +375,16 @@ Should the verify system check this parameter? +int_bound parameter value.
    - +
    stp_array_t* stp_parameter_t::array stp_int_bound_t stp_parameter_t::dimension

    -Default array parameter value.

    -

    +

    @@ -415,16 +398,16 @@ Default array parameter value. +Help string.
    - +
    stp_array_t* stp_parameter_t::array const char* stp_parameter_t::help

    -array parameter value.

    -

    +

    @@ -438,16 +421,16 @@ array parameter value. +Default int parameter value.
    - +
    int stp_parameter_t::boolean int stp_parameter_t::integer

    -Default boolean parameter value.

    -

    +

    @@ -461,16 +444,16 @@ Default boolean parameter value. +int_bound parameter value.
    - +
    union { ... } stp_parameter_t::bounds stp_int_bound_t stp_parameter_t::integer

    -Limits on the values the parameter may take.

    -

    +

    @@ -484,16 +467,16 @@ Limits on the values the parameter may take. +Is the parameter active?
    - +
    stp_curve_t* stp_parameter_t::curve unsigned char stp_parameter_t::is_active

    -Default curve parameter value.

    -

    +

    @@ -507,16 +490,16 @@ Default curve parameter value. +The parameter is required, even when set inactive.
    - +
    stp_curve_t* stp_parameter_t::curve unsigned char stp_parameter_t::is_mandatory

    -curve parameter value.

    -

    +

    @@ -530,16 +513,16 @@ curve parameter value. +Internal name (key).
    - +
    double stp_parameter_t::dbl const char* stp_parameter_t::name

    -Default double parameter value.

    -

    +

    @@ -553,16 +536,16 @@ Default double parameter value. +Parameter class.
    - +
    stp_double_bound_t stp_parameter_t::dbl stp_parameter_class_t stp_parameter_t::p_class

    -double_bound parameter value.

    -

    +

    @@ -576,16 +559,16 @@ double_bound parameter value. +Parameter level.
    - +
    union { ... } stp_parameter_t::deflt stp_parameter_level_t stp_parameter_t::p_level

    -Default value of the parameter.

    -

    +

    @@ -599,16 +582,16 @@ Default value of the parameter. +Parameter type.
    - +
    int stp_parameter_t::dimension stp_parameter_type_t stp_parameter_t::p_type

    -Default dimension parameter value.

    -

    +

    @@ -622,16 +605,16 @@ Default dimension parameter value. +
    - +
    stp_int_bound_t stp_parameter_t::dimension unsigned char stp_parameter_t::read_only

    -int_bound parameter value.

    -

    +

    @@ -645,16 +628,16 @@ int_bound parameter value. +Default string parameter value.
    - +
    int stp_parameter_t::integer const char* stp_parameter_t::str

    -Default int parameter value.

    -

    +

    @@ -668,16 +651,16 @@ Default int parameter value. +string_list parameter value.
    - +
    stp_int_bound_t stp_parameter_t::integer stp_string_list_t* stp_parameter_t::str

    -int_bound parameter value.

    -

    +

    @@ -691,16 +674,16 @@ int_bound parameter value. +User-visible name.
    - +
    const char* stp_parameter_t::str const char* stp_parameter_t::text

    -Default string parameter value.

    -

    +

    @@ -714,13 +697,13 @@ Default string parameter value. +Should the verify system check this parameter?
    - +
    stp_string_list_t* stp_parameter_t::str unsigned char stp_parameter_t::verify_this_parameter

    -string_list parameter value.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html index 602574c..75d2a76 100644 --- a/doc/gutenprint/html/structstp__pass__t.html +++ b/doc/gutenprint/html/structstp__pass__t.html @@ -2,50 +2,35 @@ 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>

    - + - + - + - + - + - +

    Data Fields

    int pass
    int pass
    int missingstartrows
    int missingstartrows
    int logicalpassstart
    int logicalpassstart
    int physpassstart
    int physpassstart
    int physpassend
    int physpassend
    int subpass
    int subpass

    Field Documentation

    -

    +

    @@ -62,13 +47,13 @@
    - +
    int stp_pass_t::logicalpassstart int stp_pass_t::logicalpassstart
    -

    +

    @@ -85,13 +70,13 @@
    - +
    int stp_pass_t::missingstartrows int stp_pass_t::missingstartrows
    -

    +

    @@ -108,13 +93,13 @@
    - +
    int stp_pass_t::pass int stp_pass_t::pass
    -

    +

    @@ -131,13 +116,13 @@
    - +
    int stp_pass_t::physpassend int stp_pass_t::physpassend
    -

    +

    @@ -154,13 +139,13 @@
    - +
    int stp_pass_t::physpassstart int stp_pass_t::physpassstart
    -

    +

    @@ -179,8 +164,8 @@
    - +
    int stp_pass_t::subpass int stp_pass_t::subpass

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html index 371b800..b2c58e4 100644 --- a/doc/gutenprint/html/structstp__printfuncs__t.html +++ b/doc/gutenprint/html/structstp__printfuncs__t.html @@ -2,24 +2,9 @@ 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] @@ -28,37 +13,37 @@ - + - + - + - + - + - + - + - + - + - + - +

    Data Fields

    stp_parameter_list_t(* list_parameters )(const stp_vars_t *v)
    stp_parameter_list_t(* list_parameters )(const stp_vars_t *v)
    void(* parameters )(const stp_vars_t *v, const char *name, stp_parameter_t *)
    void(* parameters )(const stp_vars_t *v, const char *name, stp_parameter_t *)
    void(* media_size )(const stp_vars_t *v, int *width, int *height)
    void(* media_size )(const stp_vars_t *v, int *width, int *height)
    void(* imageable_area )(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)
    void(* imageable_area )(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)
    void(* limit )(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)
    void(* limit )(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)
    int(* print )(const stp_vars_t *v, stp_image_t *image)
    int(* print )(const stp_vars_t *v, stp_image_t *image)
    void(* describe_resolution )(const stp_vars_t *v, int *x, int *y)
    void(* describe_resolution )(const stp_vars_t *v, int *x, int *y)
    const char *(* describe_output )(const stp_vars_t *v)
    const char *(* describe_output )(const stp_vars_t *v)
    int(* verify )(stp_vars_t *v)
    int(* verify )(stp_vars_t *v)
    int(* start_job )(const stp_vars_t *v, stp_image_t *image)
    int(* start_job )(const stp_vars_t *v, stp_image_t *image)
    int(* end_job )(const stp_vars_t *v, stp_image_t *image)
    int(* end_job )(const stp_vars_t *v, stp_image_t *image)

    Field Documentation

    -

    +

    @@ -75,13 +60,13 @@
    - +
    const char*(* stp_printfuncs_t::describe_output)(const stp_vars_t *v) const char*(* stp_printfuncs_t::describe_output)(const stp_vars_t *v)
    -

    +

    @@ -98,13 +83,13 @@
    - +
    void(* stp_printfuncs_t::describe_resolution)(const stp_vars_t *v, int *x, int *y) void(* stp_printfuncs_t::describe_resolution)(const stp_vars_t *v, int *x, int *y)
    -

    +

    @@ -121,13 +106,13 @@
    - +
    int(* stp_printfuncs_t::end_job)(const stp_vars_t *v, stp_image_t *image) int(* stp_printfuncs_t::end_job)(const stp_vars_t *v, stp_image_t *image)
    -

    +

    @@ -144,13 +129,13 @@
    - +
    void(* stp_printfuncs_t::imageable_area)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top) void(* stp_printfuncs_t::imageable_area)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)
    -

    +

    @@ -167,13 +152,13 @@
    - +
    void(* stp_printfuncs_t::limit)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height) void(* stp_printfuncs_t::limit)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)
    -

    +

    @@ -190,13 +175,13 @@
    - +
    stp_parameter_list_t(* stp_printfuncs_t::list_parameters)(const stp_vars_t *v) stp_parameter_list_t(* stp_printfuncs_t::list_parameters)(const stp_vars_t *v)
    -

    +

    @@ -213,13 +198,13 @@
    - +
    void(* stp_printfuncs_t::media_size)(const stp_vars_t *v, int *width, int *height) void(* stp_printfuncs_t::media_size)(const stp_vars_t *v, int *width, int *height)
    -

    +

    @@ -236,13 +221,13 @@
    - +
    void(* stp_printfuncs_t::parameters)(const stp_vars_t *v, const char *name, stp_parameter_t *) void(* stp_printfuncs_t::parameters)(const stp_vars_t *v, const char *name, stp_parameter_t *)
    -

    +

    @@ -259,13 +244,13 @@
    - +
    int(* stp_printfuncs_t::print)(const stp_vars_t *v, stp_image_t *image) int(* stp_printfuncs_t::print)(const stp_vars_t *v, stp_image_t *image)
    -

    +

    @@ -282,13 +267,13 @@
    - +
    int(* stp_printfuncs_t::start_job)(const stp_vars_t *v, stp_image_t *image) int(* stp_printfuncs_t::start_job)(const stp_vars_t *v, stp_image_t *image)
    -

    +

    @@ -307,8 +292,8 @@
    - +
    int(* stp_printfuncs_t::verify)(stp_vars_t *v) int(* stp_printfuncs_t::verify)(stp_vars_t *v)

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html index 60c27ba..18da612 100644 --- a/doc/gutenprint/html/structstp__raw__t.html +++ b/doc/gutenprint/html/structstp__raw__t.html @@ -2,24 +2,9 @@ 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] @@ -30,23 +15,23 @@

    - - + + - +

    Public Types

    typedef size_t bytes

    Data Fields

    size_t bytes
    typedef const void * data
    const void * data

    Detailed Description

    Raw parameter.

    -

    Member Typedef Documentation

    -

    +

    Field Documentation

    +

    @@ -63,13 +48,13 @@ Raw parameter. Size of data.
    - +
    typedef size_t stp_raw_t::bytes size_t stp_raw_t::bytes
    -

    +

    @@ -88,8 +73,8 @@ Raw data.
    - +
    typedef const void* stp_raw_t::data const void* stp_raw_t::data

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html index b744a8e..a3c84a9 100644 --- a/doc/gutenprint/html/structstp__shade.html +++ b/doc/gutenprint/html/structstp__shade.html @@ -2,44 +2,29 @@ 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>

    - + - + - +

    Data Fields

    double value
    double value
    int numsizes
    int numsizes
    const stp_dotsize_t * dot_sizes
    const stp_dotsize_t * dot_sizes

    Field Documentation

    -

    +

    @@ -56,13 +41,13 @@
    - +
    const stp_dotsize_t* stp_shade::dot_sizes const stp_dotsize_t* stp_shade::dot_sizes
    -

    +

    @@ -79,13 +64,13 @@
    - +
    int stp_shade::numsizes int stp_shade::numsizes
    -

    +

    @@ -104,8 +89,8 @@
    - +
    double stp_shade::value double stp_shade::value

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html index 8a3d154..f4461a9 100644 --- a/doc/gutenprint/html/structstp__weave__t.html +++ b/doc/gutenprint/html/structstp__weave__t.html @@ -2,52 +2,37 @@ 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>

    - + - + - + - + - + - + - +

    Data Fields

    int row
    int row
    int pass
    int pass
    int jet
    int jet
    int missingstartrows
    int missingstartrows
    int logicalpassstart
    int logicalpassstart
    int physpassstart
    int physpassstart
    int physpassend
    int physpassend

    Field Documentation

    -

    +

    @@ -64,13 +49,13 @@
    - +
    int stp_weave_t::jet int stp_weave_t::jet
    -

    +

    @@ -87,13 +72,13 @@
    - +
    int stp_weave_t::logicalpassstart int stp_weave_t::logicalpassstart
    -

    +

    @@ -110,13 +95,13 @@
    - +
    int stp_weave_t::missingstartrows int stp_weave_t::missingstartrows
    -

    +

    @@ -133,13 +118,13 @@
    - +
    int stp_weave_t::pass int stp_weave_t::pass
    -

    +

    @@ -156,13 +141,13 @@
    - +
    int stp_weave_t::physpassend int stp_weave_t::physpassend
    -

    +

    @@ -179,13 +164,13 @@
    - +
    int stp_weave_t::physpassstart int stp_weave_t::physpassstart
    -

    +

    @@ -204,8 +189,8 @@
    - +
    int stp_weave_t::row int stp_weave_t::row

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/tab_b.gif b/doc/gutenprint/html/tab_b.gif deleted file mode 100644 index 0d62348..0000000 Binary files a/doc/gutenprint/html/tab_b.gif and /dev/null differ diff --git a/doc/gutenprint/html/tab_l.gif b/doc/gutenprint/html/tab_l.gif deleted file mode 100644 index 9b1e633..0000000 Binary files a/doc/gutenprint/html/tab_l.gif and /dev/null differ diff --git a/doc/gutenprint/html/tab_r.gif b/doc/gutenprint/html/tab_r.gif deleted file mode 100644 index ce9dd9f..0000000 Binary files a/doc/gutenprint/html/tab_r.gif and /dev/null differ diff --git a/doc/gutenprint/html/tabs.css b/doc/gutenprint/html/tabs.css deleted file mode 100644 index a61552a..0000000 --- a/doc/gutenprint/html/tabs.css +++ /dev/null @@ -1,102 +0,0 @@ -/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */ - -DIV.tabs -{ - float : left; - width : 100%; - background : url("tab_b.gif") repeat-x bottom; - margin-bottom : 4px; -} - -DIV.tabs UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; -} - -DIV.tabs LI, DIV.tabs FORM -{ - display : inline; - margin : 0px; - padding : 0px; -} - -DIV.tabs FORM -{ - float : right; -} - -DIV.tabs A -{ - float : left; - background : url("tab_r.gif") no-repeat right top; - border-bottom : 1px solid #84B0C7; - font-size : x-small; - font-weight : bold; - text-decoration : none; -} - -DIV.tabs A:hover -{ - background-position: 100% -150px; -} - -DIV.tabs A:link, DIV.tabs A:visited, -DIV.tabs A:active, DIV.tabs A:hover -{ - color: #1A419D; -} - -DIV.tabs SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; -} - -DIV.tabs INPUT -{ - float : right; - display : inline; - font-size : 1em; -} - -DIV.tabs TD -{ - font-size : x-small; - font-weight : bold; - text-decoration : none; -} - - - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -DIV.tabs SPAN {float : none;} -/* End IE5-Mac hack */ - -DIV.tabs A:hover SPAN -{ - background-position: 0% -150px; -} - -DIV.tabs LI#current A -{ - background-position: 100% -150px; - border-width : 0px; -} - -DIV.tabs LI#current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; -} - -DIV.nav -{ - background : none; - border : none; - border-bottom : 1px solid #84B0C7; -} diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html index eeea931..5cd3ed1 100644 --- a/doc/gutenprint/html/unionstp__mxml__value__u.html +++ b/doc/gutenprint/html/unionstp__mxml__value__u.html @@ -2,48 +2,33 @@ 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>

    - + - + - + - + - +

    Data Fields

    stp_mxml_element_t element
    stp_mxml_element_t element
    int integer
    int integer
    char * opaque
    char * opaque
    double real
    double real
    stp_mxml_text_t text
    stp_mxml_text_t text

    Field Documentation

    -

    +

    @@ -60,13 +45,13 @@
    - +
    stp_mxml_element_t stp_mxml_value_u::element stp_mxml_element_t stp_mxml_value_u::element
    -

    +

    @@ -83,13 +68,13 @@
    - +
    int stp_mxml_value_u::integer int stp_mxml_value_u::integer
    -

    +

    @@ -106,13 +91,13 @@
    - +
    char* stp_mxml_value_u::opaque char* stp_mxml_value_u::opaque
    -

    +

    @@ -129,13 +114,13 @@
    - +
    double stp_mxml_value_u::real double stp_mxml_value_u::real
    -

    +

    @@ -154,8 +139,8 @@
    - +
    stp_mxml_text_t stp_mxml_value_u::text stp_mxml_text_t stp_mxml_value_u::text

    The documentation for this union was generated from the following file: -
    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html index 4852989..609bcf4 100644 --- a/doc/gutenprint/html/util_8h.html +++ b/doc/gutenprint/html/util_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    util.h File Reference

    Utility functions. More...

    #include <gutenprint/curve.h>
    @@ -28,127 +14,127 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - +

    Defines

    #define STP_DBG_LUT   0x1
    #define STP_DBG_LUT   0x1
    #define STP_DBG_COLORFUNC   0x2
    #define STP_DBG_COLORFUNC   0x2
    #define STP_DBG_INK   0x4
    #define STP_DBG_INK   0x4
    #define STP_DBG_PS   0x8
    #define STP_DBG_PS   0x8
    #define STP_DBG_PCL   0x10
    #define STP_DBG_PCL   0x10
    #define STP_DBG_ESCP2   0x20
    #define STP_DBG_ESCP2   0x20
    #define STP_DBG_CANON   0x40
    #define STP_DBG_CANON   0x40
    #define STP_DBG_LEXMARK   0x80
    #define STP_DBG_LEXMARK   0x80
    #define STP_DBG_WEAVE_PARAMS   0x100
    #define STP_DBG_WEAVE_PARAMS   0x100
    #define STP_DBG_ROWS   0x200
    #define STP_DBG_ROWS   0x200
    #define STP_DBG_MARK_FILE   0x400
    #define STP_DBG_MARK_FILE   0x400
    #define STP_DBG_LIST   0x800
    #define STP_DBG_LIST   0x800
    #define STP_DBG_MODULE   0x1000
    #define STP_DBG_MODULE   0x1000
    #define STP_DBG_PATH   0x2000
    #define STP_DBG_PATH   0x2000
    #define STP_DBG_PAPER   0x4000
    #define STP_DBG_PAPER   0x4000
    #define STP_DBG_PRINTERS   0x8000
    #define STP_DBG_PRINTERS   0x8000
    #define STP_DBG_XML   0x10000
    #define STP_DBG_XML   0x10000
    #define STP_DBG_VARS   0x20000
    #define STP_DBG_VARS   0x20000
    #define STP_DBG_OLYMPUS   0x40000
    #define STP_DBG_OLYMPUS   0x40000
    #define STP_DBG_CURVE   0x80000
    #define STP_DBG_CURVE   0x80000
    #define STP_DBG_CURVE_ERRORS   0x100000
    #define STP_DBG_CURVE_ERRORS   0x100000
    #define STP_SAFE_FREE(x)
    #define STP_SAFE_FREE(x)

    Functions

    int stp_init (void)
    int stp_init (void)
     Initialise libgimpprint.
    const char * stp_set_output_codeset (const char *codeset)
     Initialise libgimpprint.
    const char * stp_set_output_codeset (const char *codeset)
     Set the output encoding.
    stp_curve_t * stp_read_and_compose_curves (const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)
     Set the output encoding.
    stp_curve_t * stp_read_and_compose_curves (const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)
    void stp_abort (void)
    void stp_abort (void)
    void stp_prune_inactive_options (stp_vars_t *v)
    void stp_prune_inactive_options (stp_vars_t *v)
    void stp_zprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_zprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_zfwrite (const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)
    void void stp_zfwrite (const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)
    void stp_putc (int ch, const stp_vars_t *v)
    void stp_putc (int ch, const stp_vars_t *v)
    void stp_put16_le (unsigned short sh, const stp_vars_t *v)
    void stp_put16_le (unsigned short sh, const stp_vars_t *v)
    void stp_put16_be (unsigned short sh, const stp_vars_t *v)
    void stp_put16_be (unsigned short sh, const stp_vars_t *v)
    void stp_put32_le (unsigned int sh, const stp_vars_t *v)
    void stp_put32_le (unsigned int sh, const stp_vars_t *v)
    void stp_put32_be (unsigned int sh, const stp_vars_t *v)
    void stp_put32_be (unsigned int sh, const stp_vars_t *v)
    void stp_puts (const char *s, const stp_vars_t *v)
    void stp_puts (const char *s, const stp_vars_t *v)
    void stp_send_command (const stp_vars_t *v, const char *command, const char *format,...)
    void stp_send_command (const stp_vars_t *v, const char *command, const char *format,...)
    void stp_erputc (int ch)
    void stp_erputc (int ch)
    void stp_eprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_eprintf (const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_erprintf (const char *format,...) __attribute__((format(__printf__
    void void stp_erprintf (const char *format,...) __attribute__((format(__printf__
    void void void stp_asprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void stp_asprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void void stp_catprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    void void void void stp_catprintf (char **strp, const char *format,...) __attribute__((format(__printf__
    unsigned long stp_get_debug_level (void)
    unsigned long stp_get_debug_level (void)
    void stp_dprintf (unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void stp_dprintf (unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__
    void void stp_deprintf (unsigned long level, const char *format,...) __attribute__((format(__printf__
    void void stp_deprintf (unsigned long level, const char *format,...) __attribute__((format(__printf__
    void void void stp_init_debug_messages (stp_vars_t *v)
    void void void stp_init_debug_messages (stp_vars_t *v)
    void stp_flush_debug_messages (stp_vars_t *v)
    void stp_flush_debug_messages (stp_vars_t *v)
    void * stp_malloc (size_t)
    void * stp_malloc (size_t)
    void * stp_zalloc (size_t)
    void * stp_zalloc (size_t)
    void * stp_realloc (void *ptr, size_t)
    void * stp_realloc (void *ptr, size_t)
    void stp_free (void *ptr)
    void stp_free (void *ptr)
    size_t stp_strlen (const char *s)
    size_t stp_strlen (const char *s)
    char * stp_strndup (const char *s, int n)
    char * stp_strndup (const char *s, int n)
    char * stp_strdup (const char *s)
    char * stp_strdup (const char *s)
    const char * stp_get_version (void)
    const char * stp_get_version (void)
     Get the library version string (x.y.z).
    const char * stp_get_release_version (void)
     Get the library version string (x.y.z).
    const char * stp_get_release_version (void)
     Get the library release version string (x.y).
     Get the library release version string (x.y).

    Detailed Description

    Utility functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html index 7ab6499..6c6b370 100644 --- a/doc/gutenprint/html/vars_8h.html +++ b/doc/gutenprint/html/vars_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    vars.h File Reference

    Print job functions. More...

    #include <gutenprint/array.h>
    @@ -42,450 +28,450 @@  Parameter description. More...

    Typedefs

    -typedef stp_vars stp_vars_t +typedef stp_vars stp_vars_t - The vars opaque data type.
    -typedef void * stp_parameter_list_t + The vars opaque data type.
    +typedef void * stp_parameter_list_t - The parameter_list opaque data type.
    -typedef const void * stp_const_parameter_list_t + The parameter_list opaque data type.
    +typedef const void * stp_const_parameter_list_t - The constant parameter_list opaque data type.
    -typedef void(* stp_outfunc_t )(void *data, const char *buffer, size_t bytes) + The constant parameter_list opaque data type.
    +typedef void(* stp_outfunc_t )(void *data, const char *buffer, size_t bytes) - Output function supplied by the calling application.
    -typedef void *(* stp_copy_data_func_t )(void *) + Output function supplied by the calling application.
    +typedef void *(* stp_copy_data_func_t )(void *) -typedef void(* stp_free_data_func_t )(void *) +typedef void(* stp_free_data_func_t )(void *) -typedef stp_compdata compdata_t +typedef stp_compdata compdata_t

    Enumerations

    -enum  stp_parameter_type_t {
    -  STP_PARAMETER_TYPE_STRING_LIST, -STP_PARAMETER_TYPE_INT, -STP_PARAMETER_TYPE_BOOLEAN, -STP_PARAMETER_TYPE_DOUBLE, +enum  stp_parameter_type_t {
    +  STP_PARAMETER_TYPE_STRING_LIST, +STP_PARAMETER_TYPE_INT, +STP_PARAMETER_TYPE_BOOLEAN, +STP_PARAMETER_TYPE_DOUBLE,
    -  STP_PARAMETER_TYPE_CURVE, -STP_PARAMETER_TYPE_FILE, -STP_PARAMETER_TYPE_RAW, -STP_PARAMETER_TYPE_ARRAY, +  STP_PARAMETER_TYPE_CURVE, +STP_PARAMETER_TYPE_FILE, +STP_PARAMETER_TYPE_RAW, +STP_PARAMETER_TYPE_ARRAY,
    -  STP_PARAMETER_TYPE_DIMENSION, -STP_PARAMETER_TYPE_INVALID +  STP_PARAMETER_TYPE_DIMENSION, +STP_PARAMETER_TYPE_INVALID
    } - Parameter types. More...
    -enum  stp_parameter_class_t { STP_PARAMETER_CLASS_FEATURE, -STP_PARAMETER_CLASS_OUTPUT, -STP_PARAMETER_CLASS_CORE, -STP_PARAMETER_CLASS_INVALID + Parameter types. More...
    +enum  stp_parameter_class_t { STP_PARAMETER_CLASS_FEATURE, +STP_PARAMETER_CLASS_OUTPUT, +STP_PARAMETER_CLASS_CORE, +STP_PARAMETER_CLASS_INVALID } - Parameter class. More...
    -enum  stp_parameter_level_t {
    -  STP_PARAMETER_LEVEL_BASIC, -STP_PARAMETER_LEVEL_ADVANCED, -STP_PARAMETER_LEVEL_ADVANCED1, -STP_PARAMETER_LEVEL_ADVANCED2, + Parameter class. More...
    +enum  stp_parameter_level_t {
    +  STP_PARAMETER_LEVEL_BASIC, +STP_PARAMETER_LEVEL_ADVANCED, +STP_PARAMETER_LEVEL_ADVANCED1, +STP_PARAMETER_LEVEL_ADVANCED2,
    -  STP_PARAMETER_LEVEL_ADVANCED3, -STP_PARAMETER_LEVEL_ADVANCED4, -STP_PARAMETER_LEVEL_INTERNAL, -STP_PARAMETER_LEVEL_EXTERNAL, +  STP_PARAMETER_LEVEL_ADVANCED3, +STP_PARAMETER_LEVEL_ADVANCED4, +STP_PARAMETER_LEVEL_INTERNAL, +STP_PARAMETER_LEVEL_EXTERNAL,
    -  STP_PARAMETER_LEVEL_INVALID +  STP_PARAMETER_LEVEL_INVALID
    } - Parameter level. More...
    -enum  stp_parameter_activity_t { STP_PARAMETER_INACTIVE, -STP_PARAMETER_DEFAULTED, -STP_PARAMETER_ACTIVE + Parameter level. More...
    +enum  stp_parameter_activity_t { STP_PARAMETER_INACTIVE, +STP_PARAMETER_DEFAULTED, +STP_PARAMETER_ACTIVE } - Parameter activity. More...
    -enum  stp_parameter_verify_t { PARAMETER_BAD, -PARAMETER_OK, -PARAMETER_INACTIVE + Parameter activity. More...
    +enum  stp_parameter_verify_t { PARAMETER_BAD, +PARAMETER_OK, +PARAMETER_INACTIVE }

    Functions

    -stp_vars_t * stp_vars_create (void) +stp_vars_t * stp_vars_create (void) - Create a new vars object.
    -void stp_vars_copy (stp_vars_t *dest, const stp_vars_t *source) + Create a new vars object.
    +void stp_vars_copy (stp_vars_t *dest, const stp_vars_t *source) - Copy a vars object.
    -stp_vars_t * stp_vars_create_copy (const stp_vars_t *source) + Copy a vars object.
    +stp_vars_t * stp_vars_create_copy (const stp_vars_t *source) - Copy and allocate a vars object.
    -void stp_vars_destroy (stp_vars_t *v) + Copy and allocate a vars object.
    +void stp_vars_destroy (stp_vars_t *v) - Destroy a vars object.
    -void stp_set_driver (stp_vars_t *v, const char *val) + Destroy a vars object.
    +void stp_set_driver (stp_vars_t *v, const char *val) - Set the name of the printer driver.
    -void stp_set_driver_n (stp_vars_t *v, const char *val, int bytes) + Set the name of the printer driver.
    +void stp_set_driver_n (stp_vars_t *v, const char *val, int bytes) - Set the name of the printer driver.
    -const char * stp_get_driver (const stp_vars_t *v) + Set the name of the printer driver.
    +const char * stp_get_driver (const stp_vars_t *v) - Get the name of the printer driver.
    -void stp_set_color_conversion (stp_vars_t *v, const char *val) + Get the name of the printer driver.
    +void stp_set_color_conversion (stp_vars_t *v, const char *val) - Set the name of the color conversion routine, if not the default.
    -void stp_set_color_conversion_n (stp_vars_t *v, const char *val, int bytes) + Set the name of the color conversion routine, if not the default.
    +void stp_set_color_conversion_n (stp_vars_t *v, const char *val, int bytes) - Set the name of the color conversion routine, if not the default.
    -const char * stp_get_color_conversion (const stp_vars_t *v) + Set the name of the color conversion routine, if not the default.
    +const char * stp_get_color_conversion (const stp_vars_t *v) - Get the name of the color conversion routine.
    -void stp_set_left (stp_vars_t *v, int val) + Get the name of the color conversion routine.
    +void stp_set_left (stp_vars_t *v, int val) - Set the left edge of the image.
    -int stp_get_left (const stp_vars_t *v) + Set the left edge of the image.
    +int stp_get_left (const stp_vars_t *v) - Get the left edge of the image.
    -void stp_set_top (stp_vars_t *v, int val) + Get the left edge of the image.
    +void stp_set_top (stp_vars_t *v, int val) - Set the top edge of the image.
    -int stp_get_top (const stp_vars_t *v) + Set the top edge of the image.
    +int stp_get_top (const stp_vars_t *v) - Get the top edge of the image.
    -void stp_set_width (stp_vars_t *v, int val) + Get the top edge of the image.
    +void stp_set_width (stp_vars_t *v, int val) - Set the width of the image.
    -int stp_get_width (const stp_vars_t *v) + Set the width of the image.
    +int stp_get_width (const stp_vars_t *v) - Get the width edge of the image.
    -void stp_set_height (stp_vars_t *v, int val) + Get the width edge of the image.
    +void stp_set_height (stp_vars_t *v, int val) - Set the height of the image.
    -int stp_get_height (const stp_vars_t *v) + Set the height of the image.
    +int stp_get_height (const stp_vars_t *v) - Get the height of the image.
    -void stp_set_page_width (stp_vars_t *v, int val) + Get the height of the image.
    +void stp_set_page_width (stp_vars_t *v, int val) - Set the page width.
    -int stp_get_page_width (const stp_vars_t *v) + Set the page width.
    +int stp_get_page_width (const stp_vars_t *v) - Get the page width.
    -void stp_set_page_height (stp_vars_t *v, int val) + Get the page width.
    +void stp_set_page_height (stp_vars_t *v, int val) - Set the page height.
    -int stp_get_page_height (const stp_vars_t *v) + Set the page height.
    +int stp_get_page_height (const stp_vars_t *v) - Get the page height.
    -void stp_set_outfunc (stp_vars_t *v, stp_outfunc_t val) + Get the page height.
    +void stp_set_outfunc (stp_vars_t *v, stp_outfunc_t val) - Set the function used to print output information.
    -stp_outfunc_t stp_get_outfunc (const stp_vars_t *v) + Set the function used to print output information.
    +stp_outfunc_t stp_get_outfunc (const stp_vars_t *v) - Get the function used to print output information.
    -void stp_set_errfunc (stp_vars_t *v, stp_outfunc_t val) + Get the function used to print output information.
    +void stp_set_errfunc (stp_vars_t *v, stp_outfunc_t val) - Set the function used to print error and diagnostic information.
    -stp_outfunc_t stp_get_errfunc (const stp_vars_t *v) + Set the function used to print error and diagnostic information.
    +stp_outfunc_t stp_get_errfunc (const stp_vars_t *v) - Get the function used to print output information.
    -void stp_set_outdata (stp_vars_t *v, void *val) + Get the function used to print output information.
    +void stp_set_outdata (stp_vars_t *v, void *val) - Set the output data.
    -void * stp_get_outdata (const stp_vars_t *v) + Set the output data.
    +void * stp_get_outdata (const stp_vars_t *v) - Get the output data.
    -void stp_set_errdata (stp_vars_t *v, void *val) + Get the output data.
    +void stp_set_errdata (stp_vars_t *v, void *val) - Set the error data.
    -void * stp_get_errdata (const stp_vars_t *v) + Set the error data.
    +void * stp_get_errdata (const stp_vars_t *v) - Get the error data.
    -void stp_merge_printvars (stp_vars_t *user, const stp_vars_t *print) + Get the error data.
    +void stp_merge_printvars (stp_vars_t *user, const stp_vars_t *print) - Merge defaults for a printer with user-chosen settings.
    -stp_parameter_list_t stp_get_parameter_list (const stp_vars_t *v) + Merge defaults for a printer with user-chosen settings.
    +stp_parameter_list_t stp_get_parameter_list (const stp_vars_t *v) - List the available parameters for the currently chosen settings.
    -size_t stp_parameter_list_count (stp_const_parameter_list_t list) + List the available parameters for the currently chosen settings.
    +size_t stp_parameter_list_count (stp_const_parameter_list_t list) - List the number of available parameters for the currently chosen settings.
    -const stp_parameter_t * stp_parameter_find (stp_const_parameter_list_t list, const char *name) + List the number of available parameters for the currently chosen settings.
    +const stp_parameter_t * stp_parameter_find (stp_const_parameter_list_t list, const char *name) - Find a parameter by its name.
    -const stp_parameter_t * stp_parameter_list_param (stp_const_parameter_list_t list, size_t item) + Find a parameter by its name.
    +const stp_parameter_t * stp_parameter_list_param (stp_const_parameter_list_t list, size_t item) - Find a parameter by its index number.
    -void stp_parameter_list_destroy (stp_parameter_list_t list) + Find a parameter by its index number.
    +void stp_parameter_list_destroy (stp_parameter_list_t list) - Destroy a parameter_list.
    -stp_parameter_list_t stp_parameter_list_create (void) + Destroy a parameter_list.
    +stp_parameter_list_t stp_parameter_list_create (void) - Create a parameter_list.
    -void stp_parameter_list_add_param (stp_parameter_list_t list, const stp_parameter_t *item) + Create a parameter_list.
    +void stp_parameter_list_add_param (stp_parameter_list_t list, const stp_parameter_t *item) - Add a parameter to a parameter_list.
    -stp_parameter_list_t stp_parameter_list_copy (stp_const_parameter_list_t list) + Add a parameter to a parameter_list.
    +stp_parameter_list_t stp_parameter_list_copy (stp_const_parameter_list_t list) - Copy and allocate a parameter_list.
    -void stp_parameter_list_append (stp_parameter_list_t list, stp_const_parameter_list_t append) + Copy and allocate a parameter_list.
    +void stp_parameter_list_append (stp_parameter_list_t list, stp_const_parameter_list_t append) - Append one parameter_list to another.
    -void stp_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description) + Append one parameter_list to another.
    +void stp_describe_parameter (const stp_vars_t *v, const char *name, stp_parameter_t *description) - Describe a parameter in detail.
    -void stp_parameter_description_destroy (stp_parameter_t *description) + Describe a parameter in detail.
    +void stp_parameter_description_destroy (stp_parameter_t *description) - Destroy a parameter description.
    -const stp_parameter_t * stp_parameter_find_in_settings (const stp_vars_t *v, const char *name) + Destroy a parameter description.
    +const stp_parameter_t * stp_parameter_find_in_settings (const stp_vars_t *v, const char *name) - Find a parameter by its name from a vars object.
    -void stp_set_string_parameter (stp_vars_t *v, const char *parameter, const char *value) + Find a parameter by its name from a vars object.
    +void stp_set_string_parameter (stp_vars_t *v, const char *parameter, const char *value) - Set a string parameter.
    -void stp_set_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) + Set a string parameter.
    +void stp_set_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) - Set a string parameter.
    -void stp_set_file_parameter (stp_vars_t *v, const char *parameter, const char *value) + Set a string parameter.
    +void stp_set_file_parameter (stp_vars_t *v, const char *parameter, const char *value) - Set a file parameter.
    -void stp_set_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) + Set a file parameter.
    +void stp_set_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) - Set a file parameter.
    -void stp_set_float_parameter (stp_vars_t *v, const char *parameter, double value) + Set a file parameter.
    +void stp_set_float_parameter (stp_vars_t *v, const char *parameter, double value) - Set a float parameter.
    -void stp_set_int_parameter (stp_vars_t *v, const char *parameter, int value) + Set a float parameter.
    +void stp_set_int_parameter (stp_vars_t *v, const char *parameter, int value) - Set an integer parameter.
    -void stp_set_dimension_parameter (stp_vars_t *v, const char *parameter, int value) + Set an integer parameter.
    +void stp_set_dimension_parameter (stp_vars_t *v, const char *parameter, int value) - Set a dimension parameter.
    -void stp_set_boolean_parameter (stp_vars_t *v, const char *parameter, int value) + Set a dimension parameter.
    +void stp_set_boolean_parameter (stp_vars_t *v, const char *parameter, int value) - Set a boolean parameter.
    -void stp_set_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value) + Set a boolean parameter.
    +void stp_set_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value) - Set a curve parameter.
    -void stp_set_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value) + Set a curve parameter.
    +void stp_set_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value) - Set an array parameter.
    -void stp_set_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes) + Set an array parameter.
    +void stp_set_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes) - Set a raw parameter.
    -void stp_scale_float_parameter (stp_vars_t *v, const char *parameter, double scale) + Set a raw parameter.
    +void stp_scale_float_parameter (stp_vars_t *v, const char *parameter, double scale) - Multiply the value of a float parameter by a scaling factor.
    -void stp_set_default_string_parameter (stp_vars_t *v, const char *parameter, const char *value) + Multiply the value of a float parameter by a scaling factor.
    +void stp_set_default_string_parameter (stp_vars_t *v, const char *parameter, const char *value) - Set a default string parameter.
    -void stp_set_default_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) + Set a default string parameter.
    +void stp_set_default_string_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) - Set a default string parameter.
    -void stp_set_default_file_parameter (stp_vars_t *v, const char *parameter, const char *value) + Set a default string parameter.
    +void stp_set_default_file_parameter (stp_vars_t *v, const char *parameter, const char *value) - Set a default file parameter.
    -void stp_set_default_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) + Set a default file parameter.
    +void stp_set_default_file_parameter_n (stp_vars_t *v, const char *parameter, const char *value, size_t bytes) - Set a default file parameter.
    -void stp_set_default_float_parameter (stp_vars_t *v, const char *parameter, double value) + Set a default file parameter.
    +void stp_set_default_float_parameter (stp_vars_t *v, const char *parameter, double value) - Set a default float parameter.
    -void stp_set_default_int_parameter (stp_vars_t *v, const char *parameter, int value) + Set a default float parameter.
    +void stp_set_default_int_parameter (stp_vars_t *v, const char *parameter, int value) - Set a default integer parameter.
    -void stp_set_default_dimension_parameter (stp_vars_t *v, const char *parameter, int value) + Set a default integer parameter.
    +void stp_set_default_dimension_parameter (stp_vars_t *v, const char *parameter, int value) - Set a default dimension parameter.
    -void stp_set_default_boolean_parameter (stp_vars_t *v, const char *parameter, int value) + Set a default dimension parameter.
    +void stp_set_default_boolean_parameter (stp_vars_t *v, const char *parameter, int value) - Set a default boolean parameter.
    -void stp_set_default_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value) + Set a default boolean parameter.
    +void stp_set_default_curve_parameter (stp_vars_t *v, const char *parameter, const stp_curve_t *value) - Set a default curve parameter.
    -void stp_set_default_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value) + Set a default curve parameter.
    +void stp_set_default_array_parameter (stp_vars_t *v, const char *parameter, const stp_array_t *value) - Set a default array parameter.
    -void stp_set_default_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes) + Set a default array parameter.
    +void stp_set_default_raw_parameter (stp_vars_t *v, const char *parameter, const void *value, size_t bytes) - Set a default raw parameter.
    -const char * stp_get_string_parameter (const stp_vars_t *v, const char *parameter) + Set a default raw parameter.
    +const char * stp_get_string_parameter (const stp_vars_t *v, const char *parameter) - Get a string parameter.
    -const char * stp_get_file_parameter (const stp_vars_t *v, const char *parameter) + Get a string parameter.
    +const char * stp_get_file_parameter (const stp_vars_t *v, const char *parameter) - Get a file parameter.
    -double stp_get_float_parameter (const stp_vars_t *v, const char *parameter) + Get a file parameter.
    +double stp_get_float_parameter (const stp_vars_t *v, const char *parameter) - Get a float parameter.
    -int stp_get_int_parameter (const stp_vars_t *v, const char *parameter) + Get a float parameter.
    +int stp_get_int_parameter (const stp_vars_t *v, const char *parameter) - Get an integer parameter.
    -int stp_get_dimension_parameter (const stp_vars_t *v, const char *parameter) + Get an integer parameter.
    +int stp_get_dimension_parameter (const stp_vars_t *v, const char *parameter) - Get a dimension parameter.
    -int stp_get_boolean_parameter (const stp_vars_t *v, const char *parameter) + Get a dimension parameter.
    +int stp_get_boolean_parameter (const stp_vars_t *v, const char *parameter) - Get a boolean parameter.
    -const stp_curve_t * stp_get_curve_parameter (const stp_vars_t *v, const char *parameter) + Get a boolean parameter.
    +const stp_curve_t * stp_get_curve_parameter (const stp_vars_t *v, const char *parameter) - Get a curve parameter.
    -const stp_array_t * stp_get_array_parameter (const stp_vars_t *v, const char *parameter) + Get a curve parameter.
    +const stp_array_t * stp_get_array_parameter (const stp_vars_t *v, const char *parameter) - Get an array parameter.
    -const stp_raw_t * stp_get_raw_parameter (const stp_vars_t *v, const char *parameter) + Get an array parameter.
    +const stp_raw_t * stp_get_raw_parameter (const stp_vars_t *v, const char *parameter) - Get a raw parameter.
    -void stp_clear_string_parameter (stp_vars_t *v, const char *parameter) + Get a raw parameter.
    +void stp_clear_string_parameter (stp_vars_t *v, const char *parameter) - Clear a string parameter.
    -void stp_clear_file_parameter (stp_vars_t *v, const char *parameter) + Clear a string parameter.
    +void stp_clear_file_parameter (stp_vars_t *v, const char *parameter) - Clear a file parameter.
    -void stp_clear_float_parameter (stp_vars_t *v, const char *parameter) + Clear a file parameter.
    +void stp_clear_float_parameter (stp_vars_t *v, const char *parameter) - Clear (remove) a float parameter.
    -void stp_clear_int_parameter (stp_vars_t *v, const char *parameter) + Clear (remove) a float parameter.
    +void stp_clear_int_parameter (stp_vars_t *v, const char *parameter) - Clear (remove) an integer parameter.
    -void stp_clear_dimension_parameter (stp_vars_t *v, const char *parameter) + Clear (remove) an integer parameter.
    +void stp_clear_dimension_parameter (stp_vars_t *v, const char *parameter) - Clear (remove) a dimension parameter.
    -void stp_clear_boolean_parameter (stp_vars_t *v, const char *parameter) + Clear (remove) a dimension parameter.
    +void stp_clear_boolean_parameter (stp_vars_t *v, const char *parameter) - Clear (remove) a boolean parameter.
    -void stp_clear_curve_parameter (stp_vars_t *v, const char *parameter) + Clear (remove) a boolean parameter.
    +void stp_clear_curve_parameter (stp_vars_t *v, const char *parameter) - Clear a curve parameter.
    -void stp_clear_array_parameter (stp_vars_t *v, const char *parameter) + Clear a curve parameter.
    +void stp_clear_array_parameter (stp_vars_t *v, const char *parameter) - Clear an array parameter.
    -void stp_clear_raw_parameter (stp_vars_t *v, const char *parameter) + Clear an array parameter.
    +void stp_clear_raw_parameter (stp_vars_t *v, const char *parameter) - Clear a raw parameter.
    -void stp_set_string_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Clear a raw parameter.
    +void stp_set_string_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a string parameter.
    -void stp_set_file_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a string parameter.
    +void stp_set_file_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a file parameter.
    -void stp_set_float_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a file parameter.
    +void stp_set_float_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a float parameter.
    -void stp_set_int_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a float parameter.
    +void stp_set_int_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of an integer parameter.
    -void stp_set_dimension_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of an integer parameter.
    +void stp_set_dimension_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a dimension parameter.
    -void stp_set_boolean_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a dimension parameter.
    +void stp_set_boolean_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a boolean parameter.
    -void stp_set_curve_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a boolean parameter.
    +void stp_set_curve_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a curveparameter.
    -void stp_set_array_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a curveparameter.
    +void stp_set_array_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of an array parameter.
    -void stp_set_raw_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of an array parameter.
    +void stp_set_raw_parameter_active (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Set the activity of a raw parameter.
    -int stp_check_string_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Set the activity of a raw parameter.
    +int stp_check_string_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a string parameter is set.
    -int stp_check_file_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a string parameter is set.
    +int stp_check_file_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a file parameter is set.
    -int stp_check_float_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a file parameter is set.
    +int stp_check_float_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a float parameter is set.
    -int stp_check_int_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a float parameter is set.
    +int stp_check_int_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if an integer parameter is set.
    -int stp_check_dimension_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if an integer parameter is set.
    +int stp_check_dimension_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a dimension parameter is set.
    -int stp_check_boolean_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a dimension parameter is set.
    +int stp_check_boolean_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a boolean parameter is set.
    -int stp_check_curve_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a boolean parameter is set.
    +int stp_check_curve_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a curve parameter is set.
    -int stp_check_array_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if a curve parameter is set.
    +int stp_check_array_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if an array parameter is set.
    -int stp_check_raw_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) + Check if an array parameter is set.
    +int stp_check_raw_parameter (const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active) - Check if a raw parameter is set.
    -stp_parameter_activity_t stp_get_string_parameter_active (const stp_vars_t *v, const char *parameter) + Check if a raw parameter is set.
    +stp_parameter_activity_t stp_get_string_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a string parameter.
    -stp_parameter_activity_t stp_get_file_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a string parameter.
    +stp_parameter_activity_t stp_get_file_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a file parameter.
    -stp_parameter_activity_t stp_get_float_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a file parameter.
    +stp_parameter_activity_t stp_get_float_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a float parameter.
    -stp_parameter_activity_t stp_get_int_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a float parameter.
    +stp_parameter_activity_t stp_get_int_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of an integer parameter.
    -stp_parameter_activity_t stp_get_dimension_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of an integer parameter.
    +stp_parameter_activity_t stp_get_dimension_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a dimension parameter.
    -stp_parameter_activity_t stp_get_boolean_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a dimension parameter.
    +stp_parameter_activity_t stp_get_boolean_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a boolean parameter.
    -stp_parameter_activity_t stp_get_curve_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a boolean parameter.
    +stp_parameter_activity_t stp_get_curve_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a curve parameter.
    -stp_parameter_activity_t stp_get_array_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of a curve parameter.
    +stp_parameter_activity_t stp_get_array_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of an array parameter.
    -stp_parameter_activity_t stp_get_raw_parameter_active (const stp_vars_t *v, const char *parameter) + Get the activity status of an array parameter.
    +stp_parameter_activity_t stp_get_raw_parameter_active (const stp_vars_t *v, const char *parameter) - Get the activity status of a raw parameter.
    -void stp_get_media_size (const stp_vars_t *v, int *width, int *height) + Get the activity status of a raw parameter.
    +void stp_get_media_size (const stp_vars_t *v, int *width, int *height) - Get the media (paper) size.
    -void stp_get_imageable_area (const stp_vars_t *v, int *left, int *right, int *bottom, int *top) + Get the media (paper) size.
    +void stp_get_imageable_area (const stp_vars_t *v, int *left, int *right, int *bottom, int *top) - Get the imagable area of the page.
    -void stp_get_size_limit (const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height) + Get the imagable area of the page.
    +void stp_get_size_limit (const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height) - Get the media size limits.
    -void stp_describe_resolution (const stp_vars_t *v, int *x, int *y) + Get the media size limits.
    +void stp_describe_resolution (const stp_vars_t *v, int *x, int *y) - Retrieve the printing resolution of the selected resolution.
    -int stp_verify (stp_vars_t *v) + Retrieve the printing resolution of the selected resolution.
    +int stp_verify (stp_vars_t *v) - Verify parameters.
    -const stp_vars_t * stp_default_settings (void) + Verify parameters.
    +const stp_vars_t * stp_default_settings (void) - Get default global settings.
    -void stp_allocate_component_data (stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data) + Get default global settings.
    +void stp_allocate_component_data (stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data) -void stp_destroy_component_data (stp_vars_t *v, const char *name) +void stp_destroy_component_data (stp_vars_t *v, const char *name) -void * stp_get_component_data (const stp_vars_t *v, const char *name) +void * stp_get_component_data (const stp_vars_t *v, const char *name) -stp_parameter_verify_t stp_verify_parameter (const stp_vars_t *v, const char *parameter, int quiet) +stp_parameter_verify_t stp_verify_parameter (const stp_vars_t *v, const char *parameter, int quiet) -int stp_get_verified (const stp_vars_t *v) +int stp_get_verified (const stp_vars_t *v) -void stp_set_verified (stp_vars_t *v, int value) +void stp_set_verified (stp_vars_t *v, int value) -void stp_copy_options (stp_vars_t *vd, const stp_vars_t *vs) +void stp_copy_options (stp_vars_t *vd, const stp_vars_t *vs) -void stp_fill_parameter_settings (stp_parameter_t *desc, const stp_parameter_t *param) +void stp_fill_parameter_settings (stp_parameter_t *desc, const stp_parameter_t *param)

    Detailed Description

    Print job functions.

    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html index 9082fa2..1bb83be 100644 --- a/doc/gutenprint/html/weave_8h.html +++ b/doc/gutenprint/html/weave_8h.html @@ -2,25 +2,11 @@ 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
    +include » gutenprint

    weave.h File Reference

    Softweave functions. More...

    @@ -41,67 +27,67 @@ - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    struct  stp_linebounds_t

    Defines

    #define STP_MAX_WEAVE   (16)
    #define STP_MAX_WEAVE   (16)

    Typedefs

    typedef int stp_packfunc (stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)
    typedef int stp_packfunc (stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)
    typedef void stp_fillfunc (stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)
    typedef void stp_fillfunc (stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)
    typedef void stp_flushfunc (stp_vars_t *v, int passno, int vertical_subpass)
    typedef void stp_flushfunc (stp_vars_t *v, int passno, int vertical_subpass)
    typedef int stp_compute_linewidth_func (stp_vars_t *v, int n)
    typedef int stp_compute_linewidth_func (stp_vars_t *v, int n)

    Enumerations

    enum  stp_weave_strategy_t {
    -  STP_WEAVE_ZIGZAG, -STP_WEAVE_ASCENDING, -STP_WEAVE_DESCENDING, -STP_WEAVE_ASCENDING_2X, +
    enum  stp_weave_strategy_t {
    +  STP_WEAVE_ZIGZAG, +STP_WEAVE_ASCENDING, +STP_WEAVE_DESCENDING, +STP_WEAVE_ASCENDING_2X,
    -  STP_WEAVE_STAGGERED, -STP_WEAVE_ASCENDING_3X +  STP_WEAVE_STAGGERED, +STP_WEAVE_ASCENDING_3X
    }

    Functions

    void stp_initialize_weave (stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)
    void stp_initialize_weave (stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)
    void stp_flush_all (stp_vars_t *v)
    void stp_flush_all (stp_vars_t *v)
    void stp_write_weave (stp_vars_t *v, unsigned char *const cols[])
    void stp_write_weave (stp_vars_t *v, unsigned char *const cols[])
    stp_lineoff_t * stp_get_lineoffsets_by_pass (const stp_vars_t *v, int pass)
    stp_lineoff_t * stp_get_lineoffsets_by_pass (const stp_vars_t *v, int pass)
    stp_lineactive_t * stp_get_lineactive_by_pass (const stp_vars_t *v, int pass)
    stp_lineactive_t * stp_get_lineactive_by_pass (const stp_vars_t *v, int pass)
    stp_linecount_t * stp_get_linecount_by_pass (const stp_vars_t *v, int pass)
    stp_linecount_t * stp_get_linecount_by_pass (const stp_vars_t *v, int pass)
    const stp_linebufs_t * stp_get_linebases_by_pass (const stp_vars_t *v, int pass)
    const stp_linebufs_t * stp_get_linebases_by_pass (const stp_vars_t *v, int pass)
    stp_pass_t * stp_get_pass_by_pass (const stp_vars_t *v, int pass)
    stp_pass_t * stp_get_pass_by_pass (const stp_vars_t *v, int pass)
    void stp_weave_parameters_by_row (const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)
    void stp_weave_parameters_by_row (const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)

    Variables

    stp_packfunc stp_pack_tiff
    stp_packfunc stp_pack_tiff
    stp_packfunc stp_pack_uncompressed
    stp_packfunc stp_pack_uncompressed
    stp_fillfunc stp_fill_tiff
    stp_fillfunc stp_fill_tiff
    stp_fillfunc stp_fill_uncompressed
    stp_fillfunc stp_fill_uncompressed
    stp_compute_linewidth_func stp_compute_tiff_linewidth
    stp_compute_linewidth_func stp_compute_tiff_linewidth
    stp_compute_linewidth_func stp_compute_uncompressed_linewidth
    stp_compute_linewidth_func stp_compute_uncompressed_linewidth

    Detailed Description

    Softweave functions.

    Define Documentation

    -

    +

    @@ -125,13 +111,13 @@ Softweave functions.

    Typedef Documentation

    -

    +

    @@ -148,13 +134,13 @@ Softweave functions.
    - +
    typedef int stp_compute_linewidth_func(stp_vars_t *v, int n) typedef int stp_compute_linewidth_func(stp_vars_t *v, int n)
    -

    +

    @@ -171,13 +157,13 @@ Softweave functions.
    - +
    typedef void stp_fillfunc(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color) typedef void stp_fillfunc(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)
    -

    +

    @@ -194,13 +180,13 @@ Softweave functions.
    - +
    typedef void stp_flushfunc(stp_vars_t *v, int passno, int vertical_subpass) typedef void stp_flushfunc(stp_vars_t *v, int passno, int vertical_subpass)
    -

    +

    @@ -218,13 +204,13 @@ Softweave functions.
    - +
    typedef int stp_packfunc(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last) typedef int stp_packfunc(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)

    Enumeration Type Documentation

    -

    +

    @@ -240,17 +226,17 @@ Softweave functions.

    Enumerator:
    - +
    enum stp_weave_strategy_t enum stp_weave_strategy_t
    - - - - - -
    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 
    @@ -258,7 +244,7 @@ Softweave functions.

    Function Documentation

    -

    +

    - + @@ -286,7 +272,7 @@ Softweave functions.
    @@ -266,7 +252,7 @@ Softweave functions.
    void stp_flush_all ( stp_vars_t * stp_vars_t *  v  ) 
    -

    +

    - + @@ -323,7 +309,7 @@ Softweave functions.
    @@ -294,7 +280,7 @@ Softweave functions.
    stp_lineactive_t* stp_get_lineactive_by_pass ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -360,7 +346,7 @@ Softweave functions.
    @@ -331,7 +317,7 @@ Softweave functions.
    const stp_linebufs_t* stp_get_linebases_by_pass ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -397,7 +383,7 @@ Softweave functions.
    @@ -368,7 +354,7 @@ Softweave functions.
    stp_linecount_t* stp_get_linecount_by_pass ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -434,7 +420,7 @@ Softweave functions.
    @@ -405,7 +391,7 @@ Softweave functions.
    stp_lineoff_t* stp_get_lineoffsets_by_pass ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -471,7 +457,7 @@ Softweave functions.
    @@ -442,7 +428,7 @@ Softweave functions.
    stp_pass_t* stp_get_pass_by_pass ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -557,31 +543,31 @@ Softweave functions. - + - + - + - + - + @@ -604,7 +590,7 @@ Softweave functions.
    @@ -479,7 +465,7 @@ Softweave functions.
    void stp_initialize_weave ( stp_vars_t * stp_vars_t *  v,
    stp_weave_strategy_t stp_weave_strategy_t  ,
    stp_flushfunc stp_flushfunc  ,
    stp_fillfunc stp_fillfunc  ,
    stp_packfunc stp_packfunc  ,
    stp_compute_linewidth_func stp_compute_linewidth_func 
    -

    +

    - + @@ -653,7 +639,7 @@ Softweave functions.
    @@ -612,7 +598,7 @@ Softweave functions.
    void stp_weave_parameters_by_row ( const stp_vars_t * const stp_vars_t *  v,
    -

    +

    - + @@ -691,13 +677,13 @@ Softweave functions.
    @@ -661,7 +647,7 @@ Softweave functions.
    void stp_write_weave ( stp_vars_t * stp_vars_t *  v,

    Variable Documentation

    -

    +

    @@ -714,13 +700,13 @@ Softweave functions.
    - +
    stp_compute_linewidth_func stp_compute_tiff_linewidth stp_compute_linewidth_func stp_compute_tiff_linewidth
    -

    +

    @@ -737,13 +723,13 @@ Softweave functions.
    - +
    stp_compute_linewidth_func stp_compute_uncompressed_linewidth stp_compute_linewidth_func stp_compute_uncompressed_linewidth
    -

    +

    @@ -760,13 +746,13 @@ Softweave functions.
    - +
    stp_fillfunc stp_fill_tiff stp_fillfunc stp_fill_tiff
    -

    +

    @@ -783,13 +769,13 @@ Softweave functions.
    - +
    stp_fillfunc stp_fill_uncompressed stp_fillfunc stp_fill_uncompressed
    -

    +

    @@ -806,13 +792,13 @@ Softweave functions.
    - +
    stp_packfunc stp_pack_tiff stp_packfunc stp_pack_tiff
    -

    +

    @@ -829,8 +815,8 @@ Softweave functions.
    - +
    stp_packfunc stp_pack_uncompressed stp_packfunc stp_pack_uncompressed
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html index 5c4760d..b86b49c 100644 --- a/doc/gutenprint/html/xml_8h.html +++ b/doc/gutenprint/html/xml_8h.html @@ -2,88 +2,74 @@ 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
    +include » gutenprint

    xml.h File Reference

    XML tree functions. More...

    #include <gutenprint/mxml.h>
    - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

    Typedefs

    typedef int(* stp_xml_parse_func )(stp_mxml_node_t *node, const char *file)
    typedef int(* stp_xml_parse_func )(stp_mxml_node_t *node, const char *file)

    Functions

    void stp_register_xml_parser (const char *name, stp_xml_parse_func parse_func)
    void stp_register_xml_parser (const char *name, stp_xml_parse_func parse_func)
    void stp_unregister_xml_parser (const char *name)
    void stp_unregister_xml_parser (const char *name)
    void stp_register_xml_preload (const char *filename)
    void stp_register_xml_preload (const char *filename)
    void stp_unregister_xml_preload (const char *filename)
    void stp_unregister_xml_preload (const char *filename)
    int stp_xml_init_defaults (void)
    int stp_xml_init_defaults (void)
    int stp_xml_parse_file (const char *file)
    int stp_xml_parse_file (const char *file)
    long stp_xmlstrtol (const char *value)
    long stp_xmlstrtol (const char *value)
    unsigned long stp_xmlstrtoul (const char *value)
    unsigned long stp_xmlstrtoul (const char *value)
    double stp_xmlstrtod (const char *textval)
    double stp_xmlstrtod (const char *textval)
    void stp_xml_init (void)
    void stp_xml_init (void)
    void stp_xml_exit (void)
    void stp_xml_exit (void)
    stp_mxml_node_t * stp_xml_get_node (stp_mxml_node_t *xmlroot,...)
    stp_mxml_node_t * stp_xml_get_node (stp_mxml_node_t *xmlroot,...)
    stp_mxml_node_t * stp_xmldoc_create_generic (void)
    stp_mxml_node_t * stp_xmldoc_create_generic (void)
    void stp_xml_preinit (void)
    void stp_xml_preinit (void)
    stp_sequence_t * stp_sequence_create_from_xmltree (stp_mxml_node_t *da)
    stp_sequence_t * stp_sequence_create_from_xmltree (stp_mxml_node_t *da)
    stp_mxml_node_t * stp_xmltree_create_from_sequence (const stp_sequence_t *seq)
    stp_mxml_node_t * stp_xmltree_create_from_sequence (const stp_sequence_t *seq)
    stp_curve_t * stp_curve_create_from_xmltree (stp_mxml_node_t *da)
    stp_curve_t * stp_curve_create_from_xmltree (stp_mxml_node_t *da)
    stp_mxml_node_t * stp_xmltree_create_from_curve (const stp_curve_t *curve)
    stp_mxml_node_t * stp_xmltree_create_from_curve (const stp_curve_t *curve)
    stp_array_t * stp_array_create_from_xmltree (stp_mxml_node_t *array)
    stp_array_t * stp_array_create_from_xmltree (stp_mxml_node_t *array)
    stp_mxml_node_t * stp_xmltree_create_from_array (const stp_array_t *array)
    stp_mxml_node_t * stp_xmltree_create_from_array (const stp_array_t *array)
    void stp_xml_parse_file_named (const char *name)
    void stp_xml_parse_file_named (const char *name)

    Detailed Description

    XML tree functions.

    Typedef Documentation

    -

    +

    @@ -101,13 +87,13 @@ XML tree functions.
    - +
    typedef int(* stp_xml_parse_func)(stp_mxml_node_t *node, const char *file) typedef int(* stp_xml_parse_func)(stp_mxml_node_t *node, const char *file)

    Function Documentation

    -

    +

    - + - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    - + @@ -129,13 +115,13 @@ XML tree functions.
    stp_array_t* stp_array_create_from_xmltree stp_array_t* stp_array_create_from_xmltree (  stp_mxml_node_t *  array
    -

    +

    - + @@ -157,7 +143,7 @@ XML tree functions.
    stp_curve_t* stp_curve_create_from_xmltree stp_curve_t* stp_curve_create_from_xmltree (  stp_mxml_node_t *  da
    -

    +

    - + @@ -194,7 +180,7 @@ XML tree functions.
    @@ -171,7 +157,7 @@ XML tree functions.
    stp_xml_parse_func stp_xml_parse_func  parse_func
    -

    +

    @@ -222,13 +208,13 @@ XML tree functions.
    -

    +

    - + @@ -250,7 +236,7 @@ XML tree functions.
    stp_sequence_t* stp_sequence_create_from_xmltree stp_sequence_t* stp_sequence_create_from_xmltree (  stp_mxml_node_t *  da
    -

    +

    @@ -278,7 +264,7 @@ XML tree functions.
    -

    +

    @@ -306,7 +292,7 @@ XML tree functions.
    -

    +

    @@ -334,7 +320,7 @@ XML tree functions.
    -

    +

    @@ -371,7 +357,7 @@ XML tree functions.
    -

    +

    @@ -399,7 +385,7 @@ XML tree functions.
    -

    +

    @@ -427,7 +413,7 @@ XML tree functions.
    -

    +

    @@ -455,7 +441,7 @@ XML tree functions.
    -

    +

    @@ -483,7 +469,7 @@ XML tree functions.
    -

    +

    @@ -511,7 +497,7 @@ XML tree functions.
    -

    +

    @@ -539,7 +525,7 @@ XML tree functions.
    -

    +

    @@ -567,7 +553,7 @@ XML tree functions.
    -

    +

    @@ -595,7 +581,7 @@ XML tree functions.
    -

    +

    @@ -623,7 +609,7 @@ XML tree functions.
    -

    +

    - + @@ -651,7 +637,7 @@ XML tree functions.
    @@ -631,7 +617,7 @@ XML tree functions.
    stp_mxml_node_t* stp_xmltree_create_from_array ( const stp_array_t * const stp_array_t *  array  ) 
    -

    +

    - + @@ -679,7 +665,7 @@ XML tree functions.
    @@ -659,7 +645,7 @@ XML tree functions.
    stp_mxml_node_t* stp_xmltree_create_from_curve ( const stp_curve_t * const stp_curve_t *  curve  ) 
    -

    +

    - + @@ -707,8 +693,8 @@ XML tree functions.
    @@ -687,7 +673,7 @@ XML tree functions.
    stp_mxml_node_t* stp_xmltree_create_from_sequence ( const stp_sequence_t * const stp_sequence_t *  seq  ) 
    -

    Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by  +
    Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag index 44aed60..04d41ea 100644 --- a/doc/gutenprintui2/gutenprintui2.tag +++ b/doc/gutenprintui2/gutenprintui2.tag @@ -2,7 +2,7 @@ curve.h - /home/rleigh/gutenprint-debian-dist/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3/include/gutenprintui2/ curve_8h _StpuiCurve _StpuiCurveClass @@ -10,138 +10,138 @@ #define STPUI_TYPE_CURVE curve_8h.html - 5795444c0586277d34c693fc7b5deae0 + a0 #define STPUI_CURVE curve_8h.html - 767d8cf354306a35dc6b53e2aa033aa6 + a1 (obj) #define STPUI_CURVE_CLASS curve_8h.html - 9a1005d0077d10338a6a7f16940e8233 + a2 (klass) #define STPUI_IS_CURVE curve_8h.html - e886ed1f007a40362f784d16c020ff40 + a3 (obj) #define STPUI_IS_CURVE_CLASS curve_8h.html - fc44896a3decd9b178cec7f90598c8b8 + a4 (klass) #define STPUI_CURVE_GET_CLASS curve_8h.html - 5995f171eca6b87af06afde3160fcac0 + a5 (obj) _StpuiCurve StpuiCurve curve_8h.html - 04ae3b4e227fca5f2aa871b0f9e1cab0 + a6 _StpuiCurveClass StpuiCurveClass curve_8h.html - 13e6043625efd88837615685f7472e2d + a7 StpuiCurveType - 7d44faf53d74002f61d5805ac34d968e + a19 STPUI_CURVE_TYPE_LINEAR - 7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297 + a19a8 STPUI_CURVE_TYPE_SPLINE - 7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06 + a19a9 STPUI_CURVE_TYPE_FREE - 7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da + a19a10 GType stpui_curve_get_type curve_8h.html - 3eafd87334a70bb87fca2084b558c2b2 + a11 (void) G_GNUC_CONST GtkWidget * stpui_curve_new curve_8h.html - 23667321d3acf52249e8c18506be017d + a12 (void) void stpui_curve_reset curve_8h.html - eb1c0e9894aaa04ade62d050aa5ea15b + a13 (StpuiCurve *curve) void stpui_curve_set_gamma curve_8h.html - 2b8cf1c1a6badf89c3a7b95c87b91a72 + a14 (StpuiCurve *curve, gfloat gamma_) void stpui_curve_set_range curve_8h.html - 3701325c36b957b91b5e2719ffbaa28a + a15 (StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y) void stpui_curve_get_vector curve_8h.html - 6dfbda8721d6d652ef8f710a696d6367 + a16 (StpuiCurve *curve, int veclen, gfloat vector[]) void stpui_curve_set_vector curve_8h.html - f611be61b641f4efc9b6044aacf98103 + a17 (StpuiCurve *curve, int veclen, const gfloat vector[]) void stpui_curve_set_curve_type curve_8h.html - 9d6d8e461caf28083c2e1b76639c7d24 + a18 (StpuiCurve *curve, StpuiCurveType type) gammacurve.h - /home/rleigh/gutenprint-debian-dist/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3/include/gutenprintui2/ gammacurve_8h _StpuiGammaCurve _StpuiGammaCurveClass @@ -149,76 +149,76 @@ #define STPUI_TYPE_GAMMA_CURVE gammacurve_8h.html - 2575918538735bd891f2e4d9ec05d7b1 + a0 #define STPUI_GAMMA_CURVE gammacurve_8h.html - 679501caed595f5d700271b9991b724f + a1 (obj) #define STPUI_GAMMA_CURVE_CLASS gammacurve_8h.html - 8272afcf9ea42c3823c2d201fa13ba39 + a2 (klass) #define STPUI_IS_GAMMA_CURVE gammacurve_8h.html - 3838127029e05b8b71b4bb177ae8212e + a3 (obj) #define STPUI_IS_GAMMA_CURVE_CLASS gammacurve_8h.html - c574b30d0e65b8f5f6cd110405cbe9fb + a4 (klass) #define STPUI_GAMMA_CURVE_GET_CLASS gammacurve_8h.html - 9d8fed0608357a55c11c5adba1f6d1b5 + a5 (obj) _StpuiGammaCurve StpuiGammaCurve gammacurve_8h.html - e112dc0cc75594e7e8efd332fe2c9c5b + a6 _StpuiGammaCurveClass StpuiGammaCurveClass gammacurve_8h.html - 4ab4956b6af215068a2592a98ae43cbc + a7 GType stpui_gamma_curve_get_type gammacurve_8h.html - 57a0864588671f9b1ed5a64be3a06ed5 + a8 (void) G_GNUC_CONST GtkWidget * stpui_gamma_curve_new gammacurve_8h.html - b3038f4fe63c6035e3f1ec876559d8f9 + a9 (void) gutenprintui.h - /home/rleigh/gutenprint-debian-dist/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3/include/gutenprintui2/ gutenprintui_8h gutenprintui2/curve.h gutenprintui2/gammacurve.h @@ -229,475 +229,475 @@ stpui_image stpui_image_t gutenprintui_8h.html - f0f2e236d924323378ded67b3e434dd5 + a0 guchar *(* get_thumbnail_func_t gutenprintui_8h.html - 6867fbda8dc5650678af5a23979386b8 + a1 )(void *data, gint *width, gint *height, gint *bpp, gint page) orient_t - b72dd018d9f09ee35f7ac40fc7f29593 + a62 ORIENT_AUTO - b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0 + a62a2 ORIENT_PORTRAIT - b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80 + a62a3 ORIENT_LANDSCAPE - b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba + a62a4 ORIENT_UPSIDEDOWN - b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88 + a62a5 ORIENT_SEASCAPE - b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581 + a62a6 command_t - 1d9b1ad69ddba33dc7f51bf85792777d + a63 COMMAND_TYPE_DEFAULT - 1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb + a63a7 COMMAND_TYPE_CUSTOM - 1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda + a63a8 COMMAND_TYPE_FILE - 1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40 + a63a9 void stpui_plist_set_name gutenprintui_8h.html - 8ad3d342e15a406c942d52a7d5e093b8 + a10 (stpui_plist_t *p, const char *val) void stpui_plist_set_name_n gutenprintui_8h.html - ad9fc64007c7867e05743b6a30664fc4 + a11 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_name gutenprintui_8h.html - c70ee1c3425b1a3be74a5dfc3476f079 + a12 (const stpui_plist_t *p) void stpui_plist_set_queue_name gutenprintui_8h.html - 8267cf35fd86b40ce1bddb958bc0828d + a13 (stpui_plist_t *p, const char *val) void stpui_plist_set_queue_name_n gutenprintui_8h.html - 7b54207ec204cbe3327284ac9d56b188 + a14 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_queue_name gutenprintui_8h.html - aecb54cd0535976fd51b2be080366c22 + a15 (const stpui_plist_t *p) void stpui_plist_set_output_filename gutenprintui_8h.html - e0e2a359527aded6f2dc60fe6ec5ff55 + a16 (stpui_plist_t *p, const char *val) void stpui_plist_set_output_filename_n gutenprintui_8h.html - 8a751b01cba31f15aed8f39ef72f8e37 + a17 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_output_filename gutenprintui_8h.html - f593816f98fad12bf48d461fe72ff31e + a18 (const stpui_plist_t *p) void stpui_plist_set_extra_printer_options gutenprintui_8h.html - 6fba852c389ed20d9d1da1610d3125db + a19 (stpui_plist_t *p, const char *val) void stpui_plist_set_extra_printer_options_n gutenprintui_8h.html - b63f9f05403aa8edd3fc9a063d558a88 + a20 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_extra_printer_options gutenprintui_8h.html - 6b83f5dbcdf2deeef19726e468d7cfe3 + a21 (const stpui_plist_t *p) void stpui_plist_set_custom_command gutenprintui_8h.html - 5f04be99f3a2d8d788bd929d01823a75 + a22 (stpui_plist_t *p, const char *val) void stpui_plist_set_custom_command_n gutenprintui_8h.html - 13c2730e5161bf18e3a31fe4d2bb0b31 + a23 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_custom_command gutenprintui_8h.html - b31d172f0c6755ac149b498800c46141 + a24 (const stpui_plist_t *p) void stpui_plist_set_copy_count gutenprintui_8h.html - 3252b3c283aca1a71da38ae9a7b9b9b5 + a25 (stpui_plist_t *p, gint count) int stpui_plist_get_copy_count gutenprintui_8h.html - 4effa689c6a5e828c672b3feb0c91623 + a26 (const stpui_plist_t *p) void stpui_plist_set_current_standard_command gutenprintui_8h.html - c1e81fe45a8a3b4a6cd2682cdc21ddd1 + a27 (stpui_plist_t *p, const char *val) void stpui_plist_set_current_standard_command_n gutenprintui_8h.html - 8f7fe530f483f07c08dbe81efebbdb7a + a28 (stpui_plist_t *p, const char *val, int n) const char * stpui_plist_get_current_standard_command gutenprintui_8h.html - 276c7fbf168c1431d8dce2f1393dac09 + a29 (const stpui_plist_t *p) void stpui_plist_set_command_type gutenprintui_8h.html - b3cfd6a8b492bda54150c716f1631b4f + a30 (stpui_plist_t *p, command_t val) command_t stpui_plist_get_command_type gutenprintui_8h.html - 2f5b046cd01c6ad5bbccd485165928d7 + a31 (const stpui_plist_t *p) void stpui_set_global_parameter gutenprintui_8h.html - 35603794767eb756a784a74220e2e0cb + a32 (const char *param, const char *value) const char * stpui_get_global_parameter gutenprintui_8h.html - 51decc80a312291c9f99cde8a18393a6 + a33 (const char *param) void stpui_plist_copy gutenprintui_8h.html - a41fef36c0775105b3187708dbd9700a + a34 (stpui_plist_t *vd, const stpui_plist_t *vs) int stpui_plist_add gutenprintui_8h.html - 9b28f7223268ab81ff605e733ebf97e5 + a35 (const stpui_plist_t *key, int add_only) void stpui_printer_initialize gutenprintui_8h.html - 63325efb553d690c83608ad9d75b9c5c + a36 (stpui_plist_t *printer) const stpui_plist_t * stpui_get_current_printer gutenprintui_8h.html - 8aa89d084c3364396974b7665f5a26f9 + a37 (void) char * stpui_build_standard_print_command gutenprintui_8h.html - e63acdc3a4074290111bb1cece4437a1 + a38 (const stpui_plist_t *plist, const stp_printer_t *printer) void stpui_set_printrc_file gutenprintui_8h.html - 98928c6f53a0322dad08f1057882b2fd + a39 (const char *name) const char * stpui_get_printrc_file gutenprintui_8h.html - 47f72a1bf50eac641ab4f72af5ed379f + a40 (void) void stpui_printrc_load gutenprintui_8h.html - 9768d9e8d5370bdd66710de1df8fe4d3 + a41 (void) void stpui_get_system_printers gutenprintui_8h.html - 35da543417b8be45c11c02c590bf4ef5 + a42 (void) void stpui_printrc_save gutenprintui_8h.html - ea786257cd4a43a3ab947eb09d19907c + a43 (void) void stpui_set_image_filename gutenprintui_8h.html - 849dc9d8235aeae8c294ea97d3a2291d + a44 (const char *) const char * stpui_get_image_filename gutenprintui_8h.html - b46b5187c4d36188019c556f8685efdc + a45 (void) void stpui_set_errfunc gutenprintui_8h.html - cedc4d703e8a6e88243241245748a144 + a46 (stp_outfunc_t wfunc) stp_outfunc_t stpui_get_errfunc gutenprintui_8h.html - 92ac2b023b0352cb3d519ece77ccc51c + a47 (void) void stpui_set_errdata gutenprintui_8h.html - 6bc23edc145044cffc5f9457f759523e + a48 (void *errdata) void * stpui_get_errdata gutenprintui_8h.html - 1280f5bad08d4f7ccbfbd64785102ce2 + a49 (void) gint stpui_do_print_dialog gutenprintui_8h.html - b6ff540cc47781f92bd98d11c609ad96 + a50 (void) gint stpui_compute_orientation gutenprintui_8h.html - 25b010dc52c84c5dc5a83b84c4973415 + a51 (void) void stpui_set_image_dimensions gutenprintui_8h.html - c064fde3bd665a169a5bcee426fe90ad + a52 (gint width, gint height) void stpui_set_image_resolution gutenprintui_8h.html - 58f2ba3797c5bed1328f2bac2aa71531 + a53 (gdouble xres, gdouble yres) void stpui_set_image_type gutenprintui_8h.html - 310705e065d4ae1b3ed2e1c9c5189b1b + a54 (const char *image_type) void stpui_set_image_raw_channels gutenprintui_8h.html - 9475be2668e339e552bf905b3b377697 + a55 (gint channels) void stpui_set_image_channel_depth gutenprintui_8h.html - 121e36a0905706f7af20b18d76723086 + a56 (gint bit_depth) void stpui_set_thumbnail_func gutenprintui_8h.html - 881c586fa5ec944b157b7cb92c05be7a + a57 (get_thumbnail_func_t) get_thumbnail_func_t stpui_get_thumbnail_func gutenprintui_8h.html - e2ae7063801902cb0a4168974d81ab9b + a58 (void) void stpui_set_thumbnail_data gutenprintui_8h.html - da2af8cf724e3bcbd49be2f5d1cd4bc2 + a59 (void *) void * stpui_get_thumbnail_data gutenprintui_8h.html - eeca67486b0fae3eae3ed8d4c8b6ebe1 + a60 (void) int stpui_print gutenprintui_8h.html - 7867f0a4ea47e5f9f80c3463e6029a8a + a61 (const stpui_plist_t *printer, stpui_image_t *im) typebuiltins.h - /home/rleigh/gutenprint-debian-dist/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3/include/gutenprintui2/ typebuiltins_8h #define STPUI_TYPE_ORIENT_T typebuiltins_8h.html - b188f6f607a7c274ff9b93a7b9183c92 + a0 #define STPUI_TYPE_COMMAND_T typebuiltins_8h.html - c556621db9092f28e345b98cb6db57e3 + a1 #define STPUI_TYPE_CURVE_TYPE typebuiltins_8h.html - fd1aa89f9f88935e1482fa6675a28ee1 + a2 G_BEGIN_DECLS GType orient_t_orient_t_get_type typebuiltins_8h.html - 2c321ec10322da403b1709b4a8956ee3 + a3 (void) GType command_t_command_t_get_type typebuiltins_8h.html - 43d1612dab4df6c31f9b5362f88eaadf + a4 (void) GType stpui_curve_type_get_type typebuiltins_8h.html - 5e570d0225cd4f8ef426d648293dced9 + a5 (void) @@ -708,105 +708,105 @@ GtkDrawingArea graph struct__StpuiCurve.html - f8b0b924ebd7046dbfa85a856e4682c8 + o0 gint cursor_type struct__StpuiCurve.html - aeb92d99e85efb4bafc8170ff337d9a5 + o1 gfloat min_x struct__StpuiCurve.html - 42911f1fe1166d1441b07b5df42cc5c8 + o2 gfloat max_x struct__StpuiCurve.html - 2cc8505f392b3757b8e289d83c321693 + o3 gfloat min_y struct__StpuiCurve.html - 6557fd2c11b2f6a56a5ab6bbb85cbc19 + o4 gfloat max_y struct__StpuiCurve.html - 2c34fcda6babf4933d253ae6cd7c9419 + o5 GdkPixmap * pixmap struct__StpuiCurve.html - 8580443f4197aa43eeb23b41f3984de3 + o6 StpuiCurveType curve_type struct__StpuiCurve.html - a15d0c7b1a08ed0fb3e8675f60ceeb63 + o7 gint height struct__StpuiCurve.html - b435e227d5dd201e1768b2bcb2e0aa81 + o8 gint grab_point struct__StpuiCurve.html - 87568e046fdaaa74725653dc4de489fb + o9 gint last struct__StpuiCurve.html - 98bd1c45684cf587ac2347a92dd7bb51 + o10 gint num_points struct__StpuiCurve.html - 041da0cf21a17db4fedb8045c0eacdb3 + o11 GdkPoint * point struct__StpuiCurve.html - 78ee54aa8f813885fe2fe20d232518b9 + o12 gint num_ctlpoints struct__StpuiCurve.html - 7268e58fecac8344b32a31da68b341ec + o13 gfloat(* ctlpoint struct__StpuiCurve.html - b4de71fdc43c7448028e425034663828 + o14 )[2] @@ -817,42 +817,42 @@ GtkDrawingAreaClass parent_class struct__StpuiCurveClass.html - 30b4ac9159b3909d53a2913e9d33ce37 + o0 void(* curve_type_changed struct__StpuiCurveClass.html - bd4d748a3214fe60405dd0f19071963c + o1 )(StpuiCurve *curve) void(* _gtk_reserved1 struct__StpuiCurveClass.html - 858c3bfbf2316dff67461668960ea424 + o2 )(void) void(* _gtk_reserved2 struct__StpuiCurveClass.html - b98e90cf60128ee094ed5cbec3f7b9bd + o3 )(void) void(* _gtk_reserved3 struct__StpuiCurveClass.html - 3a79f396911263c8c1c03ead4a6feecf + o4 )(void) void(* _gtk_reserved4 struct__StpuiCurveClass.html - 43708b729750b48f02a0273f72cb8947 + o5 )(void) @@ -863,49 +863,49 @@ GtkVBox vbox struct__StpuiGammaCurve.html - fad9b4ea6fda50ab90f21ab8d4b6b70c + o0 GtkWidget * table struct__StpuiGammaCurve.html - aab9e1de16f38176f86d7a92ba337a8d + o1 GtkWidget * curve struct__StpuiGammaCurve.html - 4efa264f5ef3e1a5c95736e07544ebf0 + o2 GtkWidget * button struct__StpuiGammaCurve.html - f40e80ae3d6e7d34a12bf5c9d58c140b + o3 [5] gfloat gamma struct__StpuiGammaCurve.html - 05b048d7242cb7b8b57cfa3b1d65ecea + o4 GtkWidget * gamma_dialog struct__StpuiGammaCurve.html - 8dadefcd22adf55ea28403e900b2329e + o5 GtkWidget * gamma_text struct__StpuiGammaCurve.html - 5b7be56d829006b2914afe741e75a31e + o6 @@ -916,35 +916,35 @@ GtkVBoxClass parent_class struct__StpuiGammaCurveClass.html - 30b4ac9159b3909d53a2913e9d33ce37 + o0 void(* _gtk_reserved1 struct__StpuiGammaCurveClass.html - 858c3bfbf2316dff67461668960ea424 + o1 )(void) void(* _gtk_reserved2 struct__StpuiGammaCurveClass.html - b98e90cf60128ee094ed5cbec3f7b9bd + o2 )(void) void(* _gtk_reserved3 struct__StpuiGammaCurveClass.html - 3a79f396911263c8c1c03ead4a6feecf + o3 )(void) void(* _gtk_reserved4 struct__StpuiGammaCurveClass.html - 43708b729750b48f02a0273f72cb8947 + o4 )(void) @@ -955,56 +955,56 @@ stp_image_t im structstpui__image.html - 73bebce395b6f1efedcf6842fbdb4d76 + o0 void(* transpose structstpui__image.html - 2eab557840c9b342f902b27b6f4374c5 + o1 )(struct stpui_image *image) void(* hflip structstpui__image.html - 59c4e5062d0201345d9a3c517faed76b + o2 )(struct stpui_image *image) void(* vflip structstpui__image.html - 5a79d8a51117f0f542de337737559e35 + o3 )(struct stpui_image *image) void(* rotate_ccw structstpui__image.html - 2dd5e7759fa1a528d7d609558f9a3af9 + o4 )(struct stpui_image *image) void(* rotate_cw structstpui__image.html - 2f391913505ad8be5f120fdc15083631 + o5 )(struct stpui_image *image) void(* rotate_180 structstpui__image.html - 38ffe38f14b789767f8a2f7823ad665f + o6 )(struct stpui_image *image) void(* crop structstpui__image.html - 6746aa4c8378f9674566fbefb37a6aa7 + o7 )(struct stpui_image *image, int left, int top, int right, int bottom) @@ -1015,98 +1015,98 @@ char * name structstpui__plist__t.html - b068931cc450442b63f5b3d276ea4297 + o0 command_t command_type structstpui__plist__t.html - 193b6cc04eadeb71b71417bf19c48c4c + o1 char * queue_name structstpui__plist__t.html - 692e12dd54ad3badf18627bdb1784843 + o2 char * extra_printer_options structstpui__plist__t.html - 41633c85d02d5b0157efadd6414fa77e + o3 char * custom_command structstpui__plist__t.html - 4ea7b75bdeda81e50ea3cd316b341f41 + o4 char * current_standard_command structstpui__plist__t.html - d7d54f45247db317b37d0a4a1b4fc3d2 + o5 char * output_filename structstpui__plist__t.html - 9c39e63596d53eb17161a43fce627940 + o6 float scaling structstpui__plist__t.html - 0ad29dfafe3dc8ad331b9397912e3d4d + o7 orient_t orientation structstpui__plist__t.html - da1639422ad8f355d2371428471379b5 + o8 int unit structstpui__plist__t.html - 3e34bdebd9bd5edda27e8728904a2552 + o9 int auto_size_roll_feed_paper structstpui__plist__t.html - b679b17522d3fbb138dad90635cb91f7 + o10 int invalid_mask structstpui__plist__t.html - 01f4a6c8919018e9df44948ed78a5f71 + o11 stp_vars_t * v structstpui__plist__t.html - 9e3669d19b675bd57058fd4664205d2a + o12 include/gutenprintui2/ - /home/rleigh/gutenprint-debian-dist/include/gutenprintui2/ - dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html + /home/rlk/sandbox/print-4.3/include/gutenprintui2/ + dir_000001.html curve.h gammacurve.h gutenprintui.h @@ -1114,8 +1114,8 @@ include/ - /home/rleigh/gutenprint-debian-dist/include/ - dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html + /home/rlk/sandbox/print-4.3/include/ + dir_000000.html include/gutenprintui2/ diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html index b7d6fbc..03e317a 100644 --- a/doc/gutenprintui2/html/annotated.html +++ b/doc/gutenprintui2/html/annotated.html @@ -2,22 +2,9 @@ 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: @@ -26,8 +13,8 @@
    _StpuiCurve
    _StpuiCurveClass
    stpui_image
    stpui_plist_t
    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html index 523be6c..d1da193 100644 --- a/doc/gutenprintui2/html/classes.html +++ b/doc/gutenprintui2/html/classes.html @@ -2,29 +2,16 @@ libgutenprintui2 API Reference: Alphabetical List - - -
    -
    -
    -
    -

    libgutenprintui2 API Reference Data Structure Index

    S | _

    + +

    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +

    libgutenprintui2 API Reference Data Structure Index

    _ | S

    -
      S  
    -    		stpui_plist_t   _StpuiCurve   _StpuiGammaCurve   _StpuiGammaCurveClass   
    stpui_image   
      _  
    -    		_StpuiCurveClass   

    S | _

    -

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
      _  
    +    		_StpuiCurveClass   _StpuiGammaCurveClass   stpui_image   stpui_plist_t   
    _StpuiCurve   _StpuiGammaCurve   
      S  
    +

    _ | S

    +

    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4 diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html index a63afb3..20a76d4 100644 --- a/doc/gutenprintui2/html/curve_8h.html +++ b/doc/gutenprintui2/html/curve_8h.html @@ -2,23 +2,11 @@ libgutenprintui2 API Reference: include/gutenprintui2/curve.h File Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -include » gutenprintui2
    +include » gutenprintui2

    curve.h File Reference

    #include <gdk/gdk.h>
    #include <gtk/gtkdrawingarea.h>
    @@ -29,49 +17,49 @@ - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - +
    struct  _StpuiCurveClass

    Defines

    #define STPUI_TYPE_CURVE   (stpui_curve_get_type ())
    #define STPUI_TYPE_CURVE   (stpui_curve_get_type ())
    #define STPUI_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, StpuiCurve))
    #define STPUI_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, StpuiCurve))
    #define STPUI_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, StpuiCurveClass))
    #define STPUI_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, StpuiCurveClass))
    #define STPUI_IS_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))
    #define STPUI_IS_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))
    #define STPUI_IS_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))
    #define STPUI_IS_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))
    #define STPUI_CURVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, StpuiCurveClass))
    #define STPUI_CURVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, StpuiCurveClass))

    Typedefs

    typedef _StpuiCurve StpuiCurve
    typedef _StpuiCurve StpuiCurve
    typedef _StpuiCurveClass StpuiCurveClass
    typedef _StpuiCurveClass StpuiCurveClass

    Enumerations

    enum  StpuiCurveType { STPUI_CURVE_TYPE_LINEAR, -STPUI_CURVE_TYPE_SPLINE, -STPUI_CURVE_TYPE_FREE +
    enum  StpuiCurveType { STPUI_CURVE_TYPE_LINEAR, +STPUI_CURVE_TYPE_SPLINE, +STPUI_CURVE_TYPE_FREE }

    Functions

    GType stpui_curve_get_type (void) G_GNUC_CONST
    GType stpui_curve_get_type (void) G_GNUC_CONST
    GtkWidget * stpui_curve_new (void)
    GtkWidget * stpui_curve_new (void)
    void stpui_curve_reset (StpuiCurve *curve)
    void stpui_curve_reset (StpuiCurve *curve)
    void stpui_curve_set_gamma (StpuiCurve *curve, gfloat gamma_)
    void stpui_curve_set_gamma (StpuiCurve *curve, gfloat gamma_)
    void stpui_curve_set_range (StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)
    void stpui_curve_set_range (StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)
    void stpui_curve_get_vector (StpuiCurve *curve, int veclen, gfloat vector[])
    void stpui_curve_get_vector (StpuiCurve *curve, int veclen, gfloat vector[])
    void stpui_curve_set_vector (StpuiCurve *curve, int veclen, const gfloat vector[])
    void stpui_curve_set_vector (StpuiCurve *curve, int veclen, const gfloat vector[])
    void stpui_curve_set_curve_type (StpuiCurve *curve, StpuiCurveType type)
    void stpui_curve_set_curve_type (StpuiCurve *curve, StpuiCurveType type)

    Define Documentation

    -

    +

    @@ -99,7 +87,7 @@
    -

    +

    @@ -127,7 +115,7 @@
    -

    +

    @@ -155,7 +143,7 @@
    -

    +

    @@ -183,7 +171,7 @@
    -

    +

    @@ -211,7 +199,7 @@
    -

    +

    @@ -235,7 +223,7 @@

    Typedef Documentation

    -

    +

    @@ -258,7 +246,7 @@
    -

    +

    @@ -282,13 +270,13 @@

    Enumeration Type Documentation

    -

    +

    @@ -304,11 +292,11 @@

    Enumerator:
    - +
    enum StpuiCurveType enum StpuiCurveType
    - - -
    STPUI_CURVE_TYPE_LINEAR  +
    STPUI_CURVE_TYPE_LINEAR 
    STPUI_CURVE_TYPE_SPLINE  +
    STPUI_CURVE_TYPE_SPLINE 
    STPUI_CURVE_TYPE_FREE  +
    STPUI_CURVE_TYPE_FREE 
    @@ -316,7 +304,7 @@

    Function Documentation

    -

    +

    @@ -344,7 +332,7 @@
    -

    +

    @@ -387,7 +375,7 @@
    -

    +

    @@ -415,7 +403,7 @@
    -

    +

    @@ -443,7 +431,7 @@
    -

    +

    - + @@ -480,7 +468,7 @@
    @@ -457,7 +445,7 @@
    StpuiCurveType StpuiCurveType  type
    -

    +

    @@ -517,7 +505,7 @@
    -

    +

    @@ -572,7 +560,7 @@
    -

    +

    @@ -615,8 +603,8 @@
    -

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir_000000.html new file mode 100644 index 0000000..f6260ca --- /dev/null +++ b/doc/gutenprintui2/html/dir_000000.html @@ -0,0 +1,20 @@ + + +libgutenprintui2 API Reference: include/ Directory Reference + + + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    +include
    +

    include Directory Reference

    + + + + +

    Directories

    directory  gutenprintui2
    +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  + +doxygen 1.4.4
    + + diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir_000001.html new file mode 100644 index 0000000..8ca16f0 --- /dev/null +++ b/doc/gutenprintui2/html/dir_000001.html @@ -0,0 +1,26 @@ + + +libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference + + + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    +include » gutenprintui2
    +

    gutenprintui2 Directory Reference

    + + + + + + + + + + +

    Files

    file  curve.h
    file  gammacurve.h
    file  gutenprintui.h
    file  typebuiltins.h
    +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  + +doxygen 1.4.4
    + + diff --git a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html deleted file mode 100644 index 648a8ae..0000000 --- a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html +++ /dev/null @@ -1,27 +0,0 @@ - - -libgutenprintui2 API Reference: include/ Directory Reference - - - - -
    -
    -
    -include
    -

    include Directory Reference

    - - - - -

    Directories

    directory  gutenprintui2
    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  - -doxygen 1.4.5
    - - diff --git a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html deleted file mode 100644 index b8901a1..0000000 --- a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html +++ /dev/null @@ -1,33 +0,0 @@ - - -libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference - - - - -
    -
    -
    -include » gutenprintui2
    -

    gutenprintui2 Directory Reference

    - - - - - - - - - - -

    Files

    file  curve.h
    file  gammacurve.h
    file  gutenprintui.h
    file  typebuiltins.h
    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  - -doxygen 1.4.5
    - - diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html index d1fcad6..27f7e4b 100644 --- a/doc/gutenprintui2/html/dirs.html +++ b/doc/gutenprintui2/html/dirs.html @@ -2,24 +2,17 @@ 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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css index 05615b2..decae9e 100644 --- a/doc/gutenprintui2/html/doxygen.css +++ b/doc/gutenprintui2/html/doxygen.css @@ -17,8 +17,8 @@ H3 { CAPTION { font-weight: bold } DIV.qindex { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; padding: 2px; @@ -26,16 +26,16 @@ DIV.qindex { } DIV.nav { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; padding: 2px; line-height: 140%; } DIV.navtab { - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #eeeeff; + border: 1px solid #b0b0b0; text-align: center; margin: 2px; margin-right: 15px; @@ -118,7 +118,7 @@ BODY { margin-left: 20px; } TD.indexkey { - background-color: #e8eef2; + background-color: #eeeeff; font-weight: bold; padding-right : 10px; padding-top : 2px; @@ -131,7 +131,7 @@ TD.indexkey { border: 1px solid #CCCCCC; } TD.indexvalue { - background-color: #e8eef2; + background-color: #eeeeff; font-style: italic; padding-right : 10px; padding-top : 2px; @@ -286,25 +286,24 @@ FORM.search { INPUT.search { font-size: 75%; color: #000080; font-weight: normal; - background-color: #e8eef2; + background-color: #eeeeff; } TD.tiny { font-size: 75%; } a { - color: #1A41A8; + color: #252E78; } a:visited { - color: #2A3798; + color: #3D2185; } .dirtab { padding: 4px; border-collapse: collapse; - border: 1px solid #84b0c7; + border: 1px solid #b0b0b0; } -TH.dirtab { background: #e8eef2; +TH.dirtab { background: #eeeeff; font-weight: bold; } HR { height: 1px; border: none; border-top: 1px solid black; } - diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html index 1b7d259..9c8f278 100644 --- a/doc/gutenprintui2/html/files.html +++ b/doc/gutenprintui2/html/files.html @@ -2,29 +2,17 @@ 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:
    include/gutenprintui2/curve.h
    include/gutenprintui2/gammacurve.h
    include/gutenprintui2/gutenprintui.h
    include/gutenprintui2/typebuiltins.h
    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html index 5a8dcc2..50c3409 100644 --- a/doc/gutenprintui2/html/functions.html +++ b/doc/gutenprintui2/html/functions.html @@ -2,144 +2,104 @@ 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

    Here is a list of all struct and union fields with links to the structures/unions they belong to:

    - _ -

    +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved2 +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved3 +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved4 +: _StpuiGammaCurveClass, _StpuiCurveClass

    - a -

    +: stpui_plist_t

    - b -

    +: _StpuiGammaCurve

    - c -

    +: stpui_plist_t
  • crop +: stpui_image
  • ctlpoint +: _StpuiCurve
  • current_standard_command +: stpui_plist_t
  • cursor_type +: _StpuiCurve
  • curve +: _StpuiGammaCurve
  • curve_type +: _StpuiCurve
  • curve_type_changed +: _StpuiCurveClass
  • custom_command +: stpui_plist_t

    - e -

    +: stpui_plist_t

    - g -

    +: _StpuiGammaCurve
  • gamma_dialog +: _StpuiGammaCurve
  • gamma_text +: _StpuiGammaCurve
  • grab_point +: _StpuiCurve
  • graph +: _StpuiCurve

    - h -

    +: _StpuiCurve
  • hflip +: stpui_image

    - i -

    +: stpui_image
  • invalid_mask +: stpui_plist_t

    - l -

    +: _StpuiCurve

    - m -

    +: _StpuiCurve
  • max_y +: _StpuiCurve
  • min_x +: _StpuiCurve
  • min_y +: _StpuiCurve

    - n -

    +: stpui_plist_t
  • num_ctlpoints +: _StpuiCurve
  • num_points +: _StpuiCurve

    - o -

    +: stpui_plist_t
  • output_filename +: stpui_plist_t

    - p -

    +: _StpuiGammaCurveClass, _StpuiCurveClass
  • pixmap +: _StpuiCurve
  • point +: _StpuiCurve

    - q -

    +: stpui_plist_t

    - r -

    +: stpui_image
  • rotate_ccw +: stpui_image
  • rotate_cw +: stpui_image

    - s -

    +: stpui_plist_t

    - t -

    +: _StpuiGammaCurve
  • transpose +: stpui_image

    - u -

    +: stpui_plist_t

    - v -

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: stpui_plist_t
  • vbox +: _StpuiGammaCurve
  • vflip +: stpui_image +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html index 0682e40..cfe2602 100644 --- a/doc/gutenprintui2/html/functions_vars.html +++ b/doc/gutenprintui2/html/functions_vars.html @@ -2,144 +2,104 @@ 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

    -  +

    - _ -

    +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved2 +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved3 +: _StpuiGammaCurveClass, _StpuiCurveClass
  • _gtk_reserved4 +: _StpuiGammaCurveClass, _StpuiCurveClass

    - a -

    +: stpui_plist_t

    - b -

    +: _StpuiGammaCurve

    - c -

    +: stpui_plist_t
  • crop +: stpui_image
  • ctlpoint +: _StpuiCurve
  • current_standard_command +: stpui_plist_t
  • cursor_type +: _StpuiCurve
  • curve +: _StpuiGammaCurve
  • curve_type +: _StpuiCurve
  • curve_type_changed +: _StpuiCurveClass
  • custom_command +: stpui_plist_t

    - e -

    +: stpui_plist_t

    - g -

    +: _StpuiGammaCurve
  • gamma_dialog +: _StpuiGammaCurve
  • gamma_text +: _StpuiGammaCurve
  • grab_point +: _StpuiCurve
  • graph +: _StpuiCurve

    - h -

    +: _StpuiCurve
  • hflip +: stpui_image

    - i -

    +: stpui_image
  • invalid_mask +: stpui_plist_t

    - l -

    +: _StpuiCurve

    - m -

    +: _StpuiCurve
  • max_y +: _StpuiCurve
  • min_x +: _StpuiCurve
  • min_y +: _StpuiCurve

    - n -

    +: stpui_plist_t
  • num_ctlpoints +: _StpuiCurve
  • num_points +: _StpuiCurve

    - o -

    +: stpui_plist_t
  • output_filename +: stpui_plist_t

    - p -

    +: _StpuiGammaCurveClass, _StpuiCurveClass
  • pixmap +: _StpuiCurve
  • point +: _StpuiCurve

    - q -

    +: stpui_plist_t

    - r -

    +: stpui_image
  • rotate_ccw +: stpui_image
  • rotate_cw +: stpui_image

    - s -

    +: stpui_plist_t

    - t -

    +: _StpuiGammaCurve
  • transpose +: stpui_image

    - u -

    +: stpui_plist_t

    - v -

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: stpui_plist_t
  • vbox +: _StpuiGammaCurve
  • vflip +: stpui_image +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html index ceb94e0..d4e89e0 100644 --- a/doc/gutenprintui2/html/gammacurve_8h.html +++ b/doc/gutenprintui2/html/gammacurve_8h.html @@ -2,23 +2,11 @@ libgutenprintui2 API Reference: include/gutenprintui2/gammacurve.h File Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -include » gutenprintui2
    +include » gutenprintui2

    gammacurve.h File Reference

    #include <gdk/gdk.h>
    #include <gtk/gtkvbox.h>
    @@ -29,31 +17,31 @@ - + - + - + - + - + - + - + - + - + - +
    struct  _StpuiGammaCurveClass

    Defines

    #define STPUI_TYPE_GAMMA_CURVE   (stpui_gamma_curve_get_type ())
    #define STPUI_TYPE_GAMMA_CURVE   (stpui_gamma_curve_get_type ())
    #define STPUI_GAMMA_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurve))
    #define STPUI_GAMMA_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurve))
    #define STPUI_GAMMA_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurveClass))
    #define STPUI_GAMMA_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurveClass))
    #define STPUI_IS_GAMMA_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))
    #define STPUI_IS_GAMMA_CURVE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))
    #define STPUI_IS_GAMMA_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))
    #define STPUI_IS_GAMMA_CURVE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))
    #define STPUI_GAMMA_CURVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurveClass))
    #define STPUI_GAMMA_CURVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, StpuiGammaCurveClass))

    Typedefs

    typedef _StpuiGammaCurve StpuiGammaCurve
    typedef _StpuiGammaCurve StpuiGammaCurve
    typedef _StpuiGammaCurveClass StpuiGammaCurveClass
    typedef _StpuiGammaCurveClass StpuiGammaCurveClass

    Functions

    GType stpui_gamma_curve_get_type (void) G_GNUC_CONST
    GType stpui_gamma_curve_get_type (void) G_GNUC_CONST
    GtkWidget * stpui_gamma_curve_new (void)
    GtkWidget * stpui_gamma_curve_new (void)

    Define Documentation

    -

    +

    @@ -81,7 +69,7 @@
    -

    +

    @@ -109,7 +97,7 @@
    -

    +

    @@ -137,7 +125,7 @@
    -

    +

    @@ -165,7 +153,7 @@
    -

    +

    @@ -193,7 +181,7 @@
    -

    +

    @@ -217,7 +205,7 @@

    Typedef Documentation

    -

    +

    @@ -240,7 +228,7 @@
    -

    +

    @@ -264,7 +252,7 @@

    Function Documentation

    -

    +

    @@ -292,7 +280,7 @@
    -

    +

    @@ -320,8 +308,8 @@
    -

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html index f488173..bc6c2d0 100644 --- a/doc/gutenprintui2/html/globals.html +++ b/doc/gutenprintui2/html/globals.html @@ -2,153 +2,125 @@ 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

    Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:

    - c -

    +: gutenprintui.h
  • command_t_command_t_get_type() +: typebuiltins.h
  • COMMAND_TYPE_CUSTOM +: gutenprintui.h
  • COMMAND_TYPE_DEFAULT +: gutenprintui.h
  • COMMAND_TYPE_FILE +: gutenprintui.h

    - g -

    +: gutenprintui.h

    - o -

    +: gutenprintui.h
  • ORIENT_LANDSCAPE +: gutenprintui.h
  • ORIENT_PORTRAIT +: gutenprintui.h
  • ORIENT_SEASCAPE +: gutenprintui.h
  • orient_t +: gutenprintui.h
  • orient_t_orient_t_get_type() +: typebuiltins.h
  • ORIENT_UPSIDEDOWN +: gutenprintui.h

    - s -

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: gutenprintui.h
  • stpui_compute_orientation() +: gutenprintui.h
  • STPUI_CURVE +: curve.h
  • STPUI_CURVE_CLASS +: curve.h
  • STPUI_CURVE_GET_CLASS +: curve.h
  • stpui_curve_get_type() +: curve.h
  • stpui_curve_get_vector() +: curve.h
  • stpui_curve_new() +: curve.h
  • stpui_curve_reset() +: curve.h
  • stpui_curve_set_curve_type() +: curve.h
  • stpui_curve_set_gamma() +: curve.h
  • stpui_curve_set_range() +: curve.h
  • stpui_curve_set_vector() +: curve.h
  • STPUI_CURVE_TYPE_FREE +: curve.h
  • stpui_curve_type_get_type() +: typebuiltins.h
  • STPUI_CURVE_TYPE_LINEAR +: curve.h
  • STPUI_CURVE_TYPE_SPLINE +: curve.h
  • stpui_do_print_dialog() +: gutenprintui.h
  • STPUI_GAMMA_CURVE +: gammacurve.h
  • STPUI_GAMMA_CURVE_CLASS +: gammacurve.h
  • STPUI_GAMMA_CURVE_GET_CLASS +: gammacurve.h
  • stpui_gamma_curve_get_type() +: gammacurve.h
  • stpui_gamma_curve_new() +: gammacurve.h
  • stpui_get_current_printer() +: gutenprintui.h
  • stpui_get_errdata() +: gutenprintui.h
  • stpui_get_errfunc() +: gutenprintui.h
  • stpui_get_global_parameter() +: gutenprintui.h
  • stpui_get_image_filename() +: gutenprintui.h
  • stpui_get_printrc_file() +: gutenprintui.h
  • stpui_get_system_printers() +: gutenprintui.h
  • stpui_get_thumbnail_data() +: gutenprintui.h
  • stpui_get_thumbnail_func() +: gutenprintui.h
  • stpui_image_t +: gutenprintui.h
  • STPUI_IS_CURVE +: curve.h
  • STPUI_IS_CURVE_CLASS +: curve.h
  • STPUI_IS_GAMMA_CURVE +: gammacurve.h
  • STPUI_IS_GAMMA_CURVE_CLASS +: gammacurve.h
  • stpui_plist_add() +: gutenprintui.h
  • stpui_plist_copy() +: gutenprintui.h
  • stpui_plist_get_command_type() +: gutenprintui.h
  • stpui_plist_get_copy_count() +: gutenprintui.h
  • stpui_plist_get_current_standard_command() +: gutenprintui.h
  • stpui_plist_get_custom_command() +: gutenprintui.h
  • stpui_plist_get_extra_printer_options() +: gutenprintui.h
  • stpui_plist_get_name() +: gutenprintui.h
  • stpui_plist_get_output_filename() +: gutenprintui.h
  • stpui_plist_get_queue_name() +: gutenprintui.h
  • stpui_plist_set_command_type() +: gutenprintui.h
  • stpui_plist_set_copy_count() +: gutenprintui.h
  • stpui_plist_set_current_standard_command() +: gutenprintui.h
  • stpui_plist_set_current_standard_command_n() +: gutenprintui.h
  • stpui_plist_set_custom_command() +: gutenprintui.h
  • stpui_plist_set_custom_command_n() +: gutenprintui.h
  • stpui_plist_set_extra_printer_options() +: gutenprintui.h
  • stpui_plist_set_extra_printer_options_n() +: gutenprintui.h
  • stpui_plist_set_name() +: gutenprintui.h
  • stpui_plist_set_name_n() +: gutenprintui.h
  • stpui_plist_set_output_filename() +: gutenprintui.h
  • stpui_plist_set_output_filename_n() +: gutenprintui.h
  • stpui_plist_set_queue_name() +: gutenprintui.h
  • stpui_plist_set_queue_name_n() +: gutenprintui.h
  • stpui_print() +: gutenprintui.h
  • stpui_printer_initialize() +: gutenprintui.h
  • stpui_printrc_load() +: gutenprintui.h
  • stpui_printrc_save() +: gutenprintui.h
  • stpui_set_errdata() +: gutenprintui.h
  • stpui_set_errfunc() +: gutenprintui.h
  • stpui_set_global_parameter() +: gutenprintui.h
  • stpui_set_image_channel_depth() +: gutenprintui.h
  • stpui_set_image_dimensions() +: gutenprintui.h
  • stpui_set_image_filename() +: gutenprintui.h
  • stpui_set_image_raw_channels() +: gutenprintui.h
  • stpui_set_image_resolution() +: gutenprintui.h
  • stpui_set_image_type() +: gutenprintui.h
  • stpui_set_printrc_file() +: gutenprintui.h
  • stpui_set_thumbnail_data() +: gutenprintui.h
  • stpui_set_thumbnail_func() +: gutenprintui.h
  • STPUI_TYPE_COMMAND_T +: typebuiltins.h
  • STPUI_TYPE_CURVE +: curve.h
  • STPUI_TYPE_CURVE_TYPE +: typebuiltins.h
  • STPUI_TYPE_GAMMA_CURVE +: gammacurve.h
  • STPUI_TYPE_ORIENT_T +: typebuiltins.h
  • StpuiCurve +: curve.h
  • StpuiCurveClass +: curve.h
  • StpuiCurveType +: curve.h
  • StpuiGammaCurve +: gammacurve.h
  • StpuiGammaCurveClass +: gammacurve.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html index 8c0a90a..8564647 100644 --- a/doc/gutenprintui2/html/globals_defs.html +++ b/doc/gutenprintui2/html/globals_defs.html @@ -2,52 +2,31 @@ libgutenprintui2 API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -  + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    +

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: curve.h
  • STPUI_CURVE_CLASS +: curve.h
  • STPUI_CURVE_GET_CLASS +: curve.h
  • STPUI_GAMMA_CURVE +: gammacurve.h
  • STPUI_GAMMA_CURVE_CLASS +: gammacurve.h
  • STPUI_GAMMA_CURVE_GET_CLASS +: gammacurve.h
  • STPUI_IS_CURVE +: curve.h
  • STPUI_IS_CURVE_CLASS +: curve.h
  • STPUI_IS_GAMMA_CURVE +: gammacurve.h
  • STPUI_IS_GAMMA_CURVE_CLASS +: gammacurve.h
  • STPUI_TYPE_COMMAND_T +: typebuiltins.h
  • STPUI_TYPE_CURVE +: curve.h
  • STPUI_TYPE_CURVE_TYPE +: typebuiltins.h
  • STPUI_TYPE_GAMMA_CURVE +: gammacurve.h
  • STPUI_TYPE_ORIENT_T +: typebuiltins.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html index 0b2948e..36b9578 100644 --- a/doc/gutenprintui2/html/globals_enum.html +++ b/doc/gutenprintui2/html/globals_enum.html @@ -2,40 +2,19 @@ libgutenprintui2 API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -  + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    +

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: gutenprintui.h
  • orient_t +: gutenprintui.h
  • StpuiCurveType +: curve.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html index 789cb12..9538097 100644 --- a/doc/gutenprintui2/html/globals_eval.html +++ b/doc/gutenprintui2/html/globals_eval.html @@ -2,48 +2,27 @@ libgutenprintui2 API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -  + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    +

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: gutenprintui.h
  • COMMAND_TYPE_DEFAULT +: gutenprintui.h
  • COMMAND_TYPE_FILE +: gutenprintui.h
  • ORIENT_AUTO +: gutenprintui.h
  • ORIENT_LANDSCAPE +: gutenprintui.h
  • ORIENT_PORTRAIT +: gutenprintui.h
  • ORIENT_SEASCAPE +: gutenprintui.h
  • ORIENT_UPSIDEDOWN +: gutenprintui.h
  • STPUI_CURVE_TYPE_FREE +: curve.h
  • STPUI_CURVE_TYPE_LINEAR +: curve.h
  • STPUI_CURVE_TYPE_SPLINE +: curve.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html index 79bbc94..47630b0 100644 --- a/doc/gutenprintui2/html/globals_func.html +++ b/doc/gutenprintui2/html/globals_func.html @@ -2,115 +2,88 @@ libgutenprintui2 API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -
    -
      -
    • c
      • -
    • o
      • -
    • s
      • -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    +
    c | o | s

    -  +

    - c -

    +: typebuiltins.h

    - o -

    +: typebuiltins.h

    - s -

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: gutenprintui.h
  • stpui_compute_orientation() +: gutenprintui.h
  • stpui_curve_get_type() +: curve.h
  • stpui_curve_get_vector() +: curve.h
  • stpui_curve_new() +: curve.h
  • stpui_curve_reset() +: curve.h
  • stpui_curve_set_curve_type() +: curve.h
  • stpui_curve_set_gamma() +: curve.h
  • stpui_curve_set_range() +: curve.h
  • stpui_curve_set_vector() +: curve.h
  • stpui_curve_type_get_type() +: typebuiltins.h
  • stpui_do_print_dialog() +: gutenprintui.h
  • stpui_gamma_curve_get_type() +: gammacurve.h
  • stpui_gamma_curve_new() +: gammacurve.h
  • stpui_get_current_printer() +: gutenprintui.h
  • stpui_get_errdata() +: gutenprintui.h
  • stpui_get_errfunc() +: gutenprintui.h
  • stpui_get_global_parameter() +: gutenprintui.h
  • stpui_get_image_filename() +: gutenprintui.h
  • stpui_get_printrc_file() +: gutenprintui.h
  • stpui_get_system_printers() +: gutenprintui.h
  • stpui_get_thumbnail_data() +: gutenprintui.h
  • stpui_get_thumbnail_func() +: gutenprintui.h
  • stpui_plist_add() +: gutenprintui.h
  • stpui_plist_copy() +: gutenprintui.h
  • stpui_plist_get_command_type() +: gutenprintui.h
  • stpui_plist_get_copy_count() +: gutenprintui.h
  • stpui_plist_get_current_standard_command() +: gutenprintui.h
  • stpui_plist_get_custom_command() +: gutenprintui.h
  • stpui_plist_get_extra_printer_options() +: gutenprintui.h
  • stpui_plist_get_name() +: gutenprintui.h
  • stpui_plist_get_output_filename() +: gutenprintui.h
  • stpui_plist_get_queue_name() +: gutenprintui.h
  • stpui_plist_set_command_type() +: gutenprintui.h
  • stpui_plist_set_copy_count() +: gutenprintui.h
  • stpui_plist_set_current_standard_command() +: gutenprintui.h
  • stpui_plist_set_current_standard_command_n() +: gutenprintui.h
  • stpui_plist_set_custom_command() +: gutenprintui.h
  • stpui_plist_set_custom_command_n() +: gutenprintui.h
  • stpui_plist_set_extra_printer_options() +: gutenprintui.h
  • stpui_plist_set_extra_printer_options_n() +: gutenprintui.h
  • stpui_plist_set_name() +: gutenprintui.h
  • stpui_plist_set_name_n() +: gutenprintui.h
  • stpui_plist_set_output_filename() +: gutenprintui.h
  • stpui_plist_set_output_filename_n() +: gutenprintui.h
  • stpui_plist_set_queue_name() +: gutenprintui.h
  • stpui_plist_set_queue_name_n() +: gutenprintui.h
  • stpui_print() +: gutenprintui.h
  • stpui_printer_initialize() +: gutenprintui.h
  • stpui_printrc_load() +: gutenprintui.h
  • stpui_printrc_save() +: gutenprintui.h
  • stpui_set_errdata() +: gutenprintui.h
  • stpui_set_errfunc() +: gutenprintui.h
  • stpui_set_global_parameter() +: gutenprintui.h
  • stpui_set_image_channel_depth() +: gutenprintui.h
  • stpui_set_image_dimensions() +: gutenprintui.h
  • stpui_set_image_filename() +: gutenprintui.h
  • stpui_set_image_raw_channels() +: gutenprintui.h
  • stpui_set_image_resolution() +: gutenprintui.h
  • stpui_set_image_type() +: gutenprintui.h
  • stpui_set_printrc_file() +: gutenprintui.h
  • stpui_set_thumbnail_data() +: gutenprintui.h
  • stpui_set_thumbnail_func() +: gutenprintui.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html index 57e05c8..70ab98e 100644 --- a/doc/gutenprintui2/html/globals_type.html +++ b/doc/gutenprintui2/html/globals_type.html @@ -2,43 +2,22 @@ libgutenprintui2 API Reference: Data Fields - - -
    -
    -
    -
    -
    - -
    -  + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    +
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    +

    -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +: gutenprintui.h
  • stpui_image_t +: gutenprintui.h
  • StpuiCurve +: curve.h
  • StpuiCurveClass +: curve.h
  • StpuiGammaCurve +: gammacurve.h
  • StpuiGammaCurveClass +: gammacurve.h +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4     diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html index 697624b..0bc9549 100644 --- a/doc/gutenprintui2/html/gutenprintui_8h.html +++ b/doc/gutenprintui2/html/gutenprintui_8h.html @@ -2,23 +2,11 @@ libgutenprintui2 API Reference: include/gutenprintui2/gutenprintui.h File Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -include » gutenprintui2
    +include » gutenprintui2

    gutenprintui.h File Reference

    #include <gtk/gtk.h>
    #include <gutenprint/gutenprint.h>
    #include <gutenprintui2/curve.h>
    @@ -32,140 +20,140 @@
    • struct  stpui_image

    Typedefs

    typedef stpui_image stpui_image_t
    typedef stpui_image stpui_image_t
    typedef guchar *(* get_thumbnail_func_t )(void *data, gint *width, gint *height, gint *bpp, gint page)
    typedef guchar *(* get_thumbnail_func_t )(void *data, gint *width, gint *height, gint *bpp, gint page)

    Enumerations

    enum  orient_t {
    -  ORIENT_AUTO = -1, -ORIENT_PORTRAIT = 0, -ORIENT_LANDSCAPE = 1, -ORIENT_UPSIDEDOWN = 2, +
    enum  orient_t {
    +  ORIENT_AUTO = -1, +ORIENT_PORTRAIT = 0, +ORIENT_LANDSCAPE = 1, +ORIENT_UPSIDEDOWN = 2,
    -  ORIENT_SEASCAPE = 3 +  ORIENT_SEASCAPE = 3
    }
    enum  command_t { COMMAND_TYPE_DEFAULT, -COMMAND_TYPE_CUSTOM, -COMMAND_TYPE_FILE +
    enum  command_t { COMMAND_TYPE_DEFAULT, +COMMAND_TYPE_CUSTOM, +COMMAND_TYPE_FILE }

    Functions

    void stpui_plist_set_name (stpui_plist_t *p, const char *val)
    void stpui_plist_set_name (stpui_plist_t *p, const char *val)
    void stpui_plist_set_name_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_name_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_name (const stpui_plist_t *p)
    const char * stpui_plist_get_name (const stpui_plist_t *p)
    void stpui_plist_set_queue_name (stpui_plist_t *p, const char *val)
    void stpui_plist_set_queue_name (stpui_plist_t *p, const char *val)
    void stpui_plist_set_queue_name_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_queue_name_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_queue_name (const stpui_plist_t *p)
    const char * stpui_plist_get_queue_name (const stpui_plist_t *p)
    void stpui_plist_set_output_filename (stpui_plist_t *p, const char *val)
    void stpui_plist_set_output_filename (stpui_plist_t *p, const char *val)
    void stpui_plist_set_output_filename_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_output_filename_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_output_filename (const stpui_plist_t *p)
    const char * stpui_plist_get_output_filename (const stpui_plist_t *p)
    void stpui_plist_set_extra_printer_options (stpui_plist_t *p, const char *val)
    void stpui_plist_set_extra_printer_options (stpui_plist_t *p, const char *val)
    void stpui_plist_set_extra_printer_options_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_extra_printer_options_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_extra_printer_options (const stpui_plist_t *p)
    const char * stpui_plist_get_extra_printer_options (const stpui_plist_t *p)
    void stpui_plist_set_custom_command (stpui_plist_t *p, const char *val)
    void stpui_plist_set_custom_command (stpui_plist_t *p, const char *val)
    void stpui_plist_set_custom_command_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_custom_command_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_custom_command (const stpui_plist_t *p)
    const char * stpui_plist_get_custom_command (const stpui_plist_t *p)
    void stpui_plist_set_copy_count (stpui_plist_t *p, gint count)
    void stpui_plist_set_copy_count (stpui_plist_t *p, gint count)
    int stpui_plist_get_copy_count (const stpui_plist_t *p)
    int stpui_plist_get_copy_count (const stpui_plist_t *p)
    void stpui_plist_set_current_standard_command (stpui_plist_t *p, const char *val)
    void stpui_plist_set_current_standard_command (stpui_plist_t *p, const char *val)
    void stpui_plist_set_current_standard_command_n (stpui_plist_t *p, const char *val, int n)
    void stpui_plist_set_current_standard_command_n (stpui_plist_t *p, const char *val, int n)
    const char * stpui_plist_get_current_standard_command (const stpui_plist_t *p)
    const char * stpui_plist_get_current_standard_command (const stpui_plist_t *p)
    void stpui_plist_set_command_type (stpui_plist_t *p, command_t val)
    void stpui_plist_set_command_type (stpui_plist_t *p, command_t val)
    command_t stpui_plist_get_command_type (const stpui_plist_t *p)
    command_t stpui_plist_get_command_type (const stpui_plist_t *p)
    void stpui_set_global_parameter (const char *param, const char *value)
    void stpui_set_global_parameter (const char *param, const char *value)
    const char * stpui_get_global_parameter (const char *param)
    const char * stpui_get_global_parameter (const char *param)
    void stpui_plist_copy (stpui_plist_t *vd, const stpui_plist_t *vs)
    void stpui_plist_copy (stpui_plist_t *vd, const stpui_plist_t *vs)
    int stpui_plist_add (const stpui_plist_t *key, int add_only)
    int stpui_plist_add (const stpui_plist_t *key, int add_only)
    void stpui_printer_initialize (stpui_plist_t *printer)
    void stpui_printer_initialize (stpui_plist_t *printer)
    const stpui_plist_t * stpui_get_current_printer (void)
    const stpui_plist_t * stpui_get_current_printer (void)
    char * stpui_build_standard_print_command (const stpui_plist_t *plist, const stp_printer_t *printer)
    char * stpui_build_standard_print_command (const stpui_plist_t *plist, const stp_printer_t *printer)
    void stpui_set_printrc_file (const char *name)
    void stpui_set_printrc_file (const char *name)
    const char * stpui_get_printrc_file (void)
    const char * stpui_get_printrc_file (void)
    void stpui_printrc_load (void)
    void stpui_printrc_load (void)
    void stpui_get_system_printers (void)
    void stpui_get_system_printers (void)
    void stpui_printrc_save (void)
    void stpui_printrc_save (void)
    void stpui_set_image_filename (const char *)
    void stpui_set_image_filename (const char *)
    const char * stpui_get_image_filename (void)
    const char * stpui_get_image_filename (void)
    void stpui_set_errfunc (stp_outfunc_t wfunc)
    void stpui_set_errfunc (stp_outfunc_t wfunc)
    stp_outfunc_t stpui_get_errfunc (void)
    stp_outfunc_t stpui_get_errfunc (void)
    void stpui_set_errdata (void *errdata)
    void stpui_set_errdata (void *errdata)
    void * stpui_get_errdata (void)
    void * stpui_get_errdata (void)
    gint stpui_do_print_dialog (void)
    gint stpui_do_print_dialog (void)
    gint stpui_compute_orientation (void)
    gint stpui_compute_orientation (void)
    void stpui_set_image_dimensions (gint width, gint height)
    void stpui_set_image_dimensions (gint width, gint height)
    void stpui_set_image_resolution (gdouble xres, gdouble yres)
    void stpui_set_image_resolution (gdouble xres, gdouble yres)
    void stpui_set_image_type (const char *image_type)
    void stpui_set_image_type (const char *image_type)
    void stpui_set_image_raw_channels (gint channels)
    void stpui_set_image_raw_channels (gint channels)
    void stpui_set_image_channel_depth (gint bit_depth)
    void stpui_set_image_channel_depth (gint bit_depth)
    void stpui_set_thumbnail_func (get_thumbnail_func_t)
    void stpui_set_thumbnail_func (get_thumbnail_func_t)
    get_thumbnail_func_t stpui_get_thumbnail_func (void)
    get_thumbnail_func_t stpui_get_thumbnail_func (void)
    void stpui_set_thumbnail_data (void *)
    void stpui_set_thumbnail_data (void *)
    void * stpui_get_thumbnail_data (void)
    void * stpui_get_thumbnail_data (void)
    int stpui_print (const stpui_plist_t *printer, stpui_image_t *im)
    int stpui_print (const stpui_plist_t *printer, stpui_image_t *im)

    Typedef Documentation

    -

    +

    @@ -182,7 +170,7 @@
    - +
    typedef guchar*(* get_thumbnail_func_t)(void *data, gint *width, gint *height, gint *bpp, gint page) typedef guchar*(* get_thumbnail_func_t)(void *data, gint *width, gint *height, gint *bpp, gint page)
    -

    +

    @@ -206,13 +194,13 @@

    Enumeration Type Documentation

    -

    +

    @@ -228,24 +216,24 @@

    Enumerator:
    - +
    enum command_t enum command_t
    - - -
    COMMAND_TYPE_DEFAULT  +
    COMMAND_TYPE_DEFAULT 
    COMMAND_TYPE_CUSTOM  +
    COMMAND_TYPE_CUSTOM 
    COMMAND_TYPE_FILE  +
    COMMAND_TYPE_FILE 
    -

    +

    @@ -261,15 +249,15 @@

    Enumerator:
    - +
    enum orient_t enum orient_t
    - - - - -
    ORIENT_AUTO  +
    ORIENT_AUTO 
    ORIENT_PORTRAIT  +
    ORIENT_PORTRAIT 
    ORIENT_LANDSCAPE  +
    ORIENT_LANDSCAPE 
    ORIENT_UPSIDEDOWN  +
    ORIENT_UPSIDEDOWN 
    ORIENT_SEASCAPE  +
    ORIENT_SEASCAPE 
    @@ -277,7 +265,7 @@

    Function Documentation

    -

    +

    @@ -314,7 +302,7 @@
    -

    +

    @@ -342,7 +330,7 @@
    -

    +

    @@ -370,7 +358,7 @@
    -

    +

    @@ -398,7 +386,7 @@
    -

    +

    @@ -426,7 +414,7 @@
    -

    +

    @@ -454,7 +442,7 @@
    -

    +

    @@ -482,7 +470,7 @@
    -

    +

    @@ -510,7 +498,7 @@
    -

    +

    @@ -538,7 +526,7 @@
    -

    +

    @@ -566,7 +554,7 @@
    -

    +

    @@ -594,13 +582,13 @@
    -

    +

    - + @@ -622,7 +610,7 @@
    get_thumbnail_func_t stpui_get_thumbnail_func get_thumbnail_func_t stpui_get_thumbnail_func (  void 
    -

    +

    @@ -659,7 +647,7 @@
    -

    +

    @@ -696,13 +684,13 @@
    -

    +

    - + @@ -724,7 +712,7 @@
    command_t stpui_plist_get_command_type command_t stpui_plist_get_command_type (  const stpui_plist_t *  p
    -

    +

    @@ -752,7 +740,7 @@
    -

    +

    @@ -780,7 +768,7 @@
    -

    +

    @@ -808,7 +796,7 @@
    -

    +

    @@ -836,7 +824,7 @@
    -

    +

    @@ -864,7 +852,7 @@
    -

    +

    @@ -892,7 +880,7 @@
    -

    +

    @@ -920,7 +908,7 @@
    -

    +

    - + @@ -957,7 +945,7 @@
    @@ -934,7 +922,7 @@
    command_t command_t  val
    -

    +

    @@ -994,7 +982,7 @@
    -

    +

    @@ -1031,7 +1019,7 @@
    -

    +

    @@ -1074,7 +1062,7 @@
    -

    +

    @@ -1111,7 +1099,7 @@
    -

    +

    @@ -1154,7 +1142,7 @@
    -

    +

    @@ -1191,7 +1179,7 @@
    -

    +

    @@ -1234,7 +1222,7 @@
    -

    +

    @@ -1271,7 +1259,7 @@
    -

    +

    @@ -1314,7 +1302,7 @@
    -

    +

    @@ -1351,7 +1339,7 @@
    -

    +

    @@ -1394,7 +1382,7 @@
    -

    +

    @@ -1431,7 +1419,7 @@
    -

    +

    @@ -1474,7 +1462,7 @@
    -

    +

    @@ -1511,7 +1499,7 @@
    -

    +

    @@ -1539,7 +1527,7 @@
    -

    +

    @@ -1567,7 +1555,7 @@
    -

    +

    @@ -1595,7 +1583,7 @@
    -

    +

    @@ -1623,7 +1611,7 @@
    -

    +

    @@ -1651,7 +1639,7 @@
    -

    +

    @@ -1688,7 +1676,7 @@
    -

    +

    @@ -1716,7 +1704,7 @@
    -

    +

    @@ -1753,7 +1741,7 @@
    -

    +

    @@ -1781,7 +1769,7 @@
    -

    +

    @@ -1809,7 +1797,7 @@
    -

    +

    @@ -1846,7 +1834,7 @@
    -

    +

    @@ -1874,7 +1862,7 @@
    -

    +

    @@ -1902,7 +1890,7 @@
    -

    +

    @@ -1930,7 +1918,7 @@
    -

    +

    - + @@ -1958,8 +1946,8 @@
    @@ -1938,7 +1926,7 @@
    void stpui_set_thumbnail_func ( get_thumbnail_func_t get_thumbnail_func_t   ) 
    -

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html index 50eaff3..fbf5b32 100644 --- a/doc/gutenprintui2/html/index.html +++ b/doc/gutenprintui2/html/index.html @@ -2,20 +2,13 @@ libgutenprintui2 API Reference: Main Page - - -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference Documentation

    -

    5.0.0-rc2

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +

    5.0.0-rc2

    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html index f5ec280..9b3c867 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiCurve.html @@ -2,66 +2,53 @@ libgutenprintui2 API Reference: _StpuiCurve Struct Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    _StpuiCurve Struct Reference

    #include <curve.h>

    - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

    Data Fields

    GtkDrawingArea graph
    GtkDrawingArea graph
    gint cursor_type
    gint cursor_type
    gfloat min_x
    gfloat min_x
    gfloat max_x
    gfloat max_x
    gfloat min_y
    gfloat min_y
    gfloat max_y
    gfloat max_y
    GdkPixmap * pixmap
    GdkPixmap * pixmap
    StpuiCurveType curve_type
    StpuiCurveType curve_type
    gint height
    gint height
    gint grab_point
    gint grab_point
    gint last
    gint last
    gint num_points
    gint num_points
    GdkPoint * point
    GdkPoint * point
    gint num_ctlpoints
    gint num_ctlpoints
    gfloat(* ctlpoint )[2]
    gfloat(* ctlpoint )[2]

    Field Documentation

    -

    +

    @@ -78,13 +65,13 @@
    - +
    gfloat(* _StpuiCurve::ctlpoint)[2] gfloat(* _StpuiCurve::ctlpoint)[2]
    -

    +

    @@ -101,13 +88,13 @@
    - +
    gint _StpuiCurve::cursor_type gint _StpuiCurve::cursor_type
    -

    +

    @@ -124,13 +111,13 @@
    - +
    StpuiCurveType _StpuiCurve::curve_type StpuiCurveType _StpuiCurve::curve_type
    -

    +

    @@ -147,13 +134,13 @@
    - +
    gint _StpuiCurve::grab_point gint _StpuiCurve::grab_point
    -

    +

    @@ -170,13 +157,13 @@
    - +
    GtkDrawingArea _StpuiCurve::graph GtkDrawingArea _StpuiCurve::graph
    -

    +

    @@ -193,13 +180,13 @@
    - +
    gint _StpuiCurve::height gint _StpuiCurve::height
    -

    +

    @@ -216,13 +203,13 @@
    - +
    gint _StpuiCurve::last gint _StpuiCurve::last
    -

    +

    @@ -239,13 +226,13 @@
    - +
    gfloat _StpuiCurve::max_x gfloat _StpuiCurve::max_x
    -

    +

    @@ -262,13 +249,13 @@
    - +
    gfloat _StpuiCurve::max_y gfloat _StpuiCurve::max_y
    -

    +

    @@ -285,13 +272,13 @@
    - +
    gfloat _StpuiCurve::min_x gfloat _StpuiCurve::min_x
    -

    +

    @@ -308,13 +295,13 @@
    - +
    gfloat _StpuiCurve::min_y gfloat _StpuiCurve::min_y
    -

    +

    @@ -331,13 +318,13 @@
    - +
    gint _StpuiCurve::num_ctlpoints gint _StpuiCurve::num_ctlpoints
    -

    +

    @@ -354,13 +341,13 @@
    - +
    gint _StpuiCurve::num_points gint _StpuiCurve::num_points
    -

    +

    @@ -377,13 +364,13 @@
    - +
    GdkPixmap* _StpuiCurve::pixmap GdkPixmap* _StpuiCurve::pixmap
    -

    +

    @@ -402,8 +389,8 @@
    - +
    GdkPoint* _StpuiCurve::point GdkPoint* _StpuiCurve::point

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html index 7f80bdc..6918bf9 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html @@ -2,48 +2,35 @@ libgutenprintui2 API Reference: _StpuiCurveClass Struct Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    _StpuiCurveClass Struct Reference

    #include <curve.h>

    - + - + - + - + - + - +

    Data Fields

    GtkDrawingAreaClass parent_class
    GtkDrawingAreaClass parent_class
    void(* curve_type_changed )(StpuiCurve *curve)
    void(* curve_type_changed )(StpuiCurve *curve)
    void(* _gtk_reserved1 )(void)
    void(* _gtk_reserved1 )(void)
    void(* _gtk_reserved2 )(void)
    void(* _gtk_reserved2 )(void)
    void(* _gtk_reserved3 )(void)
    void(* _gtk_reserved3 )(void)
    void(* _gtk_reserved4 )(void)
    void(* _gtk_reserved4 )(void)

    Field Documentation

    -

    +

    @@ -60,13 +47,13 @@
    - +
    void(* _StpuiCurveClass::_gtk_reserved1)(void) void(* _StpuiCurveClass::_gtk_reserved1)(void)
    -

    +

    @@ -83,13 +70,13 @@
    - +
    void(* _StpuiCurveClass::_gtk_reserved2)(void) void(* _StpuiCurveClass::_gtk_reserved2)(void)
    -

    +

    @@ -106,13 +93,13 @@
    - +
    void(* _StpuiCurveClass::_gtk_reserved3)(void) void(* _StpuiCurveClass::_gtk_reserved3)(void)
    -

    +

    @@ -129,13 +116,13 @@
    - +
    void(* _StpuiCurveClass::_gtk_reserved4)(void) void(* _StpuiCurveClass::_gtk_reserved4)(void)
    -

    +

    @@ -152,13 +139,13 @@
    - +
    void(* _StpuiCurveClass::curve_type_changed)(StpuiCurve *curve) void(* _StpuiCurveClass::curve_type_changed)(StpuiCurve *curve)
    -

    +

    @@ -177,8 +164,8 @@
    - +
    GtkDrawingAreaClass _StpuiCurveClass::parent_class GtkDrawingAreaClass _StpuiCurveClass::parent_class

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html index a0993f3..1dfdb1d 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html @@ -2,50 +2,37 @@ libgutenprintui2 API Reference: _StpuiGammaCurve Struct Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    _StpuiGammaCurve Struct Reference

    #include <gammacurve.h>

    - + - + - + - + - + - + - +

    Data Fields

    GtkVBox vbox
    GtkVBox vbox
    GtkWidget * table
    GtkWidget * table
    GtkWidget * curve
    GtkWidget * curve
    GtkWidget * button [5]
    GtkWidget * button [5]
    gfloat gamma
    gfloat gamma
    GtkWidget * gamma_dialog
    GtkWidget * gamma_dialog
    GtkWidget * gamma_text
    GtkWidget * gamma_text

    Field Documentation

    -

    +

    @@ -62,13 +49,13 @@
    - +
    GtkWidget* _StpuiGammaCurve::button[5] GtkWidget* _StpuiGammaCurve::button[5]
    -

    +

    @@ -85,13 +72,13 @@
    - +
    GtkWidget* _StpuiGammaCurve::curve GtkWidget* _StpuiGammaCurve::curve
    -

    +

    @@ -108,13 +95,13 @@
    - +
    gfloat _StpuiGammaCurve::gamma gfloat _StpuiGammaCurve::gamma
    -

    +

    @@ -131,13 +118,13 @@
    - +
    GtkWidget* _StpuiGammaCurve::gamma_dialog GtkWidget* _StpuiGammaCurve::gamma_dialog
    -

    +

    @@ -154,13 +141,13 @@
    - +
    GtkWidget* _StpuiGammaCurve::gamma_text GtkWidget* _StpuiGammaCurve::gamma_text
    -

    +

    @@ -177,13 +164,13 @@
    - +
    GtkWidget* _StpuiGammaCurve::table GtkWidget* _StpuiGammaCurve::table
    -

    +

    @@ -202,8 +189,8 @@
    - +
    GtkVBox _StpuiGammaCurve::vbox GtkVBox _StpuiGammaCurve::vbox

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html index a0e8165..a4ede5a 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html @@ -2,46 +2,33 @@ libgutenprintui2 API Reference: _StpuiGammaCurveClass Struct Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    _StpuiGammaCurveClass Struct Reference

    #include <gammacurve.h>

    - + - + - + - + - +

    Data Fields

    GtkVBoxClass parent_class
    GtkVBoxClass parent_class
    void(* _gtk_reserved1 )(void)
    void(* _gtk_reserved1 )(void)
    void(* _gtk_reserved2 )(void)
    void(* _gtk_reserved2 )(void)
    void(* _gtk_reserved3 )(void)
    void(* _gtk_reserved3 )(void)
    void(* _gtk_reserved4 )(void)
    void(* _gtk_reserved4 )(void)

    Field Documentation

    -

    +

    @@ -58,13 +45,13 @@
    - +
    void(* _StpuiGammaCurveClass::_gtk_reserved1)(void) void(* _StpuiGammaCurveClass::_gtk_reserved1)(void)
    -

    +

    @@ -81,13 +68,13 @@
    - +
    void(* _StpuiGammaCurveClass::_gtk_reserved2)(void) void(* _StpuiGammaCurveClass::_gtk_reserved2)(void)
    -

    +

    @@ -104,13 +91,13 @@
    - +
    void(* _StpuiGammaCurveClass::_gtk_reserved3)(void) void(* _StpuiGammaCurveClass::_gtk_reserved3)(void)
    -

    +

    @@ -127,13 +114,13 @@
    - +
    void(* _StpuiGammaCurveClass::_gtk_reserved4)(void) void(* _StpuiGammaCurveClass::_gtk_reserved4)(void)
    -

    +

    @@ -152,8 +139,8 @@
    - +
    GtkVBoxClass _StpuiGammaCurveClass::parent_class GtkVBoxClass _StpuiGammaCurveClass::parent_class

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html index 5c7378d..658bf4f 100644 --- a/doc/gutenprintui2/html/structstpui__image.html +++ b/doc/gutenprintui2/html/structstpui__image.html @@ -2,52 +2,39 @@ 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>

    - + - + - + - + - + - + - + - +

    Data Fields

    stp_image_t im
    stp_image_t im
    void(* transpose )(struct stpui_image *image)
    void(* transpose )(struct stpui_image *image)
    void(* hflip )(struct stpui_image *image)
    void(* hflip )(struct stpui_image *image)
    void(* vflip )(struct stpui_image *image)
    void(* vflip )(struct stpui_image *image)
    void(* rotate_ccw )(struct stpui_image *image)
    void(* rotate_ccw )(struct stpui_image *image)
    void(* rotate_cw )(struct stpui_image *image)
    void(* rotate_cw )(struct stpui_image *image)
    void(* rotate_180 )(struct stpui_image *image)
    void(* rotate_180 )(struct stpui_image *image)
    void(* crop )(struct stpui_image *image, int left, int top, int right, int bottom)
    void(* crop )(struct stpui_image *image, int left, int top, int right, int bottom)

    Field Documentation

    -

    +

    @@ -64,13 +51,13 @@
    - +
    void(* stpui_image::crop)(struct stpui_image *image, int left, int top, int right, int bottom) void(* stpui_image::crop)(struct stpui_image *image, int left, int top, int right, int bottom)
    -

    +

    @@ -87,13 +74,13 @@
    - +
    void(* stpui_image::hflip)(struct stpui_image *image) void(* stpui_image::hflip)(struct stpui_image *image)
    -

    +

    @@ -110,13 +97,13 @@
    - +
    stp_image_t stpui_image::im stp_image_t stpui_image::im
    -

    +

    @@ -133,13 +120,13 @@
    - +
    void(* stpui_image::rotate_180)(struct stpui_image *image) void(* stpui_image::rotate_180)(struct stpui_image *image)
    -

    +

    @@ -156,13 +143,13 @@
    - +
    void(* stpui_image::rotate_ccw)(struct stpui_image *image) void(* stpui_image::rotate_ccw)(struct stpui_image *image)
    -

    +

    @@ -179,13 +166,13 @@
    - +
    void(* stpui_image::rotate_cw)(struct stpui_image *image) void(* stpui_image::rotate_cw)(struct stpui_image *image)
    -

    +

    @@ -202,13 +189,13 @@
    - +
    void(* stpui_image::transpose)(struct stpui_image *image) void(* stpui_image::transpose)(struct stpui_image *image)
    -

    +

    @@ -227,8 +214,8 @@
    - +
    void(* stpui_image::vflip)(struct stpui_image *image) void(* stpui_image::vflip)(struct stpui_image *image)

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html index 7884679..c876e4c 100644 --- a/doc/gutenprintui2/html/structstpui__plist__t.html +++ b/doc/gutenprintui2/html/structstpui__plist__t.html @@ -2,62 +2,49 @@ 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>

    - + - + - + - + - + - + - + - + - + - + - + - + - +

    Data Fields

    char * name
    char * name
    command_t command_type
    command_t command_type
    char * queue_name
    char * queue_name
    char * extra_printer_options
    char * extra_printer_options
    char * custom_command
    char * custom_command
    char * current_standard_command
    char * current_standard_command
    char * output_filename
    char * output_filename
    float scaling
    float scaling
    orient_t orientation
    orient_t orientation
    int unit
    int unit
    int auto_size_roll_feed_paper
    int auto_size_roll_feed_paper
    int invalid_mask
    int invalid_mask
    stp_vars_t * v
    stp_vars_t * v

    Field Documentation

    -

    +

    @@ -74,13 +61,13 @@
    - +
    int stpui_plist_t::auto_size_roll_feed_paper int stpui_plist_t::auto_size_roll_feed_paper
    -

    +

    @@ -97,13 +84,13 @@
    - +
    command_t stpui_plist_t::command_type command_t stpui_plist_t::command_type
    -

    +

    @@ -120,13 +107,13 @@
    - +
    char* stpui_plist_t::current_standard_command char* stpui_plist_t::current_standard_command
    -

    +

    @@ -143,13 +130,13 @@
    - +
    char* stpui_plist_t::custom_command char* stpui_plist_t::custom_command
    -

    +

    @@ -166,13 +153,13 @@
    - +
    char* stpui_plist_t::extra_printer_options char* stpui_plist_t::extra_printer_options
    -

    +

    @@ -189,13 +176,13 @@
    - +
    int stpui_plist_t::invalid_mask int stpui_plist_t::invalid_mask
    -

    +

    @@ -212,13 +199,13 @@
    - +
    char* stpui_plist_t::name char* stpui_plist_t::name
    -

    +

    @@ -235,13 +222,13 @@
    - +
    orient_t stpui_plist_t::orientation orient_t stpui_plist_t::orientation
    -

    +

    @@ -258,13 +245,13 @@
    - +
    char* stpui_plist_t::output_filename char* stpui_plist_t::output_filename
    -

    +

    @@ -281,13 +268,13 @@
    - +
    char* stpui_plist_t::queue_name char* stpui_plist_t::queue_name
    -

    +

    @@ -304,13 +291,13 @@
    - +
    float stpui_plist_t::scaling float stpui_plist_t::scaling
    -

    +

    @@ -327,13 +314,13 @@
    - +
    int stpui_plist_t::unit int stpui_plist_t::unit
    -

    +

    @@ -352,8 +339,8 @@
    - +
    stp_vars_t* stpui_plist_t::v stp_vars_t* stpui_plist_t::v

    The documentation for this struct was generated from the following file: -
    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/doc/gutenprintui2/html/tab_b.gif b/doc/gutenprintui2/html/tab_b.gif deleted file mode 100644 index 0d62348..0000000 Binary files a/doc/gutenprintui2/html/tab_b.gif and /dev/null differ diff --git a/doc/gutenprintui2/html/tab_l.gif b/doc/gutenprintui2/html/tab_l.gif deleted file mode 100644 index 9b1e633..0000000 Binary files a/doc/gutenprintui2/html/tab_l.gif and /dev/null differ diff --git a/doc/gutenprintui2/html/tab_r.gif b/doc/gutenprintui2/html/tab_r.gif deleted file mode 100644 index ce9dd9f..0000000 Binary files a/doc/gutenprintui2/html/tab_r.gif and /dev/null differ diff --git a/doc/gutenprintui2/html/tabs.css b/doc/gutenprintui2/html/tabs.css deleted file mode 100644 index a61552a..0000000 --- a/doc/gutenprintui2/html/tabs.css +++ /dev/null @@ -1,102 +0,0 @@ -/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */ - -DIV.tabs -{ - float : left; - width : 100%; - background : url("tab_b.gif") repeat-x bottom; - margin-bottom : 4px; -} - -DIV.tabs UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; -} - -DIV.tabs LI, DIV.tabs FORM -{ - display : inline; - margin : 0px; - padding : 0px; -} - -DIV.tabs FORM -{ - float : right; -} - -DIV.tabs A -{ - float : left; - background : url("tab_r.gif") no-repeat right top; - border-bottom : 1px solid #84B0C7; - font-size : x-small; - font-weight : bold; - text-decoration : none; -} - -DIV.tabs A:hover -{ - background-position: 100% -150px; -} - -DIV.tabs A:link, DIV.tabs A:visited, -DIV.tabs A:active, DIV.tabs A:hover -{ - color: #1A419D; -} - -DIV.tabs SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; -} - -DIV.tabs INPUT -{ - float : right; - display : inline; - font-size : 1em; -} - -DIV.tabs TD -{ - font-size : x-small; - font-weight : bold; - text-decoration : none; -} - - - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -DIV.tabs SPAN {float : none;} -/* End IE5-Mac hack */ - -DIV.tabs A:hover SPAN -{ - background-position: 0% -150px; -} - -DIV.tabs LI#current A -{ - background-position: 100% -150px; - border-width : 0px; -} - -DIV.tabs LI#current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; -} - -DIV.nav -{ - background : none; - border : none; - border-bottom : 1px solid #84B0C7; -} diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html index f4d4a43..8e8f648 100644 --- a/doc/gutenprintui2/html/typebuiltins_8h.html +++ b/doc/gutenprintui2/html/typebuiltins_8h.html @@ -2,43 +2,31 @@ libgutenprintui2 API Reference: include/gutenprintui2/typebuiltins.h File Reference - - -
    -
    -
    -
    + +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -include » gutenprintui2
    +include » gutenprintui2

    typebuiltins.h File Reference

    #include <glib-object.h>
    - + - + - + - + - + - +

    Defines

    #define STPUI_TYPE_ORIENT_T   (orient_t_orient_t_get_type())
    #define STPUI_TYPE_ORIENT_T   (orient_t_orient_t_get_type())
    #define STPUI_TYPE_COMMAND_T   (command_t_command_t_get_type())
    #define STPUI_TYPE_COMMAND_T   (command_t_command_t_get_type())
    #define STPUI_TYPE_CURVE_TYPE   (stpui_curve_type_get_type())
    #define STPUI_TYPE_CURVE_TYPE   (stpui_curve_type_get_type())

    Functions

    G_BEGIN_DECLS GType orient_t_orient_t_get_type (void)
    G_BEGIN_DECLS GType orient_t_orient_t_get_type (void)
    GType command_t_command_t_get_type (void)
    GType command_t_command_t_get_type (void)
    GType stpui_curve_type_get_type (void)
    GType stpui_curve_type_get_type (void)

    Define Documentation

    -

    +

    @@ -61,7 +49,7 @@
    -

    +

    @@ -84,7 +72,7 @@
    -

    +

    @@ -108,7 +96,7 @@

    Function Documentation

    -

    +

    @@ -136,7 +124,7 @@
    -

    +

    @@ -164,7 +152,7 @@
    -

    +

    @@ -192,8 +180,8 @@
    -

    Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by  +
    Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by  -doxygen 1.4.5
    +doxygen 1.4.4
    diff --git a/include/Makefile.in b/include/Makefile.in index 3c2b9a8..d502a69 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -280,10 +280,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in index aa50960..339a3e6 100644 --- a/include/gutenprint/Makefile.in +++ b/include/gutenprint/Makefile.in @@ -288,10 +288,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in index 3f5eb4c..c8d50be 100644 --- a/include/gutenprintui/Makefile.in +++ b/include/gutenprintui/Makefile.in @@ -284,10 +284,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in index d44c577..2598115 100644 --- a/include/gutenprintui2/Makefile.in +++ b/include/gutenprintui2/Makefile.in @@ -285,10 +285,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/m4/stp_release.m4 b/m4/stp_release.m4 index a47f9e1..dfb40c0 100644 --- a/m4/stp_release.m4 +++ b/m4/stp_release.m4 @@ -24,6 +24,6 @@ # Makefiles. AC_DEFUN([STP_RELEASE_DATE], [dnl Set package release date -RELEASE_DATE="22 Nov 2005" +RELEASE_DATE="22 Jan 2006" AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.]) AC_SUBST(RELEASE_DATE)]) diff --git a/m4extra/gettext.m4 b/m4extra/gettext.m4 index 06d58f9..624a807 100644 --- a/m4extra/gettext.m4 +++ b/m4extra/gettext.m4 @@ -1,27 +1,113 @@ -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 5 - -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) +# gettext.m4 serial 37 (gettext-0.14.4) +dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + + dnl Set USE_NLS. + AM_NLS + + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -31,285 +117,433 @@ AC_DEFUN(AM_WITH_NLS, nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include ], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)], - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + + dnl Add a version number to the cache macros. + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) + + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *);], + [bindtextdomain ("", ""); +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *);], + [bindtextdomain ("", ""); +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) fi - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + CATOBJEXT= + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h fi + ]) - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" fi + fi - # We need to process the po/ directory. - POSUB=po + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + USE_NLS=no fi - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes + fi + + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLOBJS= + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi - - AM_LC_MESSAGES - AM_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl The reference to in the installed file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) + + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) + + +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([gt_GLIBC2])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([bh_C_SIGNED])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl + AC_REQUIRE([gt_TYPE_WINT_T])dnl + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + AC_REQUIRE([gt_TYPE_INTMAX_T]) + AC_REQUIRE([gt_PRINTF_POSIX]) + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([gl_GLIBC21])dnl + AC_REQUIRE([gt_INTDIV0])dnl + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl + AC_REQUIRE([gt_INTTYPES_PRI])dnl + AC_REQUIRE([gl_XSIZE])dnl + AC_REQUIRE([gt_INTL_MACOSX])dnl + + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) + ]) + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ +__fsetlocking]) + + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). + gt_CHECK_DECL(_snprintf, [#include ]) + gt_CHECK_DECL(_snwprintf, [#include ]) + + dnl Use the *_unlocked functions only if they are declared. + dnl (because some of them were defined without being declared in Solaris + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built + dnl on Solaris 2.5.1 to run on Solaris 2.6). + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. + gt_CHECK_DECL(feof_unlocked, [#include ]) + gt_CHECK_DECL(fgets_unlocked, [#include ]) + gt_CHECK_DECL(getc_unlocked, [#include ]) + + case $gt_cv_func_printf_posix in + *yes) HAVE_POSIX_PRINTF=1 ;; + *) HAVE_POSIX_PRINTF=0 ;; + esac + AC_SUBST([HAVE_POSIX_PRINTF]) + if test "$ac_cv_func_asprintf" = yes; then + HAVE_ASPRINTF=1 + else + HAVE_ASPRINTF=0 + fi + AC_SUBST([HAVE_ASPRINTF]) + if test "$ac_cv_func_snprintf" = yes; then + HAVE_SNPRINTF=1 + else + HAVE_SNPRINTF=0 + fi + AC_SUBST([HAVE_SNPRINTF]) + if test "$ac_cv_func_wprintf" = yes; then + HAVE_WPRINTF=1 + else + HAVE_WPRINTF=0 + fi + AC_SUBST([HAVE_WPRINTF]) + + AM_ICONV + AM_LANGINFO_CODESET + if test $ac_cv_header_locale_h = yes; then + gt_LC_MESSAGES + fi + + if test -n "$INTL_MACOSX_LIBS"; then + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) + + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + gt_cv_func_CFPreferencesCopyAppValue, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include ], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + + +dnl gt_CHECK_DECL(FUNC, INCLUDES) +dnl Check whether a function is declared. +AC_DEFUN([gt_CHECK_DECL], +[ + AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, + [AC_TRY_COMPILE([$2], [ +#ifndef $1 + char *p = (char *) $1; +#endif +], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) + if test $ac_cv_have_decl_$1 = yes; then + gt_value=1 + else + gt_value=0 + fi + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], + [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff --git a/m4extra/gtk.m4 b/m4extra/gtk.m4 new file mode 100644 index 0000000..f2dd472 --- /dev/null +++ b/m4extra/gtk.m4 @@ -0,0 +1,194 @@ +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +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], +[dnl +dnl Get the cflags and libraries from the gtk-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) diff --git a/m4extra/lcmessage.m4 b/m4extra/lcmessage.m4 index e31bb53..19aa77e 100644 --- a/m4extra/lcmessage.m4 +++ b/m4extra/lcmessage.m4 @@ -1,19 +1,30 @@ -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# lcmessage.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995. -# serial 1 +# Check whether LC_MESSAGES is available in . -AC_DEFUN(AM_LC_MESSAGES, - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) - fi - fi]) +AC_DEFUN([gt_LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) + if test $gt_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +]) diff --git a/m4extra/libtool.m4 b/m4extra/libtool.m4 index 8b71d7c..068d85c 100644 --- a/m4extra/libtool.m4 +++ b/m4extra/libtool.m4 @@ -1,95 +1,513 @@ -## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- -## Copyright (C) 1996-1999 Free Software Foundation, Inc. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit , 1996 ## -## 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. +## This file is free software; the Free Software Foundation gives +## unlimited permission to copy and/or distribute it, with or without +## modifications, as long as this notice is preserved. -# serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +# serial 48 Debian 1.5.22-1 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) -# Save cache, so that ltconfig can load it -AC_CACHE_SAVE +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) -# Reload cache, that may have been modified by ltconfig -AC_CACHE_LOAD +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL -AC_DEFUN(AC_LIBTOOL_SETUP, -[AC_PREREQ(2.13)dnl + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl AC_REQUIRE([AC_ENABLE_SHARED])dnl AC_REQUIRE([AC_ENABLE_STATIC])dnl AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl dnl -# Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], -[libtool_flags="$libtool_flags --enable-dlopen"]) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[libtool_flags="$libtool_flags --enable-win32-dll"]) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC + fi + ;; +esac + +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) + +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP + + +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX + + +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT + + +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +echo=${ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(ECHO) +])])# _LT_AC_PROG_ECHO_BACKSLASH + + +# _LT_AC_LOCK +# ----------- +AC_DEFUN([_LT_AC_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. -case "$host" in +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -100,6 +518,49 @@ case "$host" in LD="${LD-ld} -64" ;; esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac fi rm -rf conftest* ;; @@ -109,322 +570,5856 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C + [AC_LANG_PUSH(C) AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) + AC_LANG_POP]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw*) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +[*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) ;; -]) + ]) esac -]) -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl -define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl +need_locks="$enable_libtool_lock" + +])# _LT_AC_LOCK + + +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +[AC_REQUIRE([LT_AC_PROG_SED]) +AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + 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 other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $rm conftest* ]) -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) - -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl -define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl +if test x"[$]$2" = xyes; then + ifelse([$5], , :, [$5]) +else + ifelse([$6], , :, [$6]) +fi +])# AC_LIBTOOL_COMPILER_OPTION + + +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ------------------------------------------------------------ +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +[AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" ]) -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - - -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl -define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes +if test x"[$]$2" = xyes; then + ifelse([$4], , :, [$4]) +else + ifelse([$5], , :, [$5]) +fi +])# AC_LIBTOOL_LINKER_OPTION + + +# AC_LIBTOOL_SYS_MAX_CMD_LEN +# -------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +[# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; -# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_PROG_LD, -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. -changequote(,)dnl - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -changequote([,])dnl - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi ;; *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown + # 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. + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 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 + done + teststring= + # 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. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ;; esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else - AC_MSG_CHECKING([for non-GNU ld]) + AC_MSG_RESULT(none) fi -AC_CACHE_VAL(ac_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - ac_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$ac_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) +])# AC_LIBTOOL_SYS_MAX_CMD_LEN + + +# _LT_AC_CHECK_DLFCN +# ------------------ +AC_DEFUN([_LT_AC_CHECK_DLFCN], +[AC_CHECK_HEADERS(dlfcn.h)dnl +])# _LT_AC_CHECK_DLFCN + + +# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# --------------------------------------------------------------------- +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] else - AC_MSG_RESULT(no) + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + exit (status); +}] +EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_SUBST(LD) -AC_PROG_LD_GNU -]) +rm -fr conftest* +])# _LT_AC_TRY_DLOPEN_SELF -AC_DEFUN(AC_PROG_LD_GNU, -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no -fi]) -]) -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(ac_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - ac_cv_path_NM="$NM" +# AC_LIBTOOL_DLOPEN_SELF +# ---------------------- +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - break - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - break - else - ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -fi]) -NM="$ac_cv_path_NM" -AC_MSG_RESULT([$NM]) -AC_SUBST(NM) -]) + lt_cv_dlopen=no + lt_cv_dlopen_libs= -# AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case "$host" in -*-*-beos* | *-*-cygwin*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library, adds --enable-ltdl-convenience to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case "$enable_ltdl_convenience" in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) -]) + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library, and adds --enable-ltdl-install to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +])# AC_LIBTOOL_DLOPEN_SELF + + +# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +# --------------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler +AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* +]) +])# AC_LIBTOOL_PROG_CC_C_O + + +# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +# ----------------------------------------- +# Check to see if we can do hard links to lock some files if needed +AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +[AC_REQUIRE([_LT_AC_LOCK])dnl + +hard_links="nottested" +if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + + +# AC_LIBTOOL_OBJDIR +# ----------------- +AC_DEFUN([AC_LIBTOOL_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +])# AC_LIBTOOL_OBJDIR + + +# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +# ---------------------------------------------- +# Check hardcoding attributes. +AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_AC_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_AC_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_AC_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + + +# AC_LIBTOOL_SYS_LIB_STRIP +# ------------------------ +AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +[striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +])# AC_LIBTOOL_SYS_LIB_STRIP + + +# AC_LIBTOOL_SYS_DYNAMIC_LINKER +# ----------------------------- +# PORTME Fill in your ld.so characteristics +AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +[AC_MSG_CHECKING([dynamic linker characteristics]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + 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`' + # 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"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + 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 + 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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + + +# _LT_AC_TAGCONFIG +# ---------------- +AC_DEFUN([_LT_AC_TAGCONFIG], +[AC_ARG_WITH([tags], + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], + [include additional configurations @<:@automatic@:>@])], + [tagnames="$withval"]) + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + AC_MSG_WARN([output file `$ofile' does not exist]) + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then + AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) + else + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + "") ;; + *) AC_MSG_ERROR([invalid tag name: $tagname]) + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + AC_MSG_ERROR([tag name \"$tagname\" already exists]) + fi + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile + + case $tagname in + CXX) + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" + fi + ;; + + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then + AC_LIBTOOL_LANG_F77_CONFIG + else + tagname="" + fi + ;; + + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + AC_LIBTOOL_LANG_GCJ_CONFIG + else + tagname="" + fi + ;; + + RC) + AC_LIBTOOL_LANG_RC_CONFIG + ;; + + *) + AC_MSG_ERROR([Unsupported tag name: $tagname]) + ;; + esac + + # Append the new tag name to the list of available tags. + if test -n "$tagname" ; then + available_tags="$available_tags $tagname" + fi + fi + done + IFS="$lt_save_ifs" + + # Now substitute the updated list of available tags. + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then + mv "${ofile}T" "$ofile" + chmod +x "$ofile" + else + rm -f "${ofile}T" + AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi +fi +])# _LT_AC_TAGCONFIG + + +# AC_LIBTOOL_DLOPEN +# ----------------- +# enable checks for dlopen support +AC_DEFUN([AC_LIBTOOL_DLOPEN], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_DLOPEN + + +# AC_LIBTOOL_WIN32_DLL +# -------------------- +# declare package support for building win32 DLLs +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_WIN32_DLL + + +# AC_ENABLE_SHARED([DEFAULT]) +# --------------------------- +# implement the --enable-shared flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_SHARED], +[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([shared], + [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +])# AC_ENABLE_SHARED + + +# AC_DISABLE_SHARED +# ----------------- +# set the default shared flag to --disable-shared +AC_DEFUN([AC_DISABLE_SHARED], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_SHARED(no) +])# AC_DISABLE_SHARED + + +# AC_ENABLE_STATIC([DEFAULT]) +# --------------------------- +# implement the --enable-static flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_STATIC], +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([static], + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]AC_ENABLE_STATIC_DEFAULT) +])# AC_ENABLE_STATIC + + +# AC_DISABLE_STATIC +# ----------------- +# set the default static flag to --disable-static +AC_DEFUN([AC_DISABLE_STATIC], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_STATIC(no) +])# AC_DISABLE_STATIC + + +# AC_ENABLE_FAST_INSTALL([DEFAULT]) +# --------------------------------- +# implement the --enable-fast-install flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_FAST_INSTALL], +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([fast-install], + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +])# AC_ENABLE_FAST_INSTALL + + +# AC_DISABLE_FAST_INSTALL +# ----------------------- +# set the default to --disable-fast-install +AC_DEFUN([AC_DISABLE_FAST_INSTALL], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_FAST_INSTALL(no) +])# AC_DISABLE_FAST_INSTALL + + +# AC_LIBTOOL_PICMODE([MODE]) +# -------------------------- +# implement the --with-pic flag +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +AC_DEFUN([AC_LIBTOOL_PICMODE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +pic_mode=ifelse($#,1,$1,default) +])# AC_LIBTOOL_PICMODE + + +# AC_PROG_EGREP +# ------------- +# This is predefined starting with Autoconf 2.54, so this conditional +# definition can be removed once we require Autoconf 2.54 or later. +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi]) + EGREP=$ac_cv_prog_egrep + AC_SUBST([EGREP]) +])]) + + +# AC_PATH_TOOL_PREFIX +# ------------------- +# find a file program which can recognise shared library +AC_DEFUN([AC_PATH_TOOL_PREFIX], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="ifelse([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +])# AC_PATH_TOOL_PREFIX + + +# AC_PATH_MAGIC +# ------------- +# find a file program which can recognise a shared library +AC_DEFUN([AC_PATH_MAGIC], +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# AC_PATH_MAGIC + + +# AC_PROG_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([AC_PROG_LD], +[AC_ARG_WITH([gnu-ld], + [AC_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no]) +AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + 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 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +nto-qnx*) + lt_cv_deplibs_check_method=unknown + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown +])# AC_DEPLIBS_CHECK_METHOD + + +# AC_PROG_NM +# ---------- +# find the pathname to a BSD-compatible name lister +AC_DEFUN([AC_PROG_NM], +[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi]) +NM="$lt_cv_path_NM" +])# AC_PROG_NM + + +# AC_CHECK_LIBM +# ------------- +# check for math library +AC_DEFUN([AC_CHECK_LIBM], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +])# AC_CHECK_LIBM + + +# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl convenience library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case $enable_ltdl_convenience in + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; + "") enable_ltdl_convenience=yes + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; + esac + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_CONVENIENCE + + +# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl installable library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-install to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# and an installed libltdl is not found, it is assumed to be `libltdl'. +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and top_srcdir +# appropriately in the Makefiles. +# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_CHECK_LIB(ltdl, lt_dlinit, + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], + [if test x"$enable_ltdl_install" = xno; then + AC_MSG_WARN([libltdl not installed, but installation disabled]) + else + enable_ltdl_install=yes + fi + ]) + if test x"$enable_ltdl_install" = x"yes"; then + ac_configure_args="$ac_configure_args --enable-ltdl-install" + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else + ac_configure_args="$ac_configure_args --enable-ltdl-install=no" + LIBLTDL="-lltdl" + LTDLINCL= + fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_INSTALLABLE + + +# AC_LIBTOOL_CXX +# -------------- +# enable support for C++ libraries +AC_DEFUN([AC_LIBTOOL_CXX], +[AC_REQUIRE([_LT_AC_LANG_CXX]) +])# AC_LIBTOOL_CXX + + +# _LT_AC_LANG_CXX +# --------------- +AC_DEFUN([_LT_AC_LANG_CXX], +[AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +])# _LT_AC_LANG_CXX + +# _LT_AC_PROG_CXXCPP +# ------------------ +AC_DEFUN([_LT_AC_PROG_CXXCPP], +[ +AC_REQUIRE([AC_PROG_CXX]) +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +fi +])# _LT_AC_PROG_CXXCPP + +# AC_LIBTOOL_F77 +# -------------- +# enable support for Fortran 77 libraries +AC_DEFUN([AC_LIBTOOL_F77], +[AC_REQUIRE([_LT_AC_LANG_F77]) +])# AC_LIBTOOL_F77 + + +# _LT_AC_LANG_F77 +# --------------- +AC_DEFUN([_LT_AC_LANG_F77], +[AC_REQUIRE([AC_PROG_F77]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +])# _LT_AC_LANG_F77 + + +# AC_LIBTOOL_GCJ +# -------------- +# enable support for GCJ libraries +AC_DEFUN([AC_LIBTOOL_GCJ], +[AC_REQUIRE([_LT_AC_LANG_GCJ]) +])# AC_LIBTOOL_GCJ + + +# _LT_AC_LANG_GCJ +# --------------- +AC_DEFUN([_LT_AC_LANG_GCJ], +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +])# _LT_AC_LANG_GCJ + + +# AC_LIBTOOL_RC +# ------------- +# enable support for Windows resource files +AC_DEFUN([AC_LIBTOOL_RC], +[AC_REQUIRE([LT_AC_PROG_RC]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +])# AC_LIBTOOL_RC + + +# AC_LIBTOOL_LANG_C_CONFIG +# ------------------------ +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +AC_DEFUN([_LT_AC_LANG_C_CONFIG], +[lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}\n' + +_LT_AC_SYS_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF + +# Report which library types will actually be built +AC_MSG_CHECKING([if libtool supports shared libraries]) +AC_MSG_RESULT([$can_build_shared]) + +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC="$lt_save_CC" +])# AC_LIBTOOL_LANG_C_CONFIG + + +# AC_LIBTOOL_LANG_CXX_CONFIG +# -------------------------- +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +[AC_LANG_PUSH(C++) +AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(allow_undefined_flag, $1)= +_LT_AC_TAGVAR(always_export_symbols, $1)=no +_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_direct, $1)=no +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_AC_TAGVAR(hardcode_automatic, $1)=no +_LT_AC_TAGVAR(module_cmds, $1)= +_LT_AC_TAGVAR(module_expsym_cmds, $1)= +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_AC_TAGVAR(no_undefined_flag, $1)= +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Dependencies to place before and after the object being linked: +_LT_AC_TAGVAR(predep_objects, $1)= +_LT_AC_TAGVAR(postdep_objects, $1)= +_LT_AC_TAGVAR(predeps, $1)= +_LT_AC_TAGVAR(postdeps, $1)= +_LT_AC_TAGVAR(compiler_lib_search_path, $1)= + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_AC_SYS_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD +lt_save_GCC=$GCC +GCC=$GXX +lt_save_with_gnu_ld=$with_gnu_ld +lt_save_path_LD=$lt_cv_path_LD +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +else + $as_unset lt_cv_prog_gnu_ld +fi +if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX +else + $as_unset lt_cv_path_LD +fi +test -z "${LDCXX+set}" || LD=$LDCXX +CC=${CXX-"c++"} +compiler=$CC +_LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +else + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +fi + +if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + AC_PROG_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +else + GXX=no + with_gnu_ld=no + wlarc= +fi + +# PORTME: fill in a description of your system's C++ link characteristics +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +_LT_AC_TAGVAR(ld_shlibs, $1)=yes +case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + ;; + gnu*) + ;; + hpux9*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + *) + if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + ;; + *) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + linux*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc*) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + m88k*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + 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= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; 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 && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; 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 && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + psos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + fi + ;; + esac + ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +esac +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_AC_TAGVAR(GCC, $1)="$GXX" +_LT_AC_TAGVAR(LD, $1)="$LD" + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +AC_LIBTOOL_POSTDEP_PREDEP($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD +GCC=$lt_save_GCC +with_gnu_ldcxx=$with_gnu_ld +with_gnu_ld=$lt_save_with_gnu_ld +lt_cv_path_LDCXX=$lt_cv_path_LD +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +])# AC_LIBTOOL_LANG_CXX_CONFIG + +# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +# ------------------------------------ +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" +ifelse([$1], [], +[#! $SHELL + +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# +# This file is part of GNU Libtool: +# Originally by Gordon Matzigkeit , 1996 +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="$SED -e 1s/^X//" + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# The names of the tagged configurations supported by this script. +available_tags= + +# ### BEGIN LIBTOOL CONFIG], +[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +# Is the compiler the GNU C compiler? +with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) + +# Commands used to build and install a shared archive. +archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" + +# Set to yes if exported symbols are required. +always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + +# The commands to list exported symbols. +export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + +# Symbols that must always be exported. +include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + +ifelse([$1],[], +[# ### END LIBTOOL CONFIG], +[# ### END LIBTOOL TAG CONFIG: $tagname]) + +__EOF__ + +ifelse([$1],[], [ + case $host_os in + aix3*) + cat <<\EOF >> "$cfgfile" + +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +EOF + ;; + esac + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +]) +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi +])# AC_LIBTOOL_CONFIG + + +# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + +_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + + AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + + +# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +# --------------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_NM]) +AC_REQUIRE([AC_OBJEXT]) +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +linux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + + cat <> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * +#else +# define lt_ptr_t char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr_t address; +} +lt_preloaded_symbols[[]] = +{ +EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi +]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + + +# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +# --------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + +AC_MSG_CHECKING([for $compiler option to produce PIC]) + ifelse([$1],[CXX],[ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix4* | aix5*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + icpc* | ecpc*) + # Intel C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + newsos6) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + linux*) + case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +]) + + +# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +# ------------------------------------ +# See if the linker supports building shared libraries. +AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; + kfreebsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; + 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' + ;; + esac +],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)= + _LT_AC_TAGVAR(archive_expsym_cmds, $1)= + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_AC_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + 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= + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + # see comment about different semantics on the GNU ld section + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + bsdi[[45]]*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".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. + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ;; + + dgux*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # GNU/kFreeBSD uses gcc -shared to do shared libraries. + kfreebsd*-gnu) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + 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 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_AC_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) + then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac fi + ;; +esac +])# AC_LIBTOOL_PROG_LD_SHLIBS + + +# _LT_AC_FILE_LTDLL_C +# ------------------- +# Be careful that the start marker always follows a newline. +AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +# /* ltdll.c starts here */ +# #define WIN32_LEAN_AND_MEAN +# #include +# #undef WIN32_LEAN_AND_MEAN +# #include +# +# #ifndef __CYGWIN__ +# # ifdef __CYGWIN32__ +# # define __CYGWIN__ __CYGWIN32__ +# # endif +# #endif +# +# #ifdef __cplusplus +# extern "C" { +# #endif +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +# #ifdef __cplusplus +# } +# #endif +# +# #ifdef __CYGWIN__ +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# #endif +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ +])# _LT_AC_FILE_LTDLL_C + + +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + + +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) + +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) + +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) + +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) ]) -dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl - -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_MSG_RESULT([$SED]) +]) diff --git a/m4extra/progtest.m4 b/m4extra/progtest.m4 index 2482d4a..a56365c 100644 --- a/m4extra/progtest.m4 +++ b/m4extra/progtest.m4 @@ -1,44 +1,89 @@ -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# progtest.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1996. -# serial 1 +AC_PREREQ(2.50) + +# Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, -[# Extract the first word of "$2", so it can be a program name with args. +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl - ;; + ;; esac])dnl $1="$ac_cv_path_$1" -if test -n "[$]$1"; then +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then AC_MSG_RESULT([$]$1) else AC_MSG_RESULT(no) diff --git a/man/Makefile.in b/man/Makefile.in index f210fd5..07dc610 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/po/cs.gmo b/po/cs.gmo index 086fc4d..5777e2a 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index c96dc3d..f058d6f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print 4.2.6-pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2003-05-03 19:43+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -16,6 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Nastavit implicitní" @@ -285,9 +286,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400×600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Normální papír" @@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA" msgstr "Normální papír" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Fólie" @@ -340,9 +341,10 @@ msgid "Photo Paper Pro" msgstr "Profesionální fotopapír" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Jiný" @@ -406,7 +408,7 @@ msgstr "Zdroj (vstupní otvor) média, na které tisknete" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "RozliÅ¡ení" @@ -547,9 +549,9 @@ msgstr "SvÄ›tle modrozelená" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -567,8 +569,8 @@ msgid "Light Yellow Transition" msgstr "SvÄ›tle modrozelená" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -598,12 +600,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "ÄŒerná" @@ -623,14 +627,14 @@ msgstr "Fotografické barvy CcMmY" msgid "Photo CcMmYK Color" msgstr "Fotografické barvy CcMmYK" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Barva" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -671,8 +675,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Vytisknout" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Odstíny Å¡edi" @@ -833,12 +837,14 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Modrozelená" @@ -847,12 +853,14 @@ msgstr "Modrozelená" msgid "Adjust the cyan gamma" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Fialová" @@ -861,12 +869,14 @@ msgstr "Fialová" msgid "Adjust the magenta gamma" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Žlutá" @@ -875,9 +885,10 @@ msgstr "Žlutá" msgid "Adjust the yellow gamma" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -886,8 +897,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -896,9 +907,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1137,7 +1149,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1228,134 +1240,145 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standardní" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Podávací válec" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "Podávací válec (odříznout každou stranu)" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "Podávací válec (neodÅ™ezávat)" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "RuÄní" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Tisknout do souboru?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "PÅ™ihrádka Å™ezaných listů 1" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "PÅ™ihrádka Å™ezaných listů 2" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "Automatický výbÄ›r Å™ezaných listů" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "RuÄní výbÄ›r" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Výška:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografie" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Å est barev foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "SvÄ›tle fialová" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "ÄŒerná" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "ÄŒerná/tmavá žlutá" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Matný papír" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Fotopapír" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Lesklý potah" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "ÄŒerná" @@ -1602,86 +1625,78 @@ msgstr "SvÄ›tle modrozelená" msgid "Medium Gray Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Tisknout do souboru?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "RuÄní" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Automaticky" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI JednosmÄ›rnÄ›" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI JednosmÄ›rnÄ›" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Tiskárna nepodporuje barevný výstup\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1735,104 +1750,105 @@ msgid "test print" msgstr "testovací tisk" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "ÄŒtyÅ™i barvy standardní" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "TÅ™i barvy kompozitní" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Å est barev foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "PÄ›t barev foto kompozitní" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Lesklý potah" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Obálky" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Matný papír" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papír pro inkoustové tiskárny" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papír pro inkoustové tiskárny ve foto kvalitÄ›" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotopapír" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Extra lesklý fotopapír" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Lesklý papír ve foto kvalitÄ›" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1840,8 +1856,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1981,8 +1997,8 @@ msgstr "" msgid "PPDFile" msgstr "Soubor PPD:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "Soubor PPD?" @@ -1991,178 +2007,178 @@ msgstr "Soubor PPD?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "Dva úrovnÄ› stupňů Å¡edi" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Dva úrovnÄ› stupňů Å¡edi" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Å et barev rozšířené kompozitní" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Sedm barev foto" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "TÅ™i barvy kompozitní" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "TÅ™i barvy kompozitní" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "ÄŒtyÅ™i barvy standardní" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "ÄŒtyÅ™i barvy standardní" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Å et barev rozšířené kompozitní" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Sedm barev foto" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Rychlé podávání normálního papíru" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Pohlednice" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matný papír" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Extra lesklý fotopapír" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Papír ColorLife" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Matný papír" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2220,88 +2236,99 @@ msgstr "1200 DPI vysoká kvalita" msgid "720 DPI Highest Quality" msgstr "1200 DPI nejvyšší kvalita" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1200 DPI nejvyšší kvalita" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1200 DPI nejvyšší kvalita" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Název tiskárny:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Název tiskárny:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Jas:" @@ -3707,645 +3734,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C50" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4443,30 +4523,30 @@ msgstr "Nastavit implicitní" msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "Budiž" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "ZruÅ¡it" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Tisk v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "O programu" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4474,7 +4554,7 @@ msgstr "" "Vytisknout a\n" "uložit nastavení" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4482,15 +4562,15 @@ msgstr "" "Uložit\n" "nastavení" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Vytisknout" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Náhled" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4514,74 +4594,74 @@ msgstr "" "Pokud pÅ™i tažení myší kliknÄ›te jiným tlaÄítkem, obrázek se vrátí na svou " "původní pozici." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 msgid "Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "RozmÄ›ry:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Šířka:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Šířka papíru, na který chcete tisknout" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Výška:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Výška papíru, na který chcete tisknout" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Pozice" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automaticky" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Na výšku" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Na šířku" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Vzhůru nohama" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Na stranu" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4589,124 +4669,124 @@ msgstr "" "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na " "šířku vzhůru nohama)" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientace:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Levý:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Vzdálenost od levého okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Pravý:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Vzdálenost od pravého okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Horní:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Vzdálenost od horního okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Spodní:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Vzdálenost od spodního okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Vycentrovat:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "HorizontálnÄ›" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Vycentrovat obrázek na papíře horizontálnÄ›" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Obojí" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Vycentrovat obrázek na papíře" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "VertikálnÄ›" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Vycentrovat obrázek na papíře vertikálnÄ›" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Nastavit tiskárnu" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Vyberte model své tiskárny" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Model tiskárny:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Vyberte model své tiskárny" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "Soubor PPD:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Zadejte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Procházet" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Zvolte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4715,54 +4795,54 @@ msgstr "" "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete " "tisknout" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Zadejte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "testovací tisk" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Tisknout do souboru?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definovat novou tiskárnu" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Zadejte název, který chcete dát této logické tiskárnÄ›" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "O Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Verze Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4807,11 +4887,11 @@ msgstr "" "pokud se tak nestalo, napiÅ¡te Free Software Foundation, Inc., 59 Temple\n" "Place - Suite 330, Boston, MA 02111-1307, USA.\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Nastavení tiskárny" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4819,11 +4899,11 @@ msgstr "" "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete " "tisknout" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Nastavit tiskárnu..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4831,11 +4911,11 @@ msgstr "" "Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na " "tuto tiskárnu" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Nová tiskárna..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4843,24 +4923,24 @@ msgstr "" "Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování " "sady nastavení, které si chcete zapamatovat pro budoucí použití." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Typ obrázku" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Měřítko:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Nastavte měřítko (velikost) obrázku" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4868,31 +4948,31 @@ msgstr "" "Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky " "nebo poÄet výstupních bodů na palec" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Procenta" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Upravit tisk na velikost stránky" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Upravit tisk na poÄet bodů na palec" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Nastavit šířku tisku" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Nastavit výšku tisku" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4900,67 +4980,67 @@ msgstr "" "Použít původní\n" "velikost obrázku" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Nastavit velikost tisku na velikost obrázku" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Úprava barvy tisku" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Nastavit implicitní" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Zavřít" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Náhled obrázku" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Zvolte požadovaný typ výstupu" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Upravit výstup..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Vyberte základní jednotku měření pro tisk" @@ -5100,15 +5180,15 @@ msgstr "Czech" msgid "ISOLatin1" msgstr "UTF-8" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5377,18 +5457,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Nemohu Äíst z %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Nemohu otevřít %s pro Ätení i zápis: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Nemohu zapisovat do %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5397,7 +5478,8 @@ msgstr "" "\n" "Nemohu zapisovat do %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5415,82 +5497,82 @@ msgstr "" "Nemohu detekovat typ tiskárny.\n" "Použijte prosím -m pro urÄení modelu své tiskárny.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Nemohu zpracovat výstup z tiskárny\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Tiskárna nepodporuje barevný výstup\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Barva inkoustu" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Zbývá procent" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Tiskárna nepodporuje barevný výstup\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Můžete zadat jen jeden model tiskárny." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "ÄŒistím hlavy...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "SpouÅ¡tím test trysek, pÅ™esvÄ›dÄte se prosím, že v tiskárnÄ› je papír.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5563,7 +5645,7 @@ msgstr "" "abyste v průbÄ›hu této procedury nevypínali svou tiskárnu.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5627,12 +5709,12 @@ msgstr "" "Je důležité, abyste v průbÄ›hu této procedury nevypínali svou tiskárnu.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Nemohu odeslat příkaz tiskárnÄ›, konÄím.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5651,13 +5733,13 @@ msgstr "" "Pak budete požádáni o potvrzení svého výbÄ›ru.\n" "Co chcete udÄ›lat (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" @@ -5665,7 +5747,7 @@ msgstr "" "PotvrÄte prosím, že chcete skonÄit bez ukládání, opÄ›tovným\n" "napsáním 'q':\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5674,7 +5756,7 @@ msgstr "" "DobÅ™e, vaÅ¡e tiskárna je zarovnaná, ale zarovnání nebylo uloženo.\n" "Pokud chcete zarovnání uložit, musíte tento proces zopakovat.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5683,12 +5765,12 @@ msgstr "" "PotvrÄte prosím, že chcete zopakovat proces zarovnávání, opÄ›tovným\n" "napsáním 'r':\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Opakuji proces zarovnávání.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5703,17 +5785,17 @@ msgstr "" "PotvrÄte prosím, že chcete uložit nastavení do své tiskárny, opÄ›tovným\n" "napsáním 's':\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "PÅ™ipravuji se uložit nastavení..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "selhalo!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5722,27 +5804,27 @@ msgstr "" "VaÅ¡e nastavení nebylo uloženo úspěšnÄ›. Musíte zopakovat proceduru\n" "zarovnávání.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "uspÄ›lo!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "VaÅ¡e nastavení zarovnání bylo uloženo do tiskárny.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Nerozpoznaný příkaz.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Poslední příkaz nebyl potvrzen.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5759,12 +5841,12 @@ msgstr "" "Pro spuÅ¡tÄ›ní procedury zarovnání hlav prosím vložte do své tiskárny\n" "list papíru.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "PokraÄujte stisknutím enter > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5774,42 +5856,42 @@ msgstr "" "Zkontrolujte prosím výtisk a zvolte nejlepší dvojici Äar v každém vzorku.\n" "NapiÅ¡te Äíslo dvojice, '?' pro nápovÄ›du nebo 'r' pro zopakování procedury.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Průchod #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Vložte prosím nový list papíru.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Číslo mimo rozsah!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Nemohu pochopit, co jste napsali!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Nejlepší dvojice Äar by mÄ›la mít Äíslo mezi 1 a %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Pokouším se nastavit zarovnání..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "uspÄ›lo.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5822,7 +5904,7 @@ msgstr "" "vzorek %d. Pokud není, mÄ›li byste pro získání nejlepší kvality tisku proces\n" "zopakovat.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Chyba ve vstupu\n" @@ -5958,6 +6040,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 "Cannot identify printer!\n" +#~ msgstr "Nemohu zpracovat výstup z tiskárny\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Žlutá" diff --git a/po/da.gmo b/po/da.gmo index cc7b8be..30bd928 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 5d363c4..25303ec 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gutenprint 5.0.0-b5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2005-08-17 16:11+0200\n" "Last-Translator: Mogens Jaeger \n" "Language-Team: Danish \n" @@ -20,6 +20,7 @@ msgstr "" "X-Generator: KBabel 1.10\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 msgid "Default" msgstr "Standard" @@ -265,9 +266,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x2400 DPI DMT" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Almindeligt papir" @@ -276,9 +277,9 @@ msgid "Plain Paper PIXMA" msgstr "Almindeligt papir PIXMA" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparenter" @@ -319,9 +320,10 @@ msgid "Photo Paper Pro" msgstr "Prof. fotopapir" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Andet" @@ -381,7 +383,7 @@ msgstr "I hvilken bakke er mediet" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Opløsning" @@ -511,9 +513,9 @@ msgstr "Lys cyan overgang" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "Avanceret blækjustering" @@ -529,8 +531,8 @@ msgid "Light Yellow Transition" msgstr "Lys gul overgang" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "Afbrudt" @@ -560,12 +562,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Sort" @@ -585,14 +589,14 @@ msgstr "Foto CcMmY farver" msgid "Photo CcMmYK Color" msgstr "Foto CcMmYK farver" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Farver" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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,8 +634,8 @@ msgstr "Ingen korrektioner" msgid "Pre-Dithered" msgstr "Forud dithered" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Gråtone" @@ -777,12 +781,14 @@ msgstr "Program gamma" msgid "Gamma value assumed by application" msgstr "Gammaværdi som formodet af program" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -790,12 +796,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Justér gamma for cyan" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -803,12 +811,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Justér gamma for magenta" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Gul" @@ -816,9 +826,10 @@ msgstr "Gul" msgid "Adjust the yellow gamma" msgstr "Justér gamma for gul" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "Rød" @@ -826,8 +837,8 @@ msgstr "R msgid "Adjust the red gamma" msgstr "Justér gamma for rød" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "Grøn" @@ -835,9 +846,10 @@ msgstr "Gr msgid "Adjust the green gamma" msgstr "Justér gamma for grøn" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "Blå" @@ -1047,7 +1059,7 @@ msgstr "Gr msgid "Gray component reduction curve" msgstr "Grå bestanddels reduktionskurve" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "Traditionel Gutenprint farveomsætning" @@ -1139,121 +1151,132 @@ msgstr "" "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %" "d\n" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Rulle fødning" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "Rulle fødning (skær efter hver side)" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "Rulle fødning (ingen afskæring)" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 msgid "Manual Feed" msgstr "Manuel fødning" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 msgid "Print to CD" msgstr "Udskriv på Cd" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "Tilskårne ark, bakke 1" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "Tilskårne ark, bakke 2" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "Automatisk valg af bakke" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "Manuel udvælgelse" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Hurtig økonomisk" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "Økonomisk" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "Kladde" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 msgid "High" msgstr "Høj" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 msgid "Photo" msgstr "Foto" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super foto" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "Bedst" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 msgid "Light Cyan" msgstr "Lys cyan" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 msgid "Light Magenta" msgstr "Lys magenta" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 msgid "Light Black" msgstr "Lys sort" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 msgid "Dark Yellow" msgstr "Mørk gul" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 msgid "Matte Black" msgstr "Mat sort" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 msgid "Photo Black" msgstr "Foto sort" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "Glans forbedrer" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Lys sort" @@ -1474,81 +1497,73 @@ msgstr "Mellemgr msgid "Medium Gray Transition" msgstr "Middelgrå overgang" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "Brug af rødt og blåt blæk" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "Mængde af rødt og blåt blæk der skal bruges" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "Fuld manuel kontrol" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "Automatisk indstillingskontrol" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "Cd - 12 cm" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "Cd - 8 cm" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "Normal" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 msgid "Print To Hub" msgstr "Print til center" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Manuel kontrol" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 msgid "Automatic" msgstr "Automatisk" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "Tovejs" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 msgid "Unidirectional" msgstr "Envejs" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "Alternativ udfyldning" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "Stigende udfyldning" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "Aftagende udfyldning" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "Stigende dobbelt" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "Vige udenom nærmeste nabo" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n" @@ -1602,104 +1617,105 @@ msgid "test print" msgstr "test print" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Fire farver standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Tre farver sammensat" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Seks farver foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Fem farver foto sammensat" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Blanke film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Kuverter" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Mat papir" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Inkjetpapir" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Fotokvalitets inkjetpapir" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotopapir" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Førsteklasses blankt fotopapir" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Førsteklasses glittet fotopapir" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Fotokvalitets blankt papir" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Papir" @@ -1707,8 +1723,8 @@ msgstr "Ilford Heavy Papir" msgid "Coated" msgstr "Coated" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "Ingen" @@ -1840,8 +1856,8 @@ msgstr "Lang kant (standard)" msgid "PPDFile" msgstr "PPDfil" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 msgid "PPD File" msgstr "PPD fil" @@ -1849,164 +1865,164 @@ msgstr "PPD fil" msgid "Image dimensions must match paper dimensions" msgstr "Billedets størrelse skal passe til papirets størrelse" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "To-niveau gråskala" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "To-niveau gråskala" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "FireTone grå" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Seks farver forbedret sammensat" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Syv farver foto" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Syv farver forbedret" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Seks farver foto" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "En farve ufiltreret" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "En farve ufiltreret forbedret glans" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "To farver ufiltreret" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 msgid "Three Color Raw" msgstr "Tre farver ufiltreret" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 msgid "Three Color Raw Gloss" msgstr "Fire farver ufiltreret, glans " -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 msgid "Four Color Raw" msgstr "Fire farver ufiltreret" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 msgid "Four Color Raw Gloss" msgstr "Fire farver ufiltreret, glans" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 msgid "Five Color Raw" msgstr "Fem farver ufiltreret" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 msgid "Six Color Raw" msgstr "Seks farver ufiltreret" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 msgid "Six Color Enhanced Gloss Raw" msgstr "Seks farver forbedret glans ufiltreret" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 msgid "Seven Color Raw" msgstr "Syv farver ufiltreret" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 msgid "Seven Color Enhanced Gloss Raw" msgstr "Syv farver forbedret glans ufiltreret" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Seks farver ufiltreret" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "Epson standard blæk" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 msgid "UltraChrome Photo Black" msgstr "UltraChrome foto sort" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "UltraChrome mat sort" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Almindeligt papir hurtigindføring" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkort" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "Baglys film" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 -msgid "Matte Paper Heavyweight" -msgstr "Heavyweight mat papir" - #: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 #: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 #: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +msgid "Matte Paper Heavyweight" +msgstr "Heavyweight mat papir" + +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 msgid "Premium Semigloss Photo Paper" msgstr "Premium silkemat fotopapir" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 msgid "ColorLife Paper" msgstr "ColorLife papir" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 msgid "Archival Matte Paper" msgstr "Arkivfast mat papir" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "Vandfarvepapir - strålende hvidt" @@ -2055,79 +2071,90 @@ msgstr "720 DPI h msgid "720 DPI Highest Quality" msgstr "720 DPI højeste kvalitet" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "720x720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 720 DPI højeste kvalitet" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "2880 x 720 DPI højeste kvalitet" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 msgid "2880 x 1440 DPI" msgstr "2880 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "2880 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 msgid "2880 x 2880 DPI" msgstr "2880 x 2880 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 2880 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "Tændt" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 msgid "Interleave" msgstr "Udjævning" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "Fuld overlapning" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "Fire gennemløb" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "Fuld overlapning 2" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 msgid "Interleave 2" msgstr "Udjævning 2" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 msgid "Eight Pass" msgstr "Otte gennemløb" @@ -2843,7 +2870,7 @@ msgstr "Canon PIXMA iP4000" #: src/main/xmli18n-tmp.h:169 #, fuzzy msgid "EPSON Stylus C20" -msgstr "EPSON Stylus C20SX" +msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:170 msgid "EPSON Stylus C20SX" @@ -2856,7 +2883,7 @@ msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:172 #, fuzzy msgid "EPSON Stylus C40" -msgstr "EPSON Stylus C40SX" +msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:173 msgid "EPSON Stylus C40SX" @@ -2869,7 +2896,7 @@ msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:175 #, fuzzy msgid "EPSON Stylus C41" -msgstr "EPSON Stylus C41SX" +msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:176 msgid "EPSON Stylus C41SX" @@ -2882,7 +2909,7 @@ msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:178 #, fuzzy msgid "EPSON Stylus C42" -msgstr "EPSON Stylus C42SX" +msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:179 msgid "EPSON Stylus C42SX" @@ -2895,7 +2922,7 @@ msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:181 #, fuzzy msgid "EPSON Stylus C43" -msgstr "EPSON Stylus C43SX" +msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:182 msgid "EPSON Stylus C43SX" @@ -2908,7 +2935,7 @@ msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "EPSON Stylus C44" -msgstr "EPSON Stylus C44SX" +msgstr "EPSON Stylus C44UX" #: src/main/xmli18n-tmp.h:185 msgid "EPSON Stylus C44SX" @@ -3389,632 +3416,685 @@ msgstr "EPSON Stylus CX3650" #: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "EPSON Stylus CX3700" -msgstr "EPSON Stylus CX3100" +msgstr "EPSON Stylus CX8300" #: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "EPSON Stylus CX3800" -msgstr "EPSON Stylus CX3100" +msgstr "EPSON Stylus CX8400" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "EPSON Stylus C85" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "EPSON Stylus CX8400" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" -msgstr "EPSON Stylus CX3200" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "EPSON Stylus CX8400" + +#: src/main/xmli18n-tmp.h:309 msgid "EPSON Stylus CX4600" msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" -msgstr "EPSON Stylus CX4600" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" -msgstr "EPSON Stylus CX4600" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 msgid "EPSON Stylus CX5100" msgstr "EPSON Stylus CX5100" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 msgid "EPSON Stylus CX5200" msgstr "EPSON Stylus CX5200" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 msgid "EPSON Stylus CX5300" msgstr "EPSON Stylus CX5300" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 msgid "EPSON Stylus CX5400" msgstr "EPSON Stylus CX5400" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "EPSON Stylus CX6500" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" -msgstr "EPSON Stylus CX1500" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 msgid "EPSON Stylus CX6300" msgstr "EPSON Stylus CX6300" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 msgid "EPSON Stylus CX6400" msgstr "EPSON Stylus CX6400" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 msgid "EPSON Stylus CX6500" msgstr "EPSON Stylus CX6500" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 msgid "EPSON Stylus CX6600" msgstr "EPSON Stylus CX6600" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" -msgstr "EPSON Stylus CX8300" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 msgid "EPSON Stylus CX8300" msgstr "EPSON Stylus CX8300" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 msgid "EPSON Stylus CX8400" msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "EPSON Stylus CX3500" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "EPSON Stylus CX3200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "EPSON Stylus C50" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "EPSON CL-700" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "EPSON CL-750" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "EPSON CL-760" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "EPSON EM-900C" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "EPSON EM-900C" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "EPSON EM-930C" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "EPSON MC-2000" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "EPSON MC-5000" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "EPSON MC-7000" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "EPSON MC-9000" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "EPSON MC-10000" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "EPSON MJ-930C" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "EPSON MJ-5100C" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "EPSON MJ-6000C" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "EPSON MJ-8000C" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "EPSON PM-700C" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "EPSON PM-730C" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "EPSON PM-740C" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "EPSON PM-750C" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "EPSON PM-760C" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "EPSON PM-770C" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "EPSON PM-780C" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "EPSON PM-790PT" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "EPSON PM-800C" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "EPSON PM-850PT" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "EPSON PM-870C" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "EPSON PM-880C" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "EPSON PM-930C" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "EPSON PM-940C" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "EPSON PM-950C" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "EPSON PM-970C" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "EPSON PM-980C" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "EPSON PM-2000C" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "EPSON PM-2200C" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "EPSON PM-3000C" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "EPSON PM-3300C" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "EPSON PM-3500C" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "EPSON PM-3700C" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "EPSON PM-4000PX" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "EPSON PM-5000C" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "EPSON PM-7000C" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "EPSON PM-9000C" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "EPSON PM-10000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "EPSON PM-9000C" + +#: src/main/xmli18n-tmp.h:379 msgid "EPSON PM-D750" msgstr "EPSON PM-D750" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 msgid "EPSON PM-D770" msgstr "EPSON PM-D770" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 msgid "EPSON PM-D1000" msgstr "EPSON PM-D1000" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 msgid "EPSON PM-G700" msgstr "EPSON PM-G700" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 msgid "EPSON PM-G720" msgstr "EPSON PM-G720" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 msgid "EPSON PM-G800" msgstr "EPSON PM-G800" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 msgid "EPSON PM-G820" msgstr "EPSON PM-G820" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "EPSON PX-V600" + +#: src/main/xmli18n-tmp.h:387 msgid "EPSON PX-G900" msgstr "EPSON PX-G900" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 msgid "EPSON PX-G920" msgstr "EPSON PX-G920" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 msgid "EPSON PX-G5000" msgstr "EPSON PX-G5000" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 msgid "EPSON PX-V500" msgstr "EPSON PX-V500" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 msgid "EPSON PX-V600" msgstr "EPSON PX-V600" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "EPSON PX-V500" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "EPSON PX-7000" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "HP DesignJet 2500C" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "HP DesignJet 3500C" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "HP DeskJet 600/600C" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "HP DeskJet 600 series" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "HP DeskJet 690 series" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "HP DeskJet 900 series" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "HP DeskJet 2000 series" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "HP DeskJet 2500 series" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "HP LaserJet II series" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "HP LaserJet IIP series" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "HP LaserJet III series" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "HP LaserJet 4 series" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "HP LaserJet 5 series" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "HP LaserJet 6 series" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "Olympus P200" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "Olympus P400" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "Olympus P440" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 #, fuzzy msgid "Sony UP-DR150" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "Fujifilm Printpix CX-400" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "Fujifilm Printpix CX-550" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "RAW DATA 16 bit" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "RAW DATA 8 bit" @@ -4104,30 +4184,30 @@ msgstr "S msgid "Restore Previous" msgstr "Genskab forrige" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "O.k" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Annullér" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Udskriv v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4135,7 +4215,7 @@ msgstr "" " Print og\n" "gem opsætning" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4143,15 +4223,15 @@ msgstr "" " Gem\n" "opsætning" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Udskriv" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Smugkig" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4175,73 +4255,73 @@ msgstr "" "Hvis du trykker på en anden musetaste mens du trækker med musen, vil " "billedet returnere til dets oprindelig position." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 msgid "Paper Size" msgstr "Papirstørrelse" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "Vis alle papirstørrelser" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Størrelser:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Bredde:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Bredden af det papir der skal udskrives på" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Højde:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Højden af det papir der skal udskrives på" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 msgid "Automatic Paper Size" msgstr "Automatisk papirstørrelse" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "Antal kopier" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Vælg antal kopier; skal være mellem 1 og 100" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 msgid "Image Position" msgstr "Billedposition" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portræt" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Tværformat" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Vendt op/ned" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Tværformat vendt op/ned" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4249,119 +4329,119 @@ msgstr "" "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/" "ned" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Venstre:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Afstand fra venstre side af arket til billedet" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Højre:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Afstand fra venstre papiretkant til højre side af billedet" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Afstand fra højre papirkant til billedet" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Øverst:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Afstand fra toppen af arket til billedet" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Nederst:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 msgid "Distance from the top of the paper to bottom of the image" msgstr "Afstand fra toppen af arket til bunden af billedet" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Afstand fra den nederste kant af arket til billedet" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centrér:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 msgid "Horizontal" msgstr "Vandret" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centrér billedet i vandret på papiret" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Begge" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centrér billedet på papiret" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 msgid "Vertical" msgstr "Lodret" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centrér billedet i lodret på papiret" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Indstil printer" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 msgid "Printer Make:" msgstr "Printer mærke:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 msgid "Select the make of your printer" msgstr "Vælg dit printermærke" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Printermodel:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Vælg din printermodel" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD-fil:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Angiv korrekt PPD filnavn for printeren" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Bladr igennem" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Vælg korrekt PPD filnavn for printeren" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -4369,48 +4449,48 @@ msgstr "" "Vælg navnet på uddatakøen (hverken type eller model af printer) som du " "ønsker at printe til" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 msgid "Printer Queue:" msgstr "Printerkø:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "Angiv den korrekte kommando til printning på din printer. " -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "Angiv hvilken fil du vil skrive til. " -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 msgid "File to print to" msgstr "Fil der skal skrives til" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 msgid "Print To File" msgstr "Udskriv til fil" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definér ny printer" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Printernavn:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Angiv et navn til denne logiske printer" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 msgid "About Gutenprint " msgstr "Om Gutenprint" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "Gutenprint Version " msgstr "Gutenprint version" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4454,11 +4534,11 @@ msgstr "" "med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n" "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Printer indstillinger" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4466,11 +4546,11 @@ msgstr "" "Vælg navnet på printeren (hverken type eller model af printer) som du ønsker " "at udskrive til" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Opsætning printer..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4478,11 +4558,11 @@ msgstr "" "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til " "denne printer" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Ny printer..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4490,23 +4570,23 @@ msgstr "" "Definer en ny logisk printer. Dette kan bruges til at navngive en samling af " "indstillinger, som du ønsker at huske til senere brug." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 msgid "Image Size" msgstr "Billedstørrelse" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Skalering:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Angiv skalering (størrelse) af billedet" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "Skalér med:" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4514,31 +4594,31 @@ msgstr "" "Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af " "udskriftspunkter pr. tomme" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Skalér udskriften til arkstørrelsen" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Skalér udskriften til antal punkter pr. tomme" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Angiv bredden af udskriften" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Angiv højden på udskriften" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4546,64 +4626,64 @@ msgstr "" "Brug original\n" "billedstørrelse" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Sætter udskriftsstørrelse til størrelsen på billedet" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Udskrifts-farvejustering" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Sæt til standardværdier" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Luk" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Smugkig af billede" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "Vis udskriftskanaler:" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 msgid "Output" msgstr "Udskrift" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Udskriftstype:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Vælg den ønskede udskriftstype" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Justér udskrift..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 msgid "Size Units:" msgstr "Mål-enhed:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Enheder:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Vælg basisenhed for målangivelse ved printning" @@ -4733,15 +4813,15 @@ msgstr "Danish" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "Nej" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "Ja" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "Finjustering" @@ -5015,18 +5095,19 @@ msgstr "L msgid "Cannot read from %s: %s\n" msgstr "Kan ikke læse fra %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Kan ikke åbne %s læse/skrive: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Kan ikke skrive til %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5035,7 +5116,8 @@ msgstr "" "\n" "Kan ikke skrive til %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5055,83 +5137,83 @@ msgstr "" "Kan ikke detektere printertype.\n" "Brug -m for at specificere din printermodel.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "Ukendt" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "blækniveauer" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "status" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, c-format -msgid "Cannot identify printer!\n" -msgstr "Kan ikke identificere printeren!\n" - -#: src/escputil/escputil.c:927 -#, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Printeren understøtter ikke listning af blæk typer!\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Blæk farve" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Procent tilbage" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Printeren understøtter ikke listning af blæk typer!\n" + +#: src/escputil/escputil.c:1144 #, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" "Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "Del nummer" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "Dato" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, c-format msgid "Cannot identify printer model.\n" msgstr "Kan ikke identificere printermodel.\n" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Renser hoveder...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5209,7 +5291,7 @@ msgstr "" "processen løber.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5282,12 +5364,12 @@ msgstr "" "processen løber.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Ikke i stand til at sende kommando til printeren, afbryder.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5306,19 +5388,19 @@ msgstr "" "Du vil så blive bedt om at bekræfte dit valg.\n" "Hvad vil du gøre (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5327,19 +5409,19 @@ msgstr "" "O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n" "Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Gentager processen med at retten-ind.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5354,17 +5436,17 @@ msgstr "" "Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din " "printer:\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Klar til at gemme indstillingerne..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "mislykkedes!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5373,27 +5455,27 @@ msgstr "" "Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n" "processen.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "lykkedes!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Dine retten-ind indstillinger er blevet gemt i printeren.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Kommandoen blev ikke genkendt.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Afsluttende kommando blev ikke bekræftet.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5410,12 +5492,12 @@ msgstr "" "Placer et ark papir i printeren, og begynd retten-ind\n" "processen af print hovedet.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Tryk på enter-tasten for at fortsætte > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5425,42 +5507,42 @@ msgstr "" "Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n" "Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Gennemløb #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Indsæt et nyt ark papir.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Antal uden for givet område!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Jeg kan ikke tolke hvad du tastede!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Prøver at sætte retten-ind..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "lykkedes.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5474,7 +5556,7 @@ msgstr "" "Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n" "bedste kvalitet i printning.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Fejl i inddata\n" @@ -5620,5 +5702,14 @@ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgid "Red and Blue Ink Usage" +#~ msgstr "Brug af rødt og blåt blæk" + +#~ msgid "Amount of red and blue ink to use" +#~ msgstr "Mængde af rødt og blåt blæk der skal bruges" + #~ msgid "unknown" #~ msgstr "ukendt" + +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Kan ikke identificere printeren!\n" diff --git a/po/de.gmo b/po/de.gmo index 6dbdcf1..3e4e84f 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d65f7cd..a18eca9 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-09-05 21:20MET\n" "Last-Translator: Olaf Klemke \n" "Language-Team: deutsch \n" @@ -16,6 +16,7 @@ msgstr "" "X-Generator: KBabel 0.9.6\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Zurücksetzen" @@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400×600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Normalpapier" @@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA" msgstr "Normalpapier" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Folie" @@ -347,9 +348,10 @@ msgid "Photo Paper Pro" msgstr "Foto Papier Pro" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Anderes" @@ -413,7 +415,7 @@ msgstr "in welchem Schacht ist das Druckmedium" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Auflösung" @@ -554,9 +556,9 @@ msgstr "helles Cyan" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -574,8 +576,8 @@ msgid "Light Yellow Transition" msgstr "helles Cyan" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -605,12 +607,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Schwarz" @@ -630,14 +634,14 @@ msgstr "Foto CcMmY Farbe" msgid "Photo CcMmYK Color" msgstr "Foto CcMmYK Farbe" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Farbe" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -678,8 +682,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Drucken" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Graustufen" @@ -840,12 +844,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -854,12 +860,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -868,12 +876,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Gelb" @@ -882,9 +892,10 @@ msgstr "Gelb" msgid "Adjust the yellow gamma" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -893,8 +904,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -903,9 +914,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1145,7 +1157,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1236,135 +1248,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Vorschub" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manuell" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Drucke in Datei?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "autom. Auswahl" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Höhe:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Foto" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Sieben Farb Foto" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Sechs Farben Foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "helles Cyan" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "helles Magenta" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Schwarz" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Gelb" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Mattes Papier" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Foto Papier" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Glossy Film" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Schwarz" @@ -1611,87 +1634,79 @@ msgstr "helles Cyan" msgid "Medium Gray Transition" msgstr "helles Cyan" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Ausgabeart:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Drucke in Datei?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Ausgabeart:" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Größe" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Drucker unterstützt keine Rohdatenausgabe\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n" @@ -1745,104 +1760,105 @@ msgid "test print" msgstr "Probeausdruck" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Vier Farben Standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Aus drei Farben gemischt" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Sechs Farben Foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Foto aus fünf Farben gemischt " -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Glossy Film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Umschlag" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Mattes Papier" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Inkjet Papier" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Photo Quality Inkjet Papier" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Foto Papier" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Premium Glossy Foto Papier" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Premium Glanz Foto Papier" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Photo Quality Glossy Papier" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford schweres Papier" @@ -1850,8 +1866,8 @@ msgstr "Ilford schweres Papier" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1991,8 +2007,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD Datei:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD Datei?" @@ -2001,177 +2017,177 @@ msgstr "PPD Datei?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "zweistufig Grau" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "zweistufig Grau" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Aus sechs Farben gemischt " -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "einfarbige Rohausgabe" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "zweifarbige Rohausgabe" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 msgid "Four Color Raw" msgstr "vierfarbige Rohausgabe" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "vierfarbige Rohausgabe" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 msgid "Six Color Raw" msgstr "Sechsfarbige Rohausgabe" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Aus sechs Farben gemischt " -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 msgid "Seven Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Sechsfarbige Rohausgabe" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Normalpapier Schnelleinzug" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkarte" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "Durchlichtfolie" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Mattes Papier" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Premium Glossy Foto Papier" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Normalpapier" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Mattes Papier" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2229,88 +2245,99 @@ msgstr "1200 DPI hohe Qualit msgid "720 DPI Highest Quality" msgstr "1200 DPI höchste Qualität" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1200 DPI höchste Qualität" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1200 DPI höchste Qualität" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Drucker Name:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Drucker Name:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Helligkeit:" @@ -3578,610 +3605,654 @@ msgid "EPSON Stylus CX3800" msgstr "" #: src/main/xmli18n-tmp.h:304 -msgid "EPSON Stylus CX3810" +msgid "EPSON Stylus CX3805" msgstr "" #: src/main/xmli18n-tmp.h:305 -msgid "EPSON Stylus CX4200" +msgid "EPSON Stylus CX3810" msgstr "" #: src/main/xmli18n-tmp.h:306 -msgid "EPSON Stylus CX4600" +msgid "EPSON Stylus CX4100" msgstr "" #: src/main/xmli18n-tmp.h:307 -msgid "EPSON Stylus CX4700" +msgid "EPSON Stylus CX4200" msgstr "" #: src/main/xmli18n-tmp.h:308 -msgid "EPSON Stylus CX4800" +msgid "EPSON Stylus CX4500" msgstr "" #: src/main/xmli18n-tmp.h:309 -msgid "EPSON Stylus CX5100" +msgid "EPSON Stylus CX4600" msgstr "" #: src/main/xmli18n-tmp.h:310 -msgid "EPSON Stylus CX5200" +msgid "EPSON Stylus CX4700" msgstr "" #: src/main/xmli18n-tmp.h:311 -msgid "EPSON Stylus CX5300" +msgid "EPSON Stylus CX4800" msgstr "" #: src/main/xmli18n-tmp.h:312 -msgid "EPSON Stylus CX5400" +msgid "EPSON Stylus CX5100" msgstr "" #: src/main/xmli18n-tmp.h:313 -msgid "EPSON Stylus CX5800" +msgid "EPSON Stylus CX5200" msgstr "" #: src/main/xmli18n-tmp.h:314 -msgid "EPSON Stylus CX6300" +msgid "EPSON Stylus CX5300" msgstr "" #: src/main/xmli18n-tmp.h:315 -msgid "EPSON Stylus CX6400" +msgid "EPSON Stylus CX5400" msgstr "" #: src/main/xmli18n-tmp.h:316 -msgid "EPSON Stylus CX6500" +msgid "EPSON Stylus CX5700" msgstr "" #: src/main/xmli18n-tmp.h:317 -msgid "EPSON Stylus CX6600" +msgid "EPSON Stylus CX5800" msgstr "" #: src/main/xmli18n-tmp.h:318 -msgid "EPSON Stylus CX7700" +msgid "EPSON Stylus CX6300" msgstr "" #: src/main/xmli18n-tmp.h:319 -msgid "EPSON Stylus CX7800" +msgid "EPSON Stylus CX6400" msgstr "" #: src/main/xmli18n-tmp.h:320 -msgid "EPSON Stylus CX8300" +msgid "EPSON Stylus CX6500" msgstr "" #: src/main/xmli18n-tmp.h:321 -msgid "EPSON Stylus CX8400" +msgid "EPSON Stylus CX6600" msgstr "" #: src/main/xmli18n-tmp.h:322 -msgid "EPSON Stylus D68" +msgid "EPSON Stylus CX7700" msgstr "" #: src/main/xmli18n-tmp.h:323 -msgid "EPSON Stylus D88" +msgid "EPSON Stylus CX7800" msgstr "" #: src/main/xmli18n-tmp.h:324 -msgid "EPSON Stylus DX3800" +msgid "EPSON Stylus CX8300" msgstr "" #: src/main/xmli18n-tmp.h:325 -msgid "EPSON Stylus DX3850" +msgid "EPSON Stylus CX8400" msgstr "" #: src/main/xmli18n-tmp.h:326 -msgid "EPSON Stylus DX4200" +msgid "EPSON Stylus D68" msgstr "" #: src/main/xmli18n-tmp.h:327 -msgid "EPSON Stylus DX4800" +msgid "EPSON Stylus D88" msgstr "" #: src/main/xmli18n-tmp.h:328 -msgid "EPSON CL-700" +msgid "EPSON Stylus DX3800" msgstr "" #: src/main/xmli18n-tmp.h:329 -msgid "EPSON CL-750" +msgid "EPSON Stylus DX3850" msgstr "" #: src/main/xmli18n-tmp.h:330 -msgid "EPSON CL-760" +msgid "EPSON Stylus DX4200" msgstr "" #: src/main/xmli18n-tmp.h:331 -msgid "EPSON EM-900C" +msgid "EPSON Stylus DX4250" msgstr "" #: src/main/xmli18n-tmp.h:332 -msgid "EPSON EM-930C" +msgid "EPSON Stylus DX4800" msgstr "" #: src/main/xmli18n-tmp.h:333 -msgid "EPSON MC-2000" +msgid "EPSON PictureMate" msgstr "" #: src/main/xmli18n-tmp.h:334 -msgid "EPSON MC-5000" +msgid "EPSON PictureMate Deluxe" msgstr "" #: src/main/xmli18n-tmp.h:335 -msgid "EPSON MC-7000" +msgid "EPSON CL-700" msgstr "" #: src/main/xmli18n-tmp.h:336 -msgid "EPSON MC-9000" +msgid "EPSON CL-750" msgstr "" #: src/main/xmli18n-tmp.h:337 -msgid "EPSON MC-10000" +msgid "EPSON CL-760" msgstr "" #: src/main/xmli18n-tmp.h:338 -msgid "EPSON MJ-930C" +msgid "EPSON E-100" msgstr "" #: src/main/xmli18n-tmp.h:339 -msgid "EPSON MJ-5100C" +msgid "EPSON EM-900C" msgstr "" #: src/main/xmli18n-tmp.h:340 -msgid "EPSON MJ-6000C" +msgid "EPSON EM-930C" msgstr "" #: src/main/xmli18n-tmp.h:341 -msgid "EPSON MJ-8000C" +msgid "EPSON MC-2000" msgstr "" #: src/main/xmli18n-tmp.h:342 -msgid "EPSON PM-700C" +msgid "EPSON MC-5000" msgstr "" #: src/main/xmli18n-tmp.h:343 -msgid "EPSON PM-730C" +msgid "EPSON MC-7000" msgstr "" #: src/main/xmli18n-tmp.h:344 -msgid "EPSON PM-740C" +msgid "EPSON MC-9000" msgstr "" #: src/main/xmli18n-tmp.h:345 -msgid "EPSON PM-750C" +msgid "EPSON MC-10000" msgstr "" #: src/main/xmli18n-tmp.h:346 -msgid "EPSON PM-760C" +msgid "EPSON MJ-930C" msgstr "" #: src/main/xmli18n-tmp.h:347 -msgid "EPSON PM-770C" +msgid "EPSON MJ-5100C" msgstr "" #: src/main/xmli18n-tmp.h:348 -msgid "EPSON PM-780C" +msgid "EPSON MJ-6000C" msgstr "" #: src/main/xmli18n-tmp.h:349 -msgid "EPSON PM-790PT" +msgid "EPSON MJ-8000C" msgstr "" #: src/main/xmli18n-tmp.h:350 -msgid "EPSON PM-800C" +msgid "EPSON PM-700C" msgstr "" #: src/main/xmli18n-tmp.h:351 -msgid "EPSON PM-850PT" +msgid "EPSON PM-730C" msgstr "" #: src/main/xmli18n-tmp.h:352 -msgid "EPSON PM-870C" +msgid "EPSON PM-740C" msgstr "" #: src/main/xmli18n-tmp.h:353 -msgid "EPSON PM-880C" +msgid "EPSON PM-750C" msgstr "" #: src/main/xmli18n-tmp.h:354 -msgid "EPSON PM-930C" +msgid "EPSON PM-760C" msgstr "" #: src/main/xmli18n-tmp.h:355 -msgid "EPSON PM-940C" +msgid "EPSON PM-770C" msgstr "" #: src/main/xmli18n-tmp.h:356 -msgid "EPSON PM-950C" +msgid "EPSON PM-780C" msgstr "" #: src/main/xmli18n-tmp.h:357 -msgid "EPSON PM-970C" +msgid "EPSON PM-790PT" msgstr "" #: src/main/xmli18n-tmp.h:358 -msgid "EPSON PM-980C" +msgid "EPSON PM-800C" msgstr "" #: src/main/xmli18n-tmp.h:359 -msgid "EPSON PM-2000C" +msgid "EPSON PM-850PT" msgstr "" #: src/main/xmli18n-tmp.h:360 -msgid "EPSON PM-2200C" +msgid "EPSON PM-870C" msgstr "" #: src/main/xmli18n-tmp.h:361 -msgid "EPSON PM-3000C" +msgid "EPSON PM-880C" msgstr "" #: src/main/xmli18n-tmp.h:362 -msgid "EPSON PM-3300C" +msgid "EPSON PM-930C" msgstr "" #: src/main/xmli18n-tmp.h:363 -msgid "EPSON PM-3500C" +msgid "EPSON PM-940C" msgstr "" #: src/main/xmli18n-tmp.h:364 -msgid "EPSON PM-3700C" +msgid "EPSON PM-950C" msgstr "" #: src/main/xmli18n-tmp.h:365 -msgid "EPSON PM-4000PX" +msgid "EPSON PM-970C" msgstr "" #: src/main/xmli18n-tmp.h:366 -msgid "EPSON PM-5000C" +msgid "EPSON PM-980C" msgstr "" #: src/main/xmli18n-tmp.h:367 -msgid "EPSON PM-7000C" +msgid "EPSON PM-2000C" msgstr "" #: src/main/xmli18n-tmp.h:368 -msgid "EPSON PM-9000C" +msgid "EPSON PM-2200C" msgstr "" #: src/main/xmli18n-tmp.h:369 -msgid "EPSON PM-10000" +msgid "EPSON PM-3000C" msgstr "" #: src/main/xmli18n-tmp.h:370 -msgid "EPSON PM-D750" +msgid "EPSON PM-3300C" msgstr "" #: src/main/xmli18n-tmp.h:371 -msgid "EPSON PM-D770" +msgid "EPSON PM-3500C" msgstr "" #: src/main/xmli18n-tmp.h:372 -msgid "EPSON PM-D1000" +msgid "EPSON PM-3700C" msgstr "" #: src/main/xmli18n-tmp.h:373 -msgid "EPSON PM-G700" +msgid "EPSON PM-4000PX" msgstr "" #: src/main/xmli18n-tmp.h:374 -msgid "EPSON PM-G720" +msgid "EPSON PM-5000C" msgstr "" #: src/main/xmli18n-tmp.h:375 -msgid "EPSON PM-G800" +msgid "EPSON PM-7000C" msgstr "" #: src/main/xmli18n-tmp.h:376 -msgid "EPSON PM-G820" +msgid "EPSON PM-9000C" msgstr "" #: src/main/xmli18n-tmp.h:377 -msgid "EPSON PX-G900" +msgid "EPSON PM-10000" msgstr "" #: src/main/xmli18n-tmp.h:378 -msgid "EPSON PX-G920" +msgid "EPSON PM-A900" msgstr "" #: src/main/xmli18n-tmp.h:379 -msgid "EPSON PX-G5000" +msgid "EPSON PM-D750" msgstr "" #: src/main/xmli18n-tmp.h:380 -msgid "EPSON PX-V500" +msgid "EPSON PM-D770" msgstr "" #: src/main/xmli18n-tmp.h:381 -msgid "EPSON PX-V600" +msgid "EPSON PM-D1000" msgstr "" #: src/main/xmli18n-tmp.h:382 -msgid "EPSON PX-7000" +msgid "EPSON PM-G700" msgstr "" #: src/main/xmli18n-tmp.h:383 -msgid "EPSON PX-9000" +msgid "EPSON PM-G720" msgstr "" #: src/main/xmli18n-tmp.h:384 -msgid "Apple Color StyleWriter 4100" +msgid "EPSON PM-G800" msgstr "" #: src/main/xmli18n-tmp.h:385 -msgid "Apple Color StyleWriter 4500" +msgid "EPSON PM-G820" msgstr "" #: src/main/xmli18n-tmp.h:386 -msgid "Apple Color StyleWriter 6500" +msgid "EPSON PX-A650" msgstr "" #: src/main/xmli18n-tmp.h:387 -msgid "HP DeskJet 340" +msgid "EPSON PX-G900" msgstr "" #: src/main/xmli18n-tmp.h:388 -msgid "HP DeskJet 400" +msgid "EPSON PX-G920" msgstr "" #: src/main/xmli18n-tmp.h:389 -msgid "HP DeskJet 500" +msgid "EPSON PX-G5000" msgstr "" #: src/main/xmli18n-tmp.h:390 -msgid "HP DesignJet 230" +msgid "EPSON PX-V500" msgstr "" #: src/main/xmli18n-tmp.h:391 -msgid "HP DesignJet 250C" +msgid "EPSON PX-V600" msgstr "" #: src/main/xmli18n-tmp.h:392 -msgid "HP DesignJet 700" +msgid "EPSON PX-5500" msgstr "" #: src/main/xmli18n-tmp.h:393 -msgid "HP DesignJet 750C" +msgid "EPSON PX-7000" msgstr "" #: src/main/xmli18n-tmp.h:394 -msgid "HP DesignJet 2500C" +msgid "EPSON PX-9000" msgstr "" #: src/main/xmli18n-tmp.h:395 -msgid "HP DesignJet 3500C" +msgid "Apple Color StyleWriter 4100" msgstr "" #: src/main/xmli18n-tmp.h:396 -msgid "HP DesignJet 430" +msgid "Apple Color StyleWriter 4500" msgstr "" #: src/main/xmli18n-tmp.h:397 -msgid "HP DesignJet 450C" +msgid "Apple Color StyleWriter 6500" msgstr "" #: src/main/xmli18n-tmp.h:398 -msgid "HP DesignJet 455CA" +msgid "HP DeskJet 340" msgstr "" #: src/main/xmli18n-tmp.h:399 -msgid "HP DesignJet 488CA" +msgid "HP DeskJet 400" msgstr "" #: src/main/xmli18n-tmp.h:400 -msgid "HP DeskJet 500C" +msgid "HP DeskJet 500" msgstr "" #: src/main/xmli18n-tmp.h:401 -msgid "HP DeskJet 520" +msgid "HP DesignJet 230" msgstr "" #: src/main/xmli18n-tmp.h:402 -msgid "HP DeskJet 540C" +msgid "HP DesignJet 250C" msgstr "" #: src/main/xmli18n-tmp.h:403 -msgid "HP DeskJet 550C" +msgid "HP DesignJet 700" msgstr "" #: src/main/xmli18n-tmp.h:404 -msgid "HP DeskJet 560C" +msgid "HP DesignJet 750C" msgstr "" #: src/main/xmli18n-tmp.h:405 -msgid "HP DeskJet 600/600C" +msgid "HP DesignJet 2500C" msgstr "" #: src/main/xmli18n-tmp.h:406 -msgid "HP DeskJet 600 series" +msgid "HP DesignJet 3500C" msgstr "" #: src/main/xmli18n-tmp.h:407 -msgid "HP DeskJet 690 series" +msgid "HP DesignJet 430" msgstr "" #: src/main/xmli18n-tmp.h:408 -msgid "HP DeskJet 810C" +msgid "HP DesignJet 450C" msgstr "" #: src/main/xmli18n-tmp.h:409 -msgid "HP DeskJet 812C" +msgid "HP DesignJet 455CA" msgstr "" #: src/main/xmli18n-tmp.h:410 -msgid "HP DeskJet 840C" +msgid "HP DesignJet 488CA" msgstr "" #: src/main/xmli18n-tmp.h:411 -msgid "HP DeskJet 842C" +msgid "HP DeskJet 500C" msgstr "" #: src/main/xmli18n-tmp.h:412 -msgid "HP DeskJet 845C" +msgid "HP DeskJet 520" msgstr "" #: src/main/xmli18n-tmp.h:413 -msgid "HP DeskJet 850C" +msgid "HP DeskJet 540C" msgstr "" #: src/main/xmli18n-tmp.h:414 -msgid "HP DeskJet 855C" +msgid "HP DeskJet 550C" msgstr "" #: src/main/xmli18n-tmp.h:415 -msgid "HP DeskJet 870C" +msgid "HP DeskJet 560C" msgstr "" #: src/main/xmli18n-tmp.h:416 -msgid "HP DeskJet 890C" +msgid "HP DeskJet 600/600C" msgstr "" #: src/main/xmli18n-tmp.h:417 -msgid "HP DeskJet 895C" +msgid "HP DeskJet 600 series" msgstr "" #: src/main/xmli18n-tmp.h:418 -msgid "HP DeskJet 900 series" +msgid "HP DeskJet 690 series" msgstr "" #: src/main/xmli18n-tmp.h:419 -msgid "HP DeskJet 1100C" +msgid "HP DeskJet 810C" msgstr "" #: src/main/xmli18n-tmp.h:420 -msgid "HP DeskJet 1120C" +msgid "HP DeskJet 812C" msgstr "" #: src/main/xmli18n-tmp.h:421 -msgid "HP DeskJet 1200C" +msgid "HP DeskJet 840C" msgstr "" #: src/main/xmli18n-tmp.h:422 -msgid "HP DeskJet 1220C" +msgid "HP DeskJet 842C" msgstr "" #: src/main/xmli18n-tmp.h:423 -msgid "HP DeskJet 1600C" +msgid "HP DeskJet 845C" msgstr "" #: src/main/xmli18n-tmp.h:424 -msgid "HP DeskJet 2000 series" +msgid "HP DeskJet 850C" msgstr "" #: src/main/xmli18n-tmp.h:425 -msgid "HP DeskJet 2500 series" +msgid "HP DeskJet 855C" msgstr "" #: src/main/xmli18n-tmp.h:426 -msgid "HP PhotoSmart P1000" +msgid "HP DeskJet 870C" msgstr "" #: src/main/xmli18n-tmp.h:427 -msgid "HP PhotoSmart P1100" +msgid "HP DeskJet 890C" msgstr "" #: src/main/xmli18n-tmp.h:428 -msgid "HP LaserJet II series" +msgid "HP DeskJet 895C" msgstr "" #: src/main/xmli18n-tmp.h:429 -msgid "HP LaserJet IIP series" +msgid "HP DeskJet 900 series" msgstr "" #: src/main/xmli18n-tmp.h:430 -msgid "HP LaserJet III series" +msgid "HP DeskJet 1100C" msgstr "" #: src/main/xmli18n-tmp.h:431 -msgid "HP LaserJet 4 series" +msgid "HP DeskJet 1120C" msgstr "" #: src/main/xmli18n-tmp.h:432 -msgid "HP LaserJet 4L" +msgid "HP DeskJet 1200C" msgstr "" #: src/main/xmli18n-tmp.h:433 -msgid "HP LaserJet 4V" +msgid "HP DeskJet 1220C" msgstr "" #: src/main/xmli18n-tmp.h:434 -msgid "HP LaserJet 4Si" +msgid "HP DeskJet 1600C" msgstr "" #: src/main/xmli18n-tmp.h:435 -msgid "HP LaserJet 5 series" +msgid "HP DeskJet 2000 series" msgstr "" #: src/main/xmli18n-tmp.h:436 -msgid "HP LaserJet 5Si" +msgid "HP DeskJet 2500 series" msgstr "" #: src/main/xmli18n-tmp.h:437 -msgid "HP LaserJet 6 series" +msgid "HP PhotoSmart P1000" msgstr "" #: src/main/xmli18n-tmp.h:438 -msgid "Lexmark 4076" +msgid "HP PhotoSmart P1100" msgstr "" #: src/main/xmli18n-tmp.h:439 -msgid "Lexmark Z42" +msgid "HP LaserJet II series" msgstr "" #: src/main/xmli18n-tmp.h:440 -msgid "Lexmark Z43" +msgid "HP LaserJet IIP series" msgstr "" #: src/main/xmli18n-tmp.h:441 -msgid "Lexmark Z52" +msgid "HP LaserJet III series" msgstr "" #: src/main/xmli18n-tmp.h:442 -msgid "Lexmark Z53" +msgid "HP LaserJet 4 series" msgstr "" #: src/main/xmli18n-tmp.h:443 -msgid "Olympus P10" +msgid "HP LaserJet 4L" msgstr "" #: src/main/xmli18n-tmp.h:444 -msgid "Olympus P200" +msgid "HP LaserJet 4V" msgstr "" #: src/main/xmli18n-tmp.h:445 -msgid "Olympus P300" +msgid "HP LaserJet 4Si" msgstr "" #: src/main/xmli18n-tmp.h:446 -msgid "Olympus P400" +msgid "HP LaserJet 5 series" msgstr "" #: src/main/xmli18n-tmp.h:447 -msgid "Olympus P440" +msgid "HP LaserJet 5Si" msgstr "" #: src/main/xmli18n-tmp.h:448 -msgid "Canon CP100" +msgid "HP LaserJet 6 series" msgstr "" #: src/main/xmli18n-tmp.h:449 -msgid "Canon CP220" +msgid "Lexmark 4076" msgstr "" #: src/main/xmli18n-tmp.h:450 -msgid "Sony UP-DP10" +msgid "Lexmark Z42" msgstr "" #: src/main/xmli18n-tmp.h:451 -msgid "Sony UP-DR150" +msgid "Lexmark Z43" msgstr "" #: src/main/xmli18n-tmp.h:452 -msgid "Fujifilm Printpix CX-400" +msgid "Lexmark Z52" msgstr "" #: src/main/xmli18n-tmp.h:453 -msgid "Fujifilm Printpix CX-550" +msgid "Lexmark Z53" msgstr "" #: src/main/xmli18n-tmp.h:454 -msgid "RAW DATA 16 bit" +msgid "Olympus P10" msgstr "" #: src/main/xmli18n-tmp.h:455 +msgid "Olympus P200" +msgstr "" + +#: src/main/xmli18n-tmp.h:456 +msgid "Olympus P300" +msgstr "" + +#: src/main/xmli18n-tmp.h:457 +msgid "Olympus P400" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 +msgid "Olympus P440" +msgstr "" + +#: src/main/xmli18n-tmp.h:459 +msgid "Canon CP100" +msgstr "" + +#: src/main/xmli18n-tmp.h:460 +msgid "Canon CP220" +msgstr "" + +#: src/main/xmli18n-tmp.h:461 +msgid "Sony UP-DP10" +msgstr "" + +#: src/main/xmli18n-tmp.h:462 +msgid "Sony UP-DR150" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 +msgid "Fujifilm Printpix CX-400" +msgstr "" + +#: src/main/xmli18n-tmp.h:464 +msgid "Fujifilm Printpix CX-550" +msgstr "" + +#: src/main/xmli18n-tmp.h:465 +msgid "RAW DATA 16 bit" +msgstr "" + +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4279,30 +4350,30 @@ msgstr "Zur msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Abbruch" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Drucke v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Über" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4310,7 +4381,7 @@ msgstr "" "Drucke und\n" "Sichere die Einstellungen" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4318,15 +4389,15 @@ msgstr "" "Sichere\n" "die Einstellungen" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Drucken" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Vorschau" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4349,76 +4420,76 @@ msgstr "" "Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild " "in seine Ausgangsposition zurück." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Größe" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Maße:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Breite:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Breite des Papiers" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Höhe:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Höhe des Papiers" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Größe" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Position" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Aufrecht" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Querformat" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "umgekehrt Aufrecht" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "umgekehrt Querformat" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4426,124 +4497,124 @@ msgstr "" "wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, " "umgekehrt Querformat" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Ausrichtung:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "links:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Entfernung vom linken Blattrand Bildrand" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "rechts:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Entfernung vom linken Blattrand zum rechten Bildrand" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Entfernung vom rechten Blattrand zum Bildrand" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Oben:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Entfernung vom oberen Blattrand zum Bildrand" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "unten:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Entfernung vom unteren Blattrand zum Bild" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Zentrieren:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Waagerecht" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Bild waagerecht auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Beides" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Bild auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "senkrecht" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Bild senkrecht auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Drucker einrichten" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Wählen sie ihr Druckermodel" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Druckermodel:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Wählen sie ihr Druckermodel" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD Datei:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Suchen" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4552,54 +4623,54 @@ msgstr "" "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, " "Modell...)" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "Probeausdruck" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Drucke in Datei?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Neuen Printer einrichten" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an." -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Über Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print Version " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4647,11 +4718,11 @@ msgstr "" "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n" "MA 02139, USA.\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Drucker Einstellungen" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4659,11 +4730,11 @@ msgstr "" "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, " "Modell...)" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Drucker einrichten..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4671,11 +4742,11 @@ msgstr "" "Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf " "diesem Drucker" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "neuer Drucker..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4683,24 +4754,24 @@ msgstr "" "neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung " "einen Namen geben und später unter diesem einfach aufrufen." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Größe" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Zoom:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Einstellung der Bildgröße" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4708,31 +4779,31 @@ msgstr "" "Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen " "sollen" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Prozent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Bildgröße an Seitengröße anpassen" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Einstellen der Breite des Ausdrucks" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Einstellen der Höhe des Ausdrucks" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4740,68 +4811,68 @@ msgstr "" "Benutze originale\n" "Bildgröße" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Ausdruckgröße gleich Bildgröße" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Farbabstimmung" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Zurücksetzen" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Schließen" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Vorschau" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Ausgabeart:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Ausgabeart:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Wählen sie die gewüschte Ausgabeart:" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Ausgabeeinstellungen.." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Einheiten:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Einheiten:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Wählen sie die Basismaßeinheit für das Drucken" @@ -4942,15 +5013,15 @@ msgstr "German" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5229,18 +5300,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Kann nicht von %s: %s lesen.\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Kann %s nicht lesen/beschreiben: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Kann nicht auf %s: %s schreiben.\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5249,7 +5321,8 @@ msgstr "" "\n" "Kann auf %s: %s nicht schreiben\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5267,83 +5340,83 @@ msgstr "" "Kann den Druckertype nicht feststellen.\n" "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Kann die Meldungen vom Drucker nicht deuten.\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Drucker unterstützt keine Farbausgabe\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Farbtinte" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Prozent verbleibend" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Drucker unterstützt keine Farbausgabe\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" "Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Sie sollten nur ein Druckermodell angeben." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Reinige die Köpfe...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "Teste die Köpfe. Ist Papier im Drucker?\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5419,7 +5492,7 @@ msgstr "" "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5492,12 +5565,12 @@ msgstr "" "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5516,13 +5589,13 @@ msgstr "" "Sie werden um eine Bestätigung gebeten.\n" "Was möchten sie tun (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" @@ -5530,7 +5603,7 @@ msgstr "" "Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht " "sichern möchten\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5539,7 +5612,7 @@ msgstr "" "Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n" "Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5548,12 +5621,12 @@ msgstr "" "Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n" "wiederholen möchten:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Wiederhole die Kopf-Ausrichtung.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5568,17 +5641,17 @@ msgstr "" "Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n" "Drucker sichern möchten.\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Wie man die Einstellungen sichert..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "gescheitert!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5587,27 +5660,27 @@ msgstr "" "Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n" "die Kopf-Ausrichtung wiederholen. \n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "erledigt!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Unbekannter Befehl.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Der letzte Befehl wurde nicht bestätigt.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5623,12 +5696,12 @@ msgstr "" "\n" "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Drücken sie Eingabe um fortzufahren > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5640,42 +5713,42 @@ msgstr "" "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu " "wiederholen\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Durchgang #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Bitte legen sie ein neues Blatt ein.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Die Zahl ist ungültig!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Wie bitte ?????\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Beginne die Köpfe einzurichten..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "erledigt. \n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5688,7 +5761,7 @@ msgstr "" "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n" "Vorgang wiederholen.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Eingabefehler\n" @@ -5824,6 +5897,10 @@ msgstr "Unzul msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "Zeilensprung gescheitert bei % 0f \n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Kann die Meldungen vom Drucker nicht deuten.\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Stellen sie die Gelb-Balance ein" diff --git a/po/el.gmo b/po/el.gmo index d4b9a87..429ac50 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index df228e5..1b4c902 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2001-12-29 20:10+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" @@ -284,9 +285,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 #, fuzzy msgid "Plain Paper" msgstr "Êýñéá Óåëßäá" @@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA" msgstr "Êýñéá Óåëßäá" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 #, fuzzy msgid "Transparencies" msgstr "ÄéáöáíÝò" @@ -348,9 +349,10 @@ msgstr "" # #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "¶ëëá" @@ -416,7 +418,7 @@ msgstr "" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "ÁíÜëõóç" @@ -559,9 +561,9 @@ msgstr " #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -579,8 +581,8 @@ msgid "Light Yellow Transition" msgstr "ØéëÞ Âñï÷Þ" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -612,12 +614,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Ìáýñï" @@ -642,14 +646,14 @@ msgid "Photo CcMmYK Color" msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò" # -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "×ñþìá" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -691,8 +695,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Åêôýðùóç" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Êëßìáêá ôïõ ãêñé" @@ -854,12 +858,14 @@ msgstr " msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Êõáíü" @@ -868,12 +874,14 @@ msgstr " msgid "Adjust the cyan gamma" msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 #, fuzzy msgid "Magenta" msgstr "ìþâ" @@ -883,12 +891,14 @@ msgstr " msgid "Adjust the magenta gamma" msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Êßôñéíï" @@ -897,9 +907,10 @@ msgstr " msgid "Adjust the yellow gamma" msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -908,8 +919,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -918,9 +929,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1160,7 +1172,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1248,136 +1260,147 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Êáíïíéêü" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 #, fuzzy msgid "Roll Feed" msgstr "Ñüëïò" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Åã÷åéñßäéï" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Åêôýðùóç óå Áñ÷åßï" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "ÁðåðéëïãÞ" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "¾øïò:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Êñõðôïãñáößá" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Slashdot" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Slashdot" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Ìáýñï" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Êßôñéíï" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "×áñôß Ìáíßëá" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Êåßìåíá" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Ìáýñï" @@ -1623,88 +1646,80 @@ msgstr " msgid "Medium Gray Transition" msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Byte Åîüäïõ" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Åêôýðùóç óå Áñ÷åßï" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Byte Åîüäïõ" # -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "ÌÝãåèïò" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "360 DPI FOL2" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "360 DPI FOL2" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1759,107 +1774,108 @@ msgid "test print" msgstr "Ôßôëïé ðñïò åêôýðùóç" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 #, fuzzy msgid "Envelopes" msgstr "ÐñïãñáììáôéóôÝò" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 #, fuzzy msgid "Matte Paper" msgstr "×áñôß Ìáíßëá" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 #, fuzzy msgid "Photo Paper" msgstr "Êåßìåíá" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1867,8 +1883,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -2023,8 +2039,8 @@ msgstr "" msgid "PPDFile" msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: " -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr " Áñ÷åßï " @@ -2033,183 +2049,183 @@ msgstr " msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Êëßìáêá ôïõ ãêñé" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Êëßìáêá ôïõ ãêñé" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Slashdot" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 #, fuzzy msgid "Plain Paper Fast Load" msgstr "Êýñéá Óåëßäá" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 #, fuzzy msgid "Postcard" msgstr "Ôåëåõôáßá êáñôÝëá" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 #, fuzzy msgid "Back Light Film" msgstr "Åëáöñý ÷áëÜæé" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "×áñôß Ìáíßëá" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Êýñéá Óåëßäá" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "×áñôß Ìáíßëá" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2264,86 +2280,97 @@ msgstr "" msgid "720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "¼íïìá åêôõðùôÞ:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "¼íïìá åêôõðùôÞ:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Åñãáóßá" @@ -3786,645 +3813,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4528,39 +4608,39 @@ msgid "Restore Previous" msgstr "" # -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "ÅíôÜîåé" # -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Áêýñùóç" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, fuzzy, c-format msgid "%s -- Print v%s" msgstr "%s Ýêäïóç %s" # -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Ðåñß" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 #, fuzzy msgid "" "Print and\n" "Save Settings" msgstr "ÁðïèÞêåõóç Ñõèìßóåùí" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 #, fuzzy msgid "" "Save\n" @@ -4568,16 +4648,16 @@ msgid "" msgstr "ÁðïèÞêåõóç Ñõèìßóåùí" # -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Åêôýðùóç" # -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Ðñïåðéóêüðçóç" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4592,59 +4672,59 @@ msgid "" msgstr "" # -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "ÄéáóôÜóåéò:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "ÐëÜôïò:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 #, fuzzy msgid "Width of the paper that you wish to print to" msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "¾øïò:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 #, fuzzy msgid "Height of the paper that you wish to print to" msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå" # -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "ÈÝóç" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Áõôüìáôï" @@ -4652,215 +4732,215 @@ msgstr " # translated; if anyone knows what the term in the Greek version # of MSWindoze is and if it is better (or equally good), maybe we # would want to use that for consistency and for the sake of newbies? -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Ðïñôñáßôï" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Ïñéæüíôéïò" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 #, fuzzy msgid "Upside down" msgstr "ÁíÜðïäá" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Tïðßï" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 #, fuzzy msgid "Orientation:" msgstr "Ðñïóáíáôïëéóìüò" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "ÁñéóôåñÜ:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "ÄåîéÜ:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 #, fuzzy msgid "Distance from the left of the paper to the right of the image" msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "ÐÜíù:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "ÊÜôù:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 #, fuzzy msgid "Center:" msgstr "ÊÝíôñï" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "_Ïñéæüíôéá" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "" # -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Êáé ôá äýï" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 #, fuzzy msgid "Center the image on the paper" msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Êáôáêüñõ_öá" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 #, fuzzy msgid "Center the image vertically on the paper" msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Ñýèìéóç ÅêôõðùôÞ" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "¼íïìá åêôõðùôÞ:" # -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 #, fuzzy msgid "Printer Model:" msgstr "¼íïìá åêôõðùôÞ:" # -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 #, fuzzy msgid "Select your printer model" msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 #, fuzzy msgid "PPD File:" msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: " -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "" # -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Åîåñåýíçóç" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "¼íïìá åêôõðùôÞ:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "Ôßôëïé ðñïò åêôýðùóç" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Åêôýðùóç óå Áñ÷åßï" # -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 #, fuzzy msgid "Define New Printer" msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 #, fuzzy msgid "Printer Name:" msgstr "¼íïìá åêôõðùôÞ:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 #, fuzzy msgid "Enter the name you wish to give this logical printer" msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå." -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Óçìåßï ÐñïóÜñôçóçò: " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Åêôýðùóç óå: " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4884,171 +4964,171 @@ msgid "" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" msgstr "" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 #, fuzzy msgid "Printer Settings" msgstr "Ñõèìßóåéò ÅðéëïãÝá" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 #, fuzzy msgid "Setup Printer..." msgstr "Ñýèìéóç ÅêôõðùôÞ" -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" # -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 #, fuzzy msgid "New Printer..." msgstr "Åêôýðùóç..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "" # -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 #, fuzzy msgid "Scaling:" msgstr "ÁðïèÞêåõóç:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 #, fuzzy msgid "Set the scale (size) of the image" msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Ðïóïóôü" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 #, fuzzy msgid "Scale the print to the size of the page" msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" # -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 #, fuzzy msgid "PPI" msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 #, fuzzy msgid "Set the width of the print" msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 #, fuzzy msgid "Set the height of the print" msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 #, fuzzy msgid "" "Use Original\n" "Image Size" msgstr "Áñ÷éêü _ÌÝãåèïò" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 #, fuzzy msgid "Set the print size to the size of the image" msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 #, fuzzy msgid "Print Color Adjust" msgstr "Ðñùôåýùíôá ×ñþìáôá" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 #, fuzzy msgid "Set Defaults" msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" # -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Êëåßóéìï" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 #, fuzzy msgid "Image preview" msgstr "ÐáñáôçñçôÞò Åéêüíùí" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Byte Åîüäïõ" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 #, fuzzy msgid "Output Type:" msgstr "Byte Åîüäïõ" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 #, fuzzy msgid "Select the desired output type" msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "&ÌïíÜäåò:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 #, fuzzy msgid "Units:" msgstr "&ÌïíÜäåò:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 #, fuzzy msgid "Select the base unit of measurement for printing" msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç" @@ -5193,15 +5273,15 @@ msgstr "Greek" msgid "ISOLatin1" msgstr "ËÜôéí" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5381,25 +5461,27 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, fuzzy, c-format msgid "Cannot open %s read/write: %s\n" msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, fuzzy, c-format msgid "Cannot write to %s: %s\n" msgstr "ÅããñáöÞ áäýíáôç: %s" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, fuzzy, c-format msgid "" "\n" "Cannot write to %s: %s\n" msgstr "ÅããñáöÞ áäýíáôç: %s" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5414,84 +5496,84 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 -#, c-format -msgid "Obtaining %s requires using a raw device.\n" -msgstr "" - -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n" - #: src/escputil/escputil.c:927 #, c-format -msgid "Printer does not support listing ink types!\n" +msgid "Obtaining %s requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 #, fuzzy msgid "Ink color" msgstr " ÷ñþìá" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 #, fuzzy msgid "Percent remaining" msgstr "Åðß ôïéò åêáôü åëåýèåñï" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "" + +#: src/escputil/escputil.c:1144 #, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, fuzzy, c-format msgid "Cleaning heads...\n" msgstr "ÁíÜãíùóç åðéêåöáëßäùí..." -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5530,7 +5612,7 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5566,12 +5648,12 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5583,38 +5665,38 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" msgstr "" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, fuzzy, c-format msgid "Repeating the alignment process.\n" msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5624,44 +5706,44 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "" -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, fuzzy, c-format msgid "Unrecognized command.\n" msgstr "Üãíùóôï ÷ñþìá: %s" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5672,13 +5754,13 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 #, fuzzy msgid "Press enter to continue > " msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù." -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5686,43 +5768,43 @@ msgid "" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "" # -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, fuzzy, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå." -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, fuzzy, c-format msgid "Number out of range!\n" msgstr "Áñéèìüò Óåëßäùí" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, fuzzy, c-format msgid "I cannot understand what you typed!\n" msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. " -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, fuzzy, c-format msgid "Attempting to set alignment..." msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí" -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5731,7 +5813,7 @@ msgid "" "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, fuzzy, c-format msgid "Error in input\n" msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò" @@ -5869,6 +5951,10 @@ msgstr "" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Óôï êÝíôñï ôçò ïèüíçò" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index b0459a4..abedb69 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 f5b5aff..3bc5e5f 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2004-09-23 00:10+0100\n" "Last-Translator: Roger Leigh \n" "Language-Team: British English\n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 msgid "Default" msgstr "Default" @@ -262,9 +263,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400×2400 DPI DMT" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Plain Paper" @@ -274,9 +275,9 @@ msgid "Plain Paper PIXMA" msgstr "Plain Paper" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparencies" @@ -317,9 +318,10 @@ msgid "Photo Paper Pro" msgstr "Photo Paper Pro" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Other" @@ -379,7 +381,7 @@ msgstr "Source (input slot) of the media" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Resolution" @@ -517,9 +519,9 @@ msgstr "Light Cyan Transition" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "Advanced Ink Adjustment" @@ -535,8 +537,8 @@ msgid "Light Yellow Transition" msgstr "Light Yellow Transition" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "Off" @@ -566,12 +568,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Black" @@ -591,14 +595,14 @@ msgstr "Photo CcMmY Colour" msgid "Photo CcMmYK Color" msgstr "Photo CcMmYK Colour" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Colour" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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" @@ -636,8 +640,8 @@ msgstr "Raw" msgid "Pre-Dithered" msgstr "Pre-Dithered" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Grayscale" @@ -784,12 +788,14 @@ msgstr "AppGamma" msgid "Gamma value assumed by application" msgstr "Gamma value assumed by application" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -797,12 +803,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Adjust the cyan gamma" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -810,12 +818,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Adjust the magenta gamma" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Yellow" @@ -823,9 +833,10 @@ msgstr "Yellow" msgid "Adjust the yellow gamma" msgstr "Adjust the yellow gamma" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "Red" @@ -833,8 +844,8 @@ msgstr "Red" msgid "Adjust the red gamma" msgstr "Adjust the red gamma" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "Green" @@ -842,9 +853,10 @@ msgstr "Green" msgid "Adjust the green gamma" msgstr "Adjust the green gamma" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "Blue" @@ -1058,7 +1070,7 @@ msgstr "Gray Component Reduction" msgid "Gray component reduction curve" msgstr "Gray component reduction curve" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "Traditional Gutenprint colour conversion" @@ -1150,127 +1162,138 @@ msgstr "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Roll Feed" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "Roll Feed (cut each page)" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "Roll Feed (do not cut)" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 msgid "Manual Feed" msgstr "Manual Feed" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 msgid "Print to CD" msgstr "Print to CD" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "Cut Sheet Bin 1" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "Cut Sheet Bin 2" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "Cut Sheet Autoselect" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "Manual Selection" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Fast Economy" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "Economy" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "Draft" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 msgid "High" msgstr "High" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 msgid "Photo" msgstr "Photo" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra Photo" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "Best" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Light Cyan/Red" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Light Magenta/Blue" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Black" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Black/Dark Yellow" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Matte Paper" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Photo Paper" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "Gloss Optimiser" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Black" @@ -1508,81 +1531,73 @@ msgstr "Mid Gray Transition" msgid "Medium Gray Transition" msgstr "Medium Gray Transition" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "Full Manual Control" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "Automatic Setting Control" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "CD - 5 inch" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "CD - 3 inch" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "Normal" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 msgid "Print To Hub" msgstr "Print To Hub" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Manual Control" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 msgid "Automatic" msgstr "Automatic" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "Bidirectional" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 msgid "Unidirectional" msgstr "Unidirectional" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "Alternate Fill" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "Ascending Fill" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "Descending Fill" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "Ascending Double" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "Nearest Neighbour Avoidance" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, 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" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Print options not verified; cannot print.\n" @@ -1636,104 +1651,105 @@ msgid "test print" msgstr "test print" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Four Colour Standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Three Colour Composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Six Colour Photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Five Colour Photo Composite" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Glossy Film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Envelopes" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Matte Paper" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Inkjet Paper" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Photo Quality Inkjet Paper" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Photo Paper" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Premium Glossy Photo Paper" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Premium Lustre Photo Paper" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Photo Quality Glossy Paper" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" @@ -1742,8 +1758,8 @@ msgstr "Ilford Heavy Paper" msgid "Coated" msgstr "Card" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "None" @@ -1877,8 +1893,8 @@ msgstr "Long Edge (Standard)" msgid "PPDFile" msgstr "PPDFile" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 msgid "PPD File" msgstr "PPD File" @@ -1886,179 +1902,179 @@ msgstr "PPD File" msgid "Image dimensions must match paper dimensions" msgstr "Image dimensions must match paper dimensions" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Grayscale" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Grayscale" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 #, fuzzy msgid "Six Color Enhanced Composite" msgstr "Five Colour Photo Composite" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Six Colour Photo" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Six Colour Photo" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Three Colour Composite" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Three Colour Composite" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Four Colour Standard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Four Colour Standard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Six Colour Photo" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 msgid "Seven Color Raw" msgstr "" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Six Colour Photo" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Ultra Photo" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 #, fuzzy msgid "Plain Paper Fast Load" msgstr "Plain Paper" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postcard" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 #, fuzzy msgid "Back Light Film" msgstr "Back Print Film" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matte Paper" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Premium Glossy Photo Paper" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Core Parameter" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Matte Paper" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2118,88 +2134,99 @@ msgstr "1200 DPI high quality" msgid "720 DPI Highest Quality" msgstr "1200 DPI highest quality" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "720×720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440×720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1200 DPI highest quality" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440×720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880×2880 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1200 DPI highest quality" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440×1440 DPI DMT" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440×1440 DPI DMT" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440×1440 DPI DMT" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440×1440 DPI DMT" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880×2880 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880×2880 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Interleave Method" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Interleave Method" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Alignment Passes" @@ -2923,7 +2950,7 @@ msgstr "Canon S400" #: src/main/xmli18n-tmp.h:169 #, fuzzy msgid "EPSON Stylus C20" -msgstr "EPSON Stylus C20SX" +msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:170 msgid "EPSON Stylus C20SX" @@ -2936,7 +2963,7 @@ msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:172 #, fuzzy msgid "EPSON Stylus C40" -msgstr "EPSON Stylus C40SX" +msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:173 msgid "EPSON Stylus C40SX" @@ -2949,7 +2976,7 @@ msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:175 #, fuzzy msgid "EPSON Stylus C41" -msgstr "EPSON Stylus C41SX" +msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:176 msgid "EPSON Stylus C41SX" @@ -2962,7 +2989,7 @@ msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:178 #, fuzzy msgid "EPSON Stylus C42" -msgstr "EPSON Stylus C42SX" +msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:179 msgid "EPSON Stylus C42SX" @@ -2975,7 +3002,7 @@ msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:181 #, fuzzy msgid "EPSON Stylus C43" -msgstr "EPSON Stylus C43SX" +msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:182 msgid "EPSON Stylus C43SX" @@ -2988,7 +3015,7 @@ msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "EPSON Stylus C44" -msgstr "EPSON Stylus C44SX" +msgstr "EPSON Stylus C44UX" #: src/main/xmli18n-tmp.h:185 msgid "EPSON Stylus C44SX" @@ -3485,650 +3512,703 @@ msgstr "EPSON Stylus CX-3100" #: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "EPSON Stylus CX3700" -msgstr "EPSON Stylus CX-3100" +msgstr "EPSON Stylus CX-8300" #: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "EPSON Stylus CX3800" -msgstr "EPSON Stylus CX-3100" +msgstr "EPSON Stylus CX-8400" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "EPSON Stylus C85" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "EPSON Stylus CX-3100" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "EPSON Stylus CX-8400" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" -msgstr "EPSON Stylus CX-3200" +msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "EPSON Stylus CX-8400" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "EPSON Stylus CX-5100" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "EPSON Stylus CX-5200" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "EPSON Stylus CX-5300" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "EPSON Stylus CX-5400" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "EPSON Stylus CX-8300" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" -msgstr "EPSON Stylus CX-3100" +msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "EPSON Stylus CX-6300" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "EPSON Stylus CX-6400" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "EPSON Stylus CX-8300" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "EPSON Stylus CX-6600" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" -msgstr "EPSON Stylus CX-8300" +msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "EPSON Stylus CX-8300" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "EPSON Stylus CX-3100" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "EPSON Stylus CX-3100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "EPSON Stylus CX-3200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "EPSON Stylus C50" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "EPSON Stylus CX-8400" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "EPSON CL-700" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "EPSON CL-750" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "EPSON CL-760" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "EPSON EM-900C" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "EPSON EM-900C" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "EPSON EM-930C" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "EPSON MC-2000" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "EPSON MC-5000" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "EPSON MC-7000" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "EPSON MC-9000" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "EPSON MC-10000" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "EPSON MJ-930C" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "EPSON MJ-5100C" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "EPSON MJ-6000C" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "EPSON MJ-8000C" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "EPSON PM-700C" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "EPSON PM-730C" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "EPSON PM-740C" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "EPSON PM-750C" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "EPSON PM-760C" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "EPSON PM-770C" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "EPSON PM-780C" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "EPSON PM-790PT" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "EPSON PM-800C" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "EPSON PM-850PT" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "EPSON PM-870C" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "EPSON PM-880C" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "EPSON PM-930C" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "EPSON PM-940C" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "EPSON PM-950C" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "EPSON PM-970C" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "EPSON PM-980C" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "EPSON PM-2000C" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "EPSON PM-2200C" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "EPSON PM-3000C" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "EPSON PM-3300C" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "EPSON PM-3500C" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "EPSON PM-3700C" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "EPSON PM-4000PX" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "EPSON PM-5000C" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "EPSON PM-7000C" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "EPSON PM-9000C" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "EPSON PM-10000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "EPSON PM-9000C" + +#: src/main/xmli18n-tmp.h:379 msgid "EPSON PM-D750" msgstr "EPSON PM-D750" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "EPSON PM-770C" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "EPSON PM-10000" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 msgid "EPSON PM-G700" msgstr "EPSON PM-G700" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "EPSON PM-G700" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 msgid "EPSON PM-G800" msgstr "EPSON PM-G800" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "EPSON PM-G800" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "EPSON PX-V600" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 msgid "EPSON PX-V500" msgstr "EPSON PX-V500" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 msgid "EPSON PX-V600" msgstr "EPSON PX-V600" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "EPSON PX-V500" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "EPSON PX-7000" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "Apple Colour StyleWriter 4100" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "Apple Colour StyleWriter 4500" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "Apple Colour StyleWriter 6500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "HP DesignJet 2500C" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "HP DesignJet 3500C" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "HP DeskJet 600/600C" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "HP DeskJet 600 series" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "HP DeskJet 690 series" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "HP DeskJet 900 series" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "HP DeskJet 2000 series" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "HP DeskJet 2500 series" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "HP LaserJet II series" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "HP LaserJet IIP series" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "HP LaserJet III series" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "HP LaserJet 4 series" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "HP LaserJet 5 series" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "HP LaserJet 6 series" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "Olympus P200" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "Olympus P400" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "Olympus P440" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 #, fuzzy msgid "Sony UP-DR150" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "Fujifilm Printpix CX-400" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "Fujifilm Printpix CX-550" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "RAW DATA 16 bit" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "RAW DATA 8 bit" @@ -4218,30 +4298,30 @@ msgstr "Set Default" msgid "Restore Previous" msgstr "Restore Previous" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Cancel" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Print v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "About" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4249,7 +4329,7 @@ msgstr "" "Print and\n" "Save Settings" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4257,15 +4337,15 @@ msgstr "" "Save\n" "Settings" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Print" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Preview" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4289,73 +4369,73 @@ msgstr "" "If you click another button while dragging the mouse, the image will return " "to its original position." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 msgid "Paper Size" msgstr "Paper Size" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "Show All Paper Sizes" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Dimensions:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Width:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Width of the paper that you wish to print to" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Height:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Height of the paper that you wish to print to" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 msgid "Automatic Paper Size" msgstr "Automatic Paper Size" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 msgid "Image Position" msgstr "Image Position" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portrait" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Landscape" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Upside down" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Seascape" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4363,119 +4443,119 @@ msgstr "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientation:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Left:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Distance from the left of the paper to the image" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Right:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Distance from the left of the paper to the right of the image" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Distance from the right of the paper to the image" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Top:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Distance from the top of the paper to the image" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Bottom:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 msgid "Distance from the top of the paper to bottom of the image" msgstr "Distance from the top of the paper to bottom of the image" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Distance from the bottom of the paper to the image" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centre:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 msgid "Horizontal" msgstr "Horizontal" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centre the image horizontally on the paper" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Both" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centre the image on the paper" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 msgid "Vertical" msgstr "Vertical" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centre the image vertically on the paper" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Setup Printer" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 msgid "Printer Make:" msgstr "Printer Make:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 msgid "Select the make of your printer" msgstr "Select the make of your printer" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Printer Model:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Select your printer model" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD File:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Enter the correct PPD filename for your printer" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Browse" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Choose the correct PPD filename for your printer" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -4483,48 +4563,48 @@ msgstr "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 msgid "Printer Queue:" msgstr "Printer Queue:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "Enter the correct command to print to your printer. " -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "Enter the file to print to. " -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 msgid "File to print to" msgstr "File to print to" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 msgid "Print To File" msgstr "Print To File" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Define New Printer" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Printer Name:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Enter the name you wish to give this logical printer" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 msgid "About Gutenprint " msgstr "About Gutenprint " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "Gutenprint Version " msgstr "Gutenprint Version " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4568,11 +4648,11 @@ msgstr "" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Printer Settings" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4580,11 +4660,11 @@ msgstr "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Setup Printer..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4592,11 +4672,11 @@ msgstr "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "New Printer..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4604,23 +4684,23 @@ msgstr "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 msgid "Image Size" msgstr "Image Size" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Scaling:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Set the scale (size) of the image" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4628,31 +4708,31 @@ msgstr "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Percent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Scale the print to the size of the page" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Scale the print to the number of dots per inch" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Set the width of the print" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Set the height of the print" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4660,65 +4740,65 @@ msgstr "" "Use Original\n" "Image Size" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Set the print size to the size of the image" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Print Colour Adjust" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Set Defaults" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Close" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Image preview" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "View Output Channels:" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 msgid "Output" msgstr "Output" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Output Type:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Select the desired output type" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Adjust Output..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Adjust colour balance, brightness, contrast, saturation, and dither algorithm" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 msgid "Size Units:" msgstr "Size Units:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Units:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Select the base unit of measurement for printing" @@ -4849,15 +4929,15 @@ msgstr "English-GB" msgid "ISOLatin1" msgstr "UTF-8" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "No" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "Yes" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "Fine Adjustment" @@ -5121,18 +5201,19 @@ msgstr "Read from printer timed out\n" msgid "Cannot read from %s: %s\n" msgstr "Cannot read from %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Cannot open %s read/write: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Cannot write to %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5141,7 +5222,8 @@ msgstr "" "\n" "Cannot write to %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5159,83 +5241,83 @@ msgstr "" "Cannot detect printer type.\n" "Please use -m to specify your printer model.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Obtaining ink levels requires using a raw device.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Cannot parse output from printer\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "This printer does not support raw printer output at depth %d\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Ink colour" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Percent remaining" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "This printer does not support raw printer output at depth %d\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Obtaining ink levels requires using a raw device.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 #, fuzzy msgid "Date" msgstr "Draft" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Printer identification requires using a raw device.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "You may only specify one printer model." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Cleaning heads...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "Running nozzle check, please ensure paper is in the printer.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5308,7 +5390,7 @@ msgstr "" "It is essential that you not turn your printer off during this procedure.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5375,12 +5457,12 @@ msgstr "" "this procedure.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Unable to send command to the printer, exiting.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5399,20 +5481,20 @@ msgstr "" "You will then be asked to confirm your choice.\n" "What do you want to do (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5421,7 +5503,7 @@ msgstr "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5430,12 +5512,12 @@ msgstr "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Repeating the alignment process.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5450,17 +5532,17 @@ msgstr "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "About to save settings..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "failed!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5469,27 +5551,27 @@ msgstr "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "succeeded!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Your alignment settings have been saved to the printer.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Unrecognised command.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Final command was not confirmed.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5506,12 +5588,12 @@ msgstr "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Press enter to continue > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5522,42 +5604,42 @@ msgstr "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Pass #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Please insert a fresh sheet of paper.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Number out of range!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "I cannot understand what you typed!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "The best pair of lines should be numbered between 1 and %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Attempting to set alignment..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "succeeded.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5570,7 +5652,7 @@ msgstr "" "pattern %d. If it is not, you should repeat the process to get the best\n" "quality printing.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Error in input\n" @@ -5706,6 +5788,10 @@ msgstr "Bad parameters; cannot continue!\n" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "Get next row failed at %.0f\n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Cannot parse output from printer\n" + #~ msgid "Red Balance" #~ msgstr "Red Balance" diff --git a/po/es.gmo b/po/es.gmo index d852f17..3f65635 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index bb35986..582c99b 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-04-29 00:38GMT\n" "Last-Translator: Gustavo D. Vranjes \n" "Language-Team: Castellano \n" @@ -16,6 +16,7 @@ msgstr "" "X-Generator: KBabel 1.0beta1\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Establecer por Omisión" @@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 PPP" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Papel Común" @@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA" msgstr "Papel Común" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparencias" @@ -349,9 +350,10 @@ msgid "Photo Paper Pro" msgstr "Papel de Fotografía Profesional" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Otro" @@ -415,7 +417,7 @@ msgstr "Origen del medio (ranura de entrada) al que est #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Resolución" @@ -556,9 +558,9 @@ msgstr "Cian Claro" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -576,8 +578,8 @@ msgid "Light Yellow Transition" msgstr "Cian Claro" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -607,12 +609,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Negro" @@ -632,14 +636,14 @@ msgstr "Color CcMmY para Fotograf msgid "Photo CcMmYK Color" msgstr "Color CcMmYK para Fotografía" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Color" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -680,8 +684,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Imprimir" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Tonos de gris" @@ -843,12 +847,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cian" @@ -857,12 +863,14 @@ msgstr "Cian" msgid "Adjust the cyan gamma" msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -871,12 +879,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Amarillo" @@ -885,9 +895,10 @@ msgstr "Amarillo" msgid "Adjust the yellow gamma" msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -896,8 +907,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -906,9 +917,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1148,7 +1160,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1239,135 +1251,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Estándar" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Alimentación por Rollo" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manual" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "¿Imprimir a un archivo?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Autoseleccionar" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Altura:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografía" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Fotografía de Seis Colores" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Cian Claro" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Magenta Claro" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Negro" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Amarillo" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Papel Opaco" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Papel para Fotografía" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Película Brillante" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Negro" @@ -1614,87 +1637,79 @@ msgstr "Cian Claro" msgid "Medium Gray Transition" msgstr "Cian Claro" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Tipo de salida:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "¿Imprimir a un archivo?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Tamaño" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 PPP Unidireccional" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 PPP Unidireccional" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, 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" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1748,104 +1763,105 @@ msgid "test print" msgstr "prueba de impresión" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Cuatro Colores Estándard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Tres Colores Compuestos" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Fotografía de Seis Colores" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Fotografía Compuesta de Cinco Colores" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Película Brillante" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Sobres" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Papel Opaco" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papel para Chorro de Tinta" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papel de Calidad Fotográfica para Chorro de Tinta" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Papel para Fotografía" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Papel Brillante de Altísima Calidad Fotográfica" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Papel de Fotografía Premium Luster" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Papel Brillante de Calidad Fotográfica" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Papel Pesado Ilford" @@ -1853,8 +1869,8 @@ msgstr "Papel Pesado Ilford" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1995,8 +2011,8 @@ msgstr "" msgid "PPDFile" msgstr "Archivo PPD:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "¿Archivo PPD?" @@ -2005,184 +2021,184 @@ msgstr " msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Tonos de gris" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Tonos de gris" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Seis Colores Compuestos Mejorados" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Tres Colores Compuestos" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Tres Colores Compuestos" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Seis Colores Compuestos Mejorados" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Papel Común Carga Rápida" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postal" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 #, fuzzy msgid "Back Light Film" msgstr "Back Light Film" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Papel Opaco" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Papel Brillante de Altísima Calidad Fotográfica" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Papel Común" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Papel Opaco" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2240,88 +2256,99 @@ msgstr "1200 PPP alta calidad" msgid "720 DPI Highest Quality" msgstr "1200 PPP altísima calidad" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 PPP" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 PPP" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 360 PPP Altísima Calidad " -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 PPP" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 PPP" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 x 360 PPP Altísima Calidad " -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 PPP" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 PPP" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 PPP" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 PPP" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 PPP" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 PPP" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Nombre de la Impresora:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Nombre de la Impresora:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Brillo:" @@ -3742,645 +3769,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4478,52 +4558,52 @@ msgstr "Establecer por Omisi msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "Aceptar" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Cancelar" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Imprimir v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Acerca de" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 #, fuzzy msgid "" "Print and\n" "Save Settings" msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 #, fuzzy msgid "" "Save\n" "Settings" msgstr "Guardar Conf." -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Imprimir" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Previsualizar" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 #, fuzzy msgid "" "Position the image on the page.\n" @@ -4549,76 +4629,76 @@ msgstr "" "Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n" "posición original\n" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Tamaño" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Dimensiones:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Ancho:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Ancho del papel al que desea imprimir" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Altura:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Altura del papel al que desea imprimir" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Tamaño" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Posición" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automático" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Vertical" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Apaisado" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Invertido" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Horizontal invertido" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4626,126 +4706,126 @@ msgstr "" "Seleccionar la orientación: vertical, horizontal, invertido, ú horizontal " "invertido " -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientación:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Izquierda:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Derecha:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "" "Distancia desde el borde izquierdo del papel al borde derecho de la imagen" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Distancia desde el borde derecho del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Arriba:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Distancia desde el borde superior del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Abajo:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "" "Distancia desde el borde superior del papel al borde inferior de la imagen" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Distancia desde el borde inferior del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centrado: " -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horizontal" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centrar la imagen horizontalmente en el papel" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Ambos" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centrar la imagen en el papel" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Vertical" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centrar la imagen verticalmente en el papel" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Seleccionar su madelo de impresora" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Modelo de Impresora:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Seleccionar su madelo de impresora" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "Archivo PPD:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Ingrese el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Explorar" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Elija el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4754,54 +4834,54 @@ msgstr "" "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al " "que desea imprimir" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Ingrese el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "prueba de impresión" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "¿Imprimir a un archivo?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definir Nueva Impresora" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Ingrese el nombre que desea dar a ésta impresora lógica" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Acerca de Gimp-Print..." -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Versión de Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4846,11 +4926,11 @@ msgstr "" "junto con éste programa; si no, escriba a la Fundación de Software\n" "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4858,11 +4938,11 @@ msgstr "" "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al " "que desea imprimir" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Conf. Impresora..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4870,11 +4950,11 @@ msgstr "" "Elegir el modelo de impresora, archivo PPD, y comando que se usa para " "imprimir a ésta impresora" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Impresora Nueva..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4882,24 +4962,24 @@ msgstr "" "Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una " "colección de configuraciones que usted desea recordar para uso futuro." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Tamaño" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Escala:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Establecer la escala (el tamaño) de la imagen" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "Escalar por:" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4907,31 +4987,31 @@ msgstr "" "Seleccionar si la escala se mide como porcentaje de la medida del papel " "disponible o número de puntos por pulgada en la salida." -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Porcentaje" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Redimensionar la impresión al tamaño de la página" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPP" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Establecer el ancho de la impresión" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Establecer el alto de la impresión" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4939,69 +5019,69 @@ msgstr "" "Usar Medida Orig.\n" "de la Imagen" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Establecer la medida de impresión a la medida de la imagen" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Ajuste de Impresión en Color" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Establecer por Omisión" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Cerrar" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Vista previa de imagen" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Tipo de salida:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Tipo de salida:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Seleccionar el tipo de salida deseado" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Ajustar Salida..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de " "entramado" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Seleccionar la unidad base de medida para imprimir" @@ -5142,15 +5222,15 @@ msgstr "Spanish" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5432,18 +5512,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "No puedo leer %s de: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "No puedo abrir %s para lectura/escritura: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "No puedo escribir a %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5452,7 +5533,8 @@ msgstr "" "\n" "No puedo escribir a %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5470,87 +5552,87 @@ msgstr "" "No puedo detectar el tipo de impresora.\n" "Favor de usar -m para especificar su modelo de impresora.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "" "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "No puedo analizar salida de la impresora\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "La impresora no soporta salida de color\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Color de tinta" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Porcentaje restante" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "La impresora no soporta salida de color\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" "La identificación de la impresora requiere el uso de un dispositivo crudo.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Usted sólo puede especificar un modelo de impresora" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Limpiando inyectores...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que " "haya papel en la impresora.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5629,7 +5711,7 @@ msgstr "" "durante éste proceso.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5701,12 +5783,12 @@ msgstr "" "durante éste proceso.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "No puedo enviar comando a la impresora, saliendo.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5725,13 +5807,13 @@ msgstr "" "Luego le será requerido confirmar su elección.\n" "¿Qué opción elige? (s), (q), (r).\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" @@ -5739,7 +5821,7 @@ msgstr "" "Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin " "guardar:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5748,7 +5830,7 @@ msgstr "" "Bien, su impresora está alineada, pero la alineación no fue guardada.\n" "Si quiere guardar la alineación, deberá repetir éste proceso.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5757,12 +5839,12 @@ msgstr "" "Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n" "proceso de alineado:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Repitiendo el proceso de alineación.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5777,17 +5859,17 @@ msgstr "" "Favor de confirmar que desea guardar la configuración de su impresora\n" "tipeando 's' de nuevo.\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Acerca de guardar configuración..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "¡falló!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5796,27 +5878,27 @@ msgstr "" "Su configuración no fue guardada exitosamente. Debe repetir el\n" "proceso de alineación.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "¡éxito!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Su configuración de alineación fue guardada a la impresora.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Comando no reconocido.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "El comando final no fue confirmado.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5833,12 +5915,12 @@ msgstr "" "Favor de poner una hoja de papel en la impresora para comenzar el\n" "procedimiento de alineación del cabezal.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Presione enter para continuar > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5849,42 +5931,42 @@ msgstr "" "patrón.\n" "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Pasar #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Favor de insertar una hoja de papel sin imprimir.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "¡Número fuera de rango!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "¡No puedo entender lo que usted ha tipeado!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "El mejor par de líneas debe ser numerado entre 1 y %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Intentando definir alineación..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "éxito.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5897,7 +5979,7 @@ msgstr "" "para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n" "obtener la mejor calidad de impresión.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Error en entrada\n" @@ -6033,6 +6115,10 @@ msgstr " msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "Traer próxima fila falló en %d\n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "No puedo analizar salida de la impresora\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Ajusta el balance amarillo de la impresión" diff --git a/po/fr.gmo b/po/fr.gmo index 53fdd36..bf6dc07 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 6735cdf..eca894d 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-09-15 16:07+0200\n" "Last-Translator: Raymond Ostertag \n" "Language-Team: GNOME French Team \n" @@ -17,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Valeurs par défaut" @@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400 x 600 ppp" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Papier normal" @@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA" msgstr "Papier normal" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparents" @@ -349,9 +350,10 @@ msgid "Photo Paper Pro" msgstr "Papier photo pro" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Autre" @@ -415,7 +417,7 @@ msgstr "Source (bac) du support vers lequel vous imprimez" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Résolution" @@ -556,9 +558,9 @@ msgstr "Cyan clair" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -576,8 +578,8 @@ msgid "Light Yellow Transition" msgstr "Cyan clair" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -607,12 +609,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Noir" @@ -632,14 +636,14 @@ msgstr "Photo couleur CcMmJ" msgid "Photo CcMmYK Color" msgstr "Photo couleur CcMmJN" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Couleur" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -680,8 +684,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Imprimer" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Niveaux de gris" @@ -843,12 +847,14 @@ msgstr "Gamma msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -857,12 +863,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Ajuste le niveau de cyan de l'impression" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -871,12 +879,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Ajuste le niveau de majenta de l'impression" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Jaune" @@ -885,9 +895,10 @@ msgstr "Jaune" msgid "Adjust the yellow gamma" msgstr "Ajuste le niveau de jaune de l'impression" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -896,8 +907,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Ajuste le niveau de jaune de l'impression" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -906,9 +917,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Ajuste le niveau de majenta de l'impression" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1148,7 +1160,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1239,135 +1251,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Alimentation rouleau" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manuel" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Imprimer dans un fichier ?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Sélection auto" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Hauteur :" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Photographie" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Six couleurs photo" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Cyan clair" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Magenta clair" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Noir" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Jaune" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Papier Mat" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Papier photo" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Film glacé" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Noir" @@ -1614,87 +1637,79 @@ msgstr "Cyan clair" msgid "Medium Gray Transition" msgstr "Cyan clair" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Type de sortie :" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Imprimer dans un fichier ?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Taille" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 ppp Unirectionnel" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 ppp Unirectionnel" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, 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" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1748,104 +1763,105 @@ msgid "test print" msgstr "test d'impression" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Quatre couleurs standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Trois couleurs composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Six couleurs photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Cinq couleurs photo composite" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Film glacé" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Enveloppes" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Papier Mat" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papier jet d'encre" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papier jet d'encre qualité photo" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Papier photo" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Papier glacé photo Premium" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Papier photo Premium Luster" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Papier glacé qualité photo" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Papier épais Ilford" @@ -1853,8 +1869,8 @@ msgstr "Papier msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1994,8 +2010,8 @@ msgstr "" msgid "PPDFile" msgstr "Fichier PPD :" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "Fichier PPD ?" @@ -2004,181 +2020,181 @@ msgstr "Fichier PPD msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "Niveaux de gris deux niveaux" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Niveaux de gris deux niveaux" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quadichromie" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Six couleurs amélioré composite" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Photo sept couleurs" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Sept couleurs amélioré" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Six couleurs photo" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Photo sept couleurs" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Sept couleurs amélioré" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Quatre couleurs standard" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Trois couleurs composite" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Trois couleurs composite" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Quatre couleurs standard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Quatre couleurs standard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Photo sept couleurs" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Six couleurs photo" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Six couleurs amélioré composite" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Photo sept couleurs" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Sept couleurs amélioré" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Six couleurs photo" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Six couleurs photo" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Papier normal chargement rapide" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Carte postale" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "Film back light" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Papier Mat" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Papier glacé photo Premium" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Papier normal" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Papier Mat" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2236,88 +2252,99 @@ msgstr "1200 ppp Haute qualit msgid "720 DPI Highest Quality" msgstr "1200 ppp Très haute qualité" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 ppp" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 ppp" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 360 ppp Trés haute qualité" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 ppp" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 ppp" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 x 360 ppp Trés haute qualité" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 ppp" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 ppp" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 ppp" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 ppp" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 ppp" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 ppp" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Nom de l'imprimante :" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Nom de l'imprimante :" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Luminosité :" @@ -3719,645 +3746,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4455,30 +4535,30 @@ msgstr "Valeurs par d msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "Valider" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Annuler" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Print v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "À propos" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4486,7 +4566,7 @@ msgstr "" "Imprimer et enregistrer\n" "les réglages" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4494,15 +4574,15 @@ msgstr "" "Enregistrer\n" "les réglages" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Imprimer" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Aperçu" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4527,76 +4607,76 @@ msgstr "" "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image " "retournera à sa position originale." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Taille" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Dimensions :" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Largeur :" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Largeur du papier sur lequel vous souhaitez imprimer" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Hauteur :" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Hauteur du papier sur lequel vous souhaitez imprimer" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Taille" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Position" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portrait" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Paysage" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Retourner" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Panoramique" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4604,125 +4684,125 @@ msgstr "" "Sélectionnez l'orientation : portrait, paysage, tête-bèche, ou tête-bèche " "paysage" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientation :" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Gauche :" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Distance entre le bord gauche du papier et l'image" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Droite :" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Distance entre le bord gauche du papier et le bord droit de l'image" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Distance entre le bord droit du papier et l'image" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Dessus :" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Distance entre le bord supérieur du papier et l'image" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Bas :" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "" "Distance entre le bord supérieur du papier et le bord inférieur de l'image" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Distance entre le bord inférieur du papier et l'image" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centrer :" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horizontalement" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centrer l'image horizontalement sur le papier" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Les deux" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centrer l'image sur le papier" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Verticalement" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centrer l'image verticalement sur le papier" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Configuration de l'imprimante" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Nom de l'imprimante :" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Sélectionnez le modèle de votre imprimante" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Modèle d'imprimante :" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Sélectionnez le modèle de votre imprimante" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "Fichier PPD :" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Entrez le nom de fichier PPD correct pour votre imprimante" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Parcourir" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Choisissez le fichier PPD correct pour votre imprimante" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4731,54 +4811,54 @@ msgstr "" "Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous " "voulez utiliser pour l'impression" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Nom de l'imprimante :" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Entrez le nom de fichier PPD correct pour votre imprimante" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "test d'impression" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Imprimer dans un fichier ?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Définir une nouvelle imprimante" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Nom de l'imprimante :" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "À propos de Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Version de Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4827,11 +4907,11 @@ msgstr "" "avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Paramètres de l'imprimante" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4839,11 +4919,11 @@ msgstr "" "Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous " "voulez utiliser pour l'impression" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Configurer l'imprimante..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4851,11 +4931,11 @@ msgstr "" "Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire " "pour l'impression sur cette imprimante" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Nouvelle imprimante..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4863,24 +4943,24 @@ msgstr "" "Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un " "ensemble de réglage que vous souhaitez réutiliser plus tard." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Taille" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Échelle :" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Régler l'échelle (taille) de l'image" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4888,31 +4968,31 @@ msgstr "" "Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page " "ou en nombre de points par pouces" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Pourcentage" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Dimensionne l'impression par rapport à la taille de la page" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "points par pouce" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Dimensionne l'impression en nombre de points par pouce" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Défini la largeur de l'impression" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Défini la hauteur de l'impression" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4920,69 +5000,69 @@ msgstr "" "Utiliser la taille \n" "de l'image originale" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Utiliser la taille de l'image comme taille d'impression" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Ajustez les couleurs d'impression" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Valeurs par défaut" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Fermer" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Aperçu de l'image" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Type de sortie :" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Type de sortie :" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Sélectionnez le type de sortie désiré" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Ajuster la sortie..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Ajustement de la balance des couleurs, luminosité, contraste, saturation et " "algorithme de tramage" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Unités :" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Unités :" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Sélectionne l'unité de base de mesure pour l'impression" @@ -5123,15 +5203,15 @@ msgstr "French" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5418,18 +5498,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Impossible de lire à partir de %s : %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Impossible d'écrire sur %s : %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5438,7 +5519,8 @@ msgstr "" "\n" "Impossible d'écrire sur %s : %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5456,88 +5538,88 @@ msgstr "" "Impossible de détecter le type de l'imprimante.\n" "Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "" "Obtenir les niveaux d'encre demande d'utiliser un périphérique d'entrée\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "L'imprimante ne supporte pas les sorties en couleur\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Encre couleur" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Pourcentage restant" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "L'imprimante ne supporte pas les sorties en couleur\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" "Obtenir les niveaux d'encre demande d'utiliser un périphérique d'entrée\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" "L'identification de l'imprimante demande d'utiliser un périphérique " "d'entrée\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Nettoyage des têtes...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier " "dans l'imprimante\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5622,7 +5704,7 @@ msgstr "" "durant cette opération.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5698,12 +5780,12 @@ msgstr "" "durant cette opération.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5723,13 +5805,13 @@ msgstr "" "Il vous sera ensuite demandé de confirmer votre choix\n" "Que voulez-vous faire (s, q, r) ?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" @@ -5737,7 +5819,7 @@ msgstr "" "Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans " "enregistrer :\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5747,7 +5829,7 @@ msgstr "" "Si vous souhaitez enregistrer l'alignement, vous devez répéter cette " "opération.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5756,12 +5838,12 @@ msgstr "" "S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n" "reprendre l'opération d'alignement.\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Répétition de l'opération d'alignement.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5776,17 +5858,17 @@ msgstr "" "Veuillez taper « s » de nouveau pour confirmer que vous voulez\n" "enregistrer les réglages de votre imprimante.\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "À propos de l'enregistrement des réglages..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "Échec !\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5795,27 +5877,27 @@ msgstr "" "Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n" "l'opération d'alignement.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "Succès !\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Commande non reconnue.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "La dernière commande n'a pas été confirmée.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5832,12 +5914,12 @@ msgstr "" "S'il vous plait placez une feuillle de papier dans votre imprimante\n" "pour commencer l'opération d'ailgnement des têtes.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Pressez Entrée pour continuer > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5848,42 +5930,42 @@ msgstr "" "lignes dans chaque trame.\n" "Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Passe #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Veuillez insérer une feuille de papier vierge.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Nombre hors-intervalle !\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Je ne comprends pas ce que vous avez tapé !\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Tentative de réglage de l'alignement..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "Succès.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5896,7 +5978,7 @@ msgstr "" "trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n" "devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Erreur en entrée\n" @@ -6032,6 +6114,10 @@ msgstr "Mauvais param msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "Obtenir la ligne suivante à échoué à %.0f\n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Ajuste le niveau de jaune de l'impression" diff --git a/po/gutenprint.pot b/po/gutenprint.pot index 949cb2f..24ac3fd 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 msgid "Default" msgstr "" @@ -251,9 +252,9 @@ msgid "2400x2400 DPI DMT" msgstr "" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "" @@ -262,9 +263,9 @@ msgid "Plain Paper PIXMA" msgstr "" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "" @@ -305,9 +306,10 @@ msgid "Photo Paper Pro" msgstr "" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "" @@ -367,7 +369,7 @@ msgstr "" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "" @@ -497,9 +499,9 @@ msgstr "" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -515,8 +517,8 @@ msgid "Light Yellow Transition" msgstr "" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -545,12 +547,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "" @@ -570,14 +574,14 @@ msgstr "" msgid "Photo CcMmYK Color" msgstr "" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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" @@ -615,8 +619,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "" @@ -759,12 +763,14 @@ msgstr "" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "" @@ -772,12 +778,14 @@ msgstr "" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "" @@ -785,12 +793,14 @@ msgstr "" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "" @@ -798,9 +808,10 @@ msgstr "" msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -808,8 +819,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -817,9 +828,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1027,7 +1039,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1115,121 +1127,132 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 msgid "Manual Feed" msgstr "" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 msgid "Print to CD" msgstr "" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 msgid "High" msgstr "" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 msgid "Photo" msgstr "" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 msgid "Super Photo" msgstr "" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 msgid "Light Cyan" msgstr "" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 msgid "Light Magenta" msgstr "" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 msgid "Light Black" msgstr "" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 msgid "Dark Yellow" msgstr "" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 msgid "Matte Black" msgstr "" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 msgid "Photo Black" msgstr "" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 msgid "Light Light Black" msgstr "" @@ -1449,81 +1472,73 @@ msgstr "" msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 msgid "Print To Hub" msgstr "" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 msgid "Automatic" msgstr "" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1577,104 +1592,105 @@ msgid "test print" msgstr "" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1682,8 +1698,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1815,8 +1831,8 @@ msgstr "" msgid "PPDFile" msgstr "" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 msgid "PPD File" msgstr "" @@ -1824,161 +1840,161 @@ msgstr "" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 msgid "Three Level Grayscale" msgstr "" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 msgid "Eight Color Photo" msgstr "" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 msgid "Three Color Raw" msgstr "" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 msgid "Three Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 msgid "Four Color Raw" msgstr "" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 msgid "Six Color Raw" msgstr "" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 msgid "Seven Color Raw" msgstr "" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 msgid "Eight Color Raw" msgstr "" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 msgid "UltraChrome Photo Black" msgstr "" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 -msgid "Matte Paper Heavyweight" -msgstr "" - #: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 #: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 #: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +msgid "Matte Paper Heavyweight" +msgstr "" + +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 msgid "ColorLife Paper" msgstr "" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 msgid "Archival Matte Paper" msgstr "" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2027,76 +2043,85 @@ msgstr "" msgid "720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +msgid "720 x 720 DPI" +msgstr "" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 msgid "1440 x 720 DPI" msgstr "" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 msgid "1440 x 720 DPI Transposed" msgstr "" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 msgid "2880 x 720 DPI" msgstr "" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 msgid "1440 x 1440 DPI" msgstr "" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 msgid "2880 x 1440 DPI" msgstr "" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 msgid "2880 x 1440 DPI Transposed" msgstr "" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +msgid "5760 x 1440 DPI" +msgstr "" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 msgid "2880 x 2880 DPI" msgstr "" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 msgid "5760 x 2880 DPI" msgstr "" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 msgid "Interleave" msgstr "" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 msgid "Interleave 2" msgstr "" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 msgid "Eight Pass" msgstr "" @@ -3349,610 +3374,654 @@ msgid "EPSON Stylus CX3800" msgstr "" #: src/main/xmli18n-tmp.h:304 -msgid "EPSON Stylus CX3810" +msgid "EPSON Stylus CX3805" msgstr "" #: src/main/xmli18n-tmp.h:305 -msgid "EPSON Stylus CX4200" +msgid "EPSON Stylus CX3810" msgstr "" #: src/main/xmli18n-tmp.h:306 -msgid "EPSON Stylus CX4600" +msgid "EPSON Stylus CX4100" msgstr "" #: src/main/xmli18n-tmp.h:307 -msgid "EPSON Stylus CX4700" +msgid "EPSON Stylus CX4200" msgstr "" #: src/main/xmli18n-tmp.h:308 -msgid "EPSON Stylus CX4800" +msgid "EPSON Stylus CX4500" msgstr "" #: src/main/xmli18n-tmp.h:309 -msgid "EPSON Stylus CX5100" +msgid "EPSON Stylus CX4600" msgstr "" #: src/main/xmli18n-tmp.h:310 -msgid "EPSON Stylus CX5200" +msgid "EPSON Stylus CX4700" msgstr "" #: src/main/xmli18n-tmp.h:311 -msgid "EPSON Stylus CX5300" +msgid "EPSON Stylus CX4800" msgstr "" #: src/main/xmli18n-tmp.h:312 -msgid "EPSON Stylus CX5400" +msgid "EPSON Stylus CX5100" msgstr "" #: src/main/xmli18n-tmp.h:313 -msgid "EPSON Stylus CX5800" +msgid "EPSON Stylus CX5200" msgstr "" #: src/main/xmli18n-tmp.h:314 -msgid "EPSON Stylus CX6300" +msgid "EPSON Stylus CX5300" msgstr "" #: src/main/xmli18n-tmp.h:315 -msgid "EPSON Stylus CX6400" +msgid "EPSON Stylus CX5400" msgstr "" #: src/main/xmli18n-tmp.h:316 -msgid "EPSON Stylus CX6500" +msgid "EPSON Stylus CX5700" msgstr "" #: src/main/xmli18n-tmp.h:317 -msgid "EPSON Stylus CX6600" +msgid "EPSON Stylus CX5800" msgstr "" #: src/main/xmli18n-tmp.h:318 -msgid "EPSON Stylus CX7700" +msgid "EPSON Stylus CX6300" msgstr "" #: src/main/xmli18n-tmp.h:319 -msgid "EPSON Stylus CX7800" +msgid "EPSON Stylus CX6400" msgstr "" #: src/main/xmli18n-tmp.h:320 -msgid "EPSON Stylus CX8300" +msgid "EPSON Stylus CX6500" msgstr "" #: src/main/xmli18n-tmp.h:321 -msgid "EPSON Stylus CX8400" +msgid "EPSON Stylus CX6600" msgstr "" #: src/main/xmli18n-tmp.h:322 -msgid "EPSON Stylus D68" +msgid "EPSON Stylus CX7700" msgstr "" #: src/main/xmli18n-tmp.h:323 -msgid "EPSON Stylus D88" +msgid "EPSON Stylus CX7800" msgstr "" #: src/main/xmli18n-tmp.h:324 -msgid "EPSON Stylus DX3800" +msgid "EPSON Stylus CX8300" msgstr "" #: src/main/xmli18n-tmp.h:325 -msgid "EPSON Stylus DX3850" +msgid "EPSON Stylus CX8400" msgstr "" #: src/main/xmli18n-tmp.h:326 -msgid "EPSON Stylus DX4200" +msgid "EPSON Stylus D68" msgstr "" #: src/main/xmli18n-tmp.h:327 -msgid "EPSON Stylus DX4800" +msgid "EPSON Stylus D88" msgstr "" #: src/main/xmli18n-tmp.h:328 -msgid "EPSON CL-700" +msgid "EPSON Stylus DX3800" msgstr "" #: src/main/xmli18n-tmp.h:329 -msgid "EPSON CL-750" +msgid "EPSON Stylus DX3850" msgstr "" #: src/main/xmli18n-tmp.h:330 -msgid "EPSON CL-760" +msgid "EPSON Stylus DX4200" msgstr "" #: src/main/xmli18n-tmp.h:331 -msgid "EPSON EM-900C" +msgid "EPSON Stylus DX4250" msgstr "" #: src/main/xmli18n-tmp.h:332 -msgid "EPSON EM-930C" +msgid "EPSON Stylus DX4800" msgstr "" #: src/main/xmli18n-tmp.h:333 -msgid "EPSON MC-2000" +msgid "EPSON PictureMate" msgstr "" #: src/main/xmli18n-tmp.h:334 -msgid "EPSON MC-5000" +msgid "EPSON PictureMate Deluxe" msgstr "" #: src/main/xmli18n-tmp.h:335 -msgid "EPSON MC-7000" +msgid "EPSON CL-700" msgstr "" #: src/main/xmli18n-tmp.h:336 -msgid "EPSON MC-9000" +msgid "EPSON CL-750" msgstr "" #: src/main/xmli18n-tmp.h:337 -msgid "EPSON MC-10000" +msgid "EPSON CL-760" msgstr "" #: src/main/xmli18n-tmp.h:338 -msgid "EPSON MJ-930C" +msgid "EPSON E-100" msgstr "" #: src/main/xmli18n-tmp.h:339 -msgid "EPSON MJ-5100C" +msgid "EPSON EM-900C" msgstr "" #: src/main/xmli18n-tmp.h:340 -msgid "EPSON MJ-6000C" +msgid "EPSON EM-930C" msgstr "" #: src/main/xmli18n-tmp.h:341 -msgid "EPSON MJ-8000C" +msgid "EPSON MC-2000" msgstr "" #: src/main/xmli18n-tmp.h:342 -msgid "EPSON PM-700C" +msgid "EPSON MC-5000" msgstr "" #: src/main/xmli18n-tmp.h:343 -msgid "EPSON PM-730C" +msgid "EPSON MC-7000" msgstr "" #: src/main/xmli18n-tmp.h:344 -msgid "EPSON PM-740C" +msgid "EPSON MC-9000" msgstr "" #: src/main/xmli18n-tmp.h:345 -msgid "EPSON PM-750C" +msgid "EPSON MC-10000" msgstr "" #: src/main/xmli18n-tmp.h:346 -msgid "EPSON PM-760C" +msgid "EPSON MJ-930C" msgstr "" #: src/main/xmli18n-tmp.h:347 -msgid "EPSON PM-770C" +msgid "EPSON MJ-5100C" msgstr "" #: src/main/xmli18n-tmp.h:348 -msgid "EPSON PM-780C" +msgid "EPSON MJ-6000C" msgstr "" #: src/main/xmli18n-tmp.h:349 -msgid "EPSON PM-790PT" +msgid "EPSON MJ-8000C" msgstr "" #: src/main/xmli18n-tmp.h:350 -msgid "EPSON PM-800C" +msgid "EPSON PM-700C" msgstr "" #: src/main/xmli18n-tmp.h:351 -msgid "EPSON PM-850PT" +msgid "EPSON PM-730C" msgstr "" #: src/main/xmli18n-tmp.h:352 -msgid "EPSON PM-870C" +msgid "EPSON PM-740C" msgstr "" #: src/main/xmli18n-tmp.h:353 -msgid "EPSON PM-880C" +msgid "EPSON PM-750C" msgstr "" #: src/main/xmli18n-tmp.h:354 -msgid "EPSON PM-930C" +msgid "EPSON PM-760C" msgstr "" #: src/main/xmli18n-tmp.h:355 -msgid "EPSON PM-940C" +msgid "EPSON PM-770C" msgstr "" #: src/main/xmli18n-tmp.h:356 -msgid "EPSON PM-950C" +msgid "EPSON PM-780C" msgstr "" #: src/main/xmli18n-tmp.h:357 -msgid "EPSON PM-970C" +msgid "EPSON PM-790PT" msgstr "" #: src/main/xmli18n-tmp.h:358 -msgid "EPSON PM-980C" +msgid "EPSON PM-800C" msgstr "" #: src/main/xmli18n-tmp.h:359 -msgid "EPSON PM-2000C" +msgid "EPSON PM-850PT" msgstr "" #: src/main/xmli18n-tmp.h:360 -msgid "EPSON PM-2200C" +msgid "EPSON PM-870C" msgstr "" #: src/main/xmli18n-tmp.h:361 -msgid "EPSON PM-3000C" +msgid "EPSON PM-880C" msgstr "" #: src/main/xmli18n-tmp.h:362 -msgid "EPSON PM-3300C" +msgid "EPSON PM-930C" msgstr "" #: src/main/xmli18n-tmp.h:363 -msgid "EPSON PM-3500C" +msgid "EPSON PM-940C" msgstr "" #: src/main/xmli18n-tmp.h:364 -msgid "EPSON PM-3700C" +msgid "EPSON PM-950C" msgstr "" #: src/main/xmli18n-tmp.h:365 -msgid "EPSON PM-4000PX" +msgid "EPSON PM-970C" msgstr "" #: src/main/xmli18n-tmp.h:366 -msgid "EPSON PM-5000C" +msgid "EPSON PM-980C" msgstr "" #: src/main/xmli18n-tmp.h:367 -msgid "EPSON PM-7000C" +msgid "EPSON PM-2000C" msgstr "" #: src/main/xmli18n-tmp.h:368 -msgid "EPSON PM-9000C" +msgid "EPSON PM-2200C" msgstr "" #: src/main/xmli18n-tmp.h:369 -msgid "EPSON PM-10000" +msgid "EPSON PM-3000C" msgstr "" #: src/main/xmli18n-tmp.h:370 -msgid "EPSON PM-D750" +msgid "EPSON PM-3300C" msgstr "" #: src/main/xmli18n-tmp.h:371 -msgid "EPSON PM-D770" +msgid "EPSON PM-3500C" msgstr "" #: src/main/xmli18n-tmp.h:372 -msgid "EPSON PM-D1000" +msgid "EPSON PM-3700C" msgstr "" #: src/main/xmli18n-tmp.h:373 -msgid "EPSON PM-G700" +msgid "EPSON PM-4000PX" msgstr "" #: src/main/xmli18n-tmp.h:374 -msgid "EPSON PM-G720" +msgid "EPSON PM-5000C" msgstr "" #: src/main/xmli18n-tmp.h:375 -msgid "EPSON PM-G800" +msgid "EPSON PM-7000C" msgstr "" #: src/main/xmli18n-tmp.h:376 -msgid "EPSON PM-G820" +msgid "EPSON PM-9000C" msgstr "" #: src/main/xmli18n-tmp.h:377 -msgid "EPSON PX-G900" +msgid "EPSON PM-10000" msgstr "" #: src/main/xmli18n-tmp.h:378 -msgid "EPSON PX-G920" +msgid "EPSON PM-A900" msgstr "" #: src/main/xmli18n-tmp.h:379 -msgid "EPSON PX-G5000" +msgid "EPSON PM-D750" msgstr "" #: src/main/xmli18n-tmp.h:380 -msgid "EPSON PX-V500" +msgid "EPSON PM-D770" msgstr "" #: src/main/xmli18n-tmp.h:381 -msgid "EPSON PX-V600" +msgid "EPSON PM-D1000" msgstr "" #: src/main/xmli18n-tmp.h:382 -msgid "EPSON PX-7000" +msgid "EPSON PM-G700" msgstr "" #: src/main/xmli18n-tmp.h:383 -msgid "EPSON PX-9000" +msgid "EPSON PM-G720" msgstr "" #: src/main/xmli18n-tmp.h:384 -msgid "Apple Color StyleWriter 4100" +msgid "EPSON PM-G800" msgstr "" #: src/main/xmli18n-tmp.h:385 -msgid "Apple Color StyleWriter 4500" +msgid "EPSON PM-G820" msgstr "" #: src/main/xmli18n-tmp.h:386 -msgid "Apple Color StyleWriter 6500" +msgid "EPSON PX-A650" msgstr "" #: src/main/xmli18n-tmp.h:387 -msgid "HP DeskJet 340" +msgid "EPSON PX-G900" msgstr "" #: src/main/xmli18n-tmp.h:388 -msgid "HP DeskJet 400" +msgid "EPSON PX-G920" msgstr "" #: src/main/xmli18n-tmp.h:389 -msgid "HP DeskJet 500" +msgid "EPSON PX-G5000" msgstr "" #: src/main/xmli18n-tmp.h:390 -msgid "HP DesignJet 230" +msgid "EPSON PX-V500" msgstr "" #: src/main/xmli18n-tmp.h:391 -msgid "HP DesignJet 250C" +msgid "EPSON PX-V600" msgstr "" #: src/main/xmli18n-tmp.h:392 -msgid "HP DesignJet 700" +msgid "EPSON PX-5500" msgstr "" #: src/main/xmli18n-tmp.h:393 -msgid "HP DesignJet 750C" +msgid "EPSON PX-7000" msgstr "" #: src/main/xmli18n-tmp.h:394 -msgid "HP DesignJet 2500C" +msgid "EPSON PX-9000" msgstr "" #: src/main/xmli18n-tmp.h:395 -msgid "HP DesignJet 3500C" +msgid "Apple Color StyleWriter 4100" msgstr "" #: src/main/xmli18n-tmp.h:396 -msgid "HP DesignJet 430" +msgid "Apple Color StyleWriter 4500" msgstr "" #: src/main/xmli18n-tmp.h:397 -msgid "HP DesignJet 450C" +msgid "Apple Color StyleWriter 6500" msgstr "" #: src/main/xmli18n-tmp.h:398 -msgid "HP DesignJet 455CA" +msgid "HP DeskJet 340" msgstr "" #: src/main/xmli18n-tmp.h:399 -msgid "HP DesignJet 488CA" +msgid "HP DeskJet 400" msgstr "" #: src/main/xmli18n-tmp.h:400 -msgid "HP DeskJet 500C" +msgid "HP DeskJet 500" msgstr "" #: src/main/xmli18n-tmp.h:401 -msgid "HP DeskJet 520" +msgid "HP DesignJet 230" msgstr "" #: src/main/xmli18n-tmp.h:402 -msgid "HP DeskJet 540C" +msgid "HP DesignJet 250C" msgstr "" #: src/main/xmli18n-tmp.h:403 -msgid "HP DeskJet 550C" +msgid "HP DesignJet 700" msgstr "" #: src/main/xmli18n-tmp.h:404 -msgid "HP DeskJet 560C" +msgid "HP DesignJet 750C" msgstr "" #: src/main/xmli18n-tmp.h:405 -msgid "HP DeskJet 600/600C" +msgid "HP DesignJet 2500C" msgstr "" #: src/main/xmli18n-tmp.h:406 -msgid "HP DeskJet 600 series" +msgid "HP DesignJet 3500C" msgstr "" #: src/main/xmli18n-tmp.h:407 -msgid "HP DeskJet 690 series" +msgid "HP DesignJet 430" msgstr "" #: src/main/xmli18n-tmp.h:408 -msgid "HP DeskJet 810C" +msgid "HP DesignJet 450C" msgstr "" #: src/main/xmli18n-tmp.h:409 -msgid "HP DeskJet 812C" +msgid "HP DesignJet 455CA" msgstr "" #: src/main/xmli18n-tmp.h:410 -msgid "HP DeskJet 840C" +msgid "HP DesignJet 488CA" msgstr "" #: src/main/xmli18n-tmp.h:411 -msgid "HP DeskJet 842C" +msgid "HP DeskJet 500C" msgstr "" #: src/main/xmli18n-tmp.h:412 -msgid "HP DeskJet 845C" +msgid "HP DeskJet 520" msgstr "" #: src/main/xmli18n-tmp.h:413 -msgid "HP DeskJet 850C" +msgid "HP DeskJet 540C" msgstr "" #: src/main/xmli18n-tmp.h:414 -msgid "HP DeskJet 855C" +msgid "HP DeskJet 550C" msgstr "" #: src/main/xmli18n-tmp.h:415 -msgid "HP DeskJet 870C" +msgid "HP DeskJet 560C" msgstr "" #: src/main/xmli18n-tmp.h:416 -msgid "HP DeskJet 890C" +msgid "HP DeskJet 600/600C" msgstr "" #: src/main/xmli18n-tmp.h:417 -msgid "HP DeskJet 895C" +msgid "HP DeskJet 600 series" msgstr "" #: src/main/xmli18n-tmp.h:418 -msgid "HP DeskJet 900 series" +msgid "HP DeskJet 690 series" msgstr "" #: src/main/xmli18n-tmp.h:419 -msgid "HP DeskJet 1100C" +msgid "HP DeskJet 810C" msgstr "" #: src/main/xmli18n-tmp.h:420 -msgid "HP DeskJet 1120C" +msgid "HP DeskJet 812C" msgstr "" #: src/main/xmli18n-tmp.h:421 -msgid "HP DeskJet 1200C" +msgid "HP DeskJet 840C" msgstr "" #: src/main/xmli18n-tmp.h:422 -msgid "HP DeskJet 1220C" +msgid "HP DeskJet 842C" msgstr "" #: src/main/xmli18n-tmp.h:423 -msgid "HP DeskJet 1600C" +msgid "HP DeskJet 845C" msgstr "" #: src/main/xmli18n-tmp.h:424 -msgid "HP DeskJet 2000 series" +msgid "HP DeskJet 850C" msgstr "" #: src/main/xmli18n-tmp.h:425 -msgid "HP DeskJet 2500 series" +msgid "HP DeskJet 855C" msgstr "" #: src/main/xmli18n-tmp.h:426 -msgid "HP PhotoSmart P1000" +msgid "HP DeskJet 870C" msgstr "" #: src/main/xmli18n-tmp.h:427 -msgid "HP PhotoSmart P1100" +msgid "HP DeskJet 890C" msgstr "" #: src/main/xmli18n-tmp.h:428 -msgid "HP LaserJet II series" +msgid "HP DeskJet 895C" msgstr "" #: src/main/xmli18n-tmp.h:429 -msgid "HP LaserJet IIP series" +msgid "HP DeskJet 900 series" msgstr "" #: src/main/xmli18n-tmp.h:430 -msgid "HP LaserJet III series" +msgid "HP DeskJet 1100C" msgstr "" #: src/main/xmli18n-tmp.h:431 -msgid "HP LaserJet 4 series" +msgid "HP DeskJet 1120C" msgstr "" #: src/main/xmli18n-tmp.h:432 -msgid "HP LaserJet 4L" +msgid "HP DeskJet 1200C" msgstr "" #: src/main/xmli18n-tmp.h:433 -msgid "HP LaserJet 4V" +msgid "HP DeskJet 1220C" msgstr "" #: src/main/xmli18n-tmp.h:434 -msgid "HP LaserJet 4Si" +msgid "HP DeskJet 1600C" msgstr "" #: src/main/xmli18n-tmp.h:435 -msgid "HP LaserJet 5 series" +msgid "HP DeskJet 2000 series" msgstr "" #: src/main/xmli18n-tmp.h:436 -msgid "HP LaserJet 5Si" +msgid "HP DeskJet 2500 series" msgstr "" #: src/main/xmli18n-tmp.h:437 -msgid "HP LaserJet 6 series" +msgid "HP PhotoSmart P1000" msgstr "" #: src/main/xmli18n-tmp.h:438 -msgid "Lexmark 4076" +msgid "HP PhotoSmart P1100" msgstr "" #: src/main/xmli18n-tmp.h:439 -msgid "Lexmark Z42" +msgid "HP LaserJet II series" msgstr "" #: src/main/xmli18n-tmp.h:440 -msgid "Lexmark Z43" +msgid "HP LaserJet IIP series" msgstr "" #: src/main/xmli18n-tmp.h:441 -msgid "Lexmark Z52" +msgid "HP LaserJet III series" msgstr "" #: src/main/xmli18n-tmp.h:442 -msgid "Lexmark Z53" +msgid "HP LaserJet 4 series" msgstr "" #: src/main/xmli18n-tmp.h:443 -msgid "Olympus P10" +msgid "HP LaserJet 4L" msgstr "" #: src/main/xmli18n-tmp.h:444 -msgid "Olympus P200" +msgid "HP LaserJet 4V" msgstr "" #: src/main/xmli18n-tmp.h:445 -msgid "Olympus P300" +msgid "HP LaserJet 4Si" msgstr "" #: src/main/xmli18n-tmp.h:446 -msgid "Olympus P400" +msgid "HP LaserJet 5 series" msgstr "" #: src/main/xmli18n-tmp.h:447 -msgid "Olympus P440" +msgid "HP LaserJet 5Si" msgstr "" #: src/main/xmli18n-tmp.h:448 -msgid "Canon CP100" +msgid "HP LaserJet 6 series" msgstr "" #: src/main/xmli18n-tmp.h:449 -msgid "Canon CP220" +msgid "Lexmark 4076" msgstr "" #: src/main/xmli18n-tmp.h:450 -msgid "Sony UP-DP10" +msgid "Lexmark Z42" msgstr "" #: src/main/xmli18n-tmp.h:451 -msgid "Sony UP-DR150" +msgid "Lexmark Z43" msgstr "" #: src/main/xmli18n-tmp.h:452 -msgid "Fujifilm Printpix CX-400" +msgid "Lexmark Z52" msgstr "" #: src/main/xmli18n-tmp.h:453 -msgid "Fujifilm Printpix CX-550" +msgid "Lexmark Z53" msgstr "" #: src/main/xmli18n-tmp.h:454 -msgid "RAW DATA 16 bit" +msgid "Olympus P10" msgstr "" #: src/main/xmli18n-tmp.h:455 +msgid "Olympus P200" +msgstr "" + +#: src/main/xmli18n-tmp.h:456 +msgid "Olympus P300" +msgstr "" + +#: src/main/xmli18n-tmp.h:457 +msgid "Olympus P400" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 +msgid "Olympus P440" +msgstr "" + +#: src/main/xmli18n-tmp.h:459 +msgid "Canon CP100" +msgstr "" + +#: src/main/xmli18n-tmp.h:460 +msgid "Canon CP220" +msgstr "" + +#: src/main/xmli18n-tmp.h:461 +msgid "Sony UP-DP10" +msgstr "" + +#: src/main/xmli18n-tmp.h:462 +msgid "Sony UP-DR150" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 +msgid "Fujifilm Printpix CX-400" +msgstr "" + +#: src/main/xmli18n-tmp.h:464 +msgid "Fujifilm Printpix CX-550" +msgstr "" + +#: src/main/xmli18n-tmp.h:465 +msgid "RAW DATA 16 bit" +msgstr "" + +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4042,50 +4111,50 @@ msgstr "" msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" msgstr "" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" msgstr "" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4099,238 +4168,238 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 msgid "Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 msgid "Image Position" msgstr "" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 msgid "Distance from the top of the paper to bottom of the image" msgstr "" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 msgid "Horizontal" msgstr "" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 msgid "Vertical" msgstr "" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 msgid "Printer Make:" msgstr "" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 msgid "Printer Queue:" msgstr "" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 msgid "Print To File" msgstr "" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 msgid "About Gutenprint " msgstr "" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "Gutenprint Version " msgstr "" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4354,146 +4423,146 @@ msgid "" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" msgstr "" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "" -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "" -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 msgid "Image Size" msgstr "" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" msgstr "" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 msgid "Output" msgstr "" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 msgid "Size Units:" msgstr "" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "" @@ -4623,15 +4692,15 @@ msgstr "" msgid "ISOLatin1" msgstr "" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -4805,25 +4874,27 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" "Cannot write to %s: %s\n" msgstr "" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -4838,82 +4909,82 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 -#, c-format -msgid "Obtaining %s requires using a raw device.\n" -msgstr "" - -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, c-format -msgid "Cannot identify printer!\n" -msgstr "" - #: src/escputil/escputil.c:927 #, c-format -msgid "Printer does not support listing ink types!\n" +msgid "Obtaining %s requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "" + +#: src/escputil/escputil.c:1144 #, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, c-format msgid "Cannot identify printer model.\n" msgstr "" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -4952,7 +5023,7 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -4988,12 +5059,12 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5005,38 +5076,38 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "" -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" msgstr "" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5046,44 +5117,44 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "" -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5094,12 +5165,12 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "" -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5107,42 +5178,42 @@ msgid "" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "" -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5151,7 +5222,7 @@ msgid "" "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "" diff --git a/po/ja.gmo b/po/ja.gmo index f9fffd7..8f4c23a 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 959215c..474c552 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-10-07 19:10+0900\n" "Last-Translator: Takeshi AIHANA \n" "Language-Team: Japanese \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "½é´üÃͤËÌ᤹" @@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Ä̾ï¤ÎÍÑ»æ" @@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA" msgstr "Ä̾ï¤ÎÍÑ»æ" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "¥¹¥é¥¤¥ÉÍÑ»æ" @@ -347,9 +348,10 @@ msgid "Photo Paper Pro" msgstr "¥Õ¥©¥ÈÍÑ»æ Pro" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "¤½¤Î¾" @@ -413,7 +415,7 @@ msgstr " #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "²òÁüÅÙ" @@ -554,9 +556,9 @@ msgstr " #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -574,8 +576,8 @@ msgid "Light Yellow Transition" msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -605,12 +607,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "¹õ¿§" @@ -630,14 +634,14 @@ msgstr " msgid "Photo CcMmYK Color" msgstr "¥Õ¥©¥È CcMmYK ¿§" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "¥«¥é¡¼" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -678,8 +682,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "°õºþ" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" @@ -840,12 +844,14 @@ msgstr " msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "¥·¥¢¥ó (C)" @@ -854,12 +860,14 @@ msgstr " msgid "Adjust the cyan gamma" msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "¥Þ¥¼¥ó¥¿ (M)" @@ -868,12 +876,14 @@ msgstr " msgid "Adjust the magenta gamma" msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "²«¿§ (Y)" @@ -882,9 +892,10 @@ msgstr " msgid "Adjust the yellow gamma" msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -893,8 +904,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -903,9 +914,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1144,7 +1156,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1235,135 +1247,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "ɸ½à" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "¥í¡¼¥ë¼°µë»æ" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "¼êÆ°" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "¼«Æ°ÁªÂò" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "¹â¤µ:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "¼Ì¿¿" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Six Color Photo" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "¹õ¿§" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "²«¿§ (Y)" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "¥Õ¥©¥ÈÍÑ»æ" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "¹õ¿§" @@ -1610,87 +1633,79 @@ msgstr " msgid "Medium Gray Transition" msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "½ÐÎϤμïÎà:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "½ÐÎϤμïÎà:" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1744,104 +1759,105 @@ msgid "test print" msgstr "¥Æ¥¹¥È°õºþ" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Four Color Standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Three Color Composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Six Color Photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Five Color Photo Composite" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "ÉõÅû" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "¥Õ¥©¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" @@ -1849,8 +1865,8 @@ msgstr "Ilford Heavy Paper" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1990,8 +2006,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD ¥Õ¥¡¥¤¥ë:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©" @@ -2000,181 +2016,181 @@ msgstr "PPD msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "Two Level Grayscale" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Two Level Grayscale" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Six Color Enhanced Composite" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Three Color Composite" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Three Color Composite" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Six Color Enhanced Composite" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "¤Ï¤¬¤­" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "ColorLife Paper" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2232,88 +2248,99 @@ msgstr "1200 DPI msgid "720 DPI Highest Quality" msgstr "1200 DPI ¹âÉʼÁ" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1200 DPI ¹âÉʼÁ" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1200 DPI ¹âÉʼÁ" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "ÌÀ¤ë¤µ:" @@ -3715,645 +3742,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4451,30 +4531,30 @@ msgstr " msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "¼è¤ê¾Ã¤·" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- °õºþ v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "¾ðÊó" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4482,7 +4562,7 @@ msgstr "" "°õºþ¤È\n" "ÀßÄê¤ÎÊݸ" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4490,15 +4570,15 @@ msgstr "" "ÀßÄê¤Î\n" "Êݸ" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "°õºþ" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "¥×¥ì¥Ó¥å¡¼" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4521,254 +4601,254 @@ msgstr "" "¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n" "¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "À£Ë¡:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Éý:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "¹â¤µ:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "°ÌÃÖ" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "¼«Æ°" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "½ÄÃÖ¤­" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "²£ÃÖ¤­" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "¾å²¼" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "²£Ä¹" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" "ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "ÍÑ»æ¤Î¸þ¤­:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "º¸Â¦:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "±¦Â¦:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "¾å¦:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "²¼Â¦:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Ãæ¿´:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "¿åÊ¿" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "ξü" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "¿âľ" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD ¥Õ¥¡¥¤¥ë:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "»²¾È" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "¥Æ¥¹¥È°õºþ" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4812,31 +4892,31 @@ msgstr "" "Free Software Foundation, Inc., 56 Temple Place - \n" "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4844,24 +4924,24 @@ msgstr "" "¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾" "¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "³ÈÂç½Ì¾®:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4869,31 +4949,31 @@ msgstr "" "³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª" "Âò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "ÈæΨ" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4901,68 +4981,68 @@ msgstr "" "¥ª¥ê¥¸¥Ê¥ë¤Î\n" "¥µ¥¤¥º¤ÎÍøÍÑ" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "°õºþ¥«¥é¡¼Ä´À°" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "½é´üÃͤËÌ᤹" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "ÊĤ¸¤ë" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "½ÐÎϤμïÎà:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "½ÐÎϤμïÎà:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "½ÐÎϤÎÄ´À°..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "ñ°Ì:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "ñ°Ì:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£" @@ -5103,15 +5183,15 @@ msgstr "Japanese" msgid "ISOLatin1" msgstr "ISO ¥é¥Æ¥ó£±" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5383,18 +5463,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5403,7 +5484,8 @@ msgstr "" "\n" "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5421,84 +5503,84 @@ msgstr "" "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n" "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "¥¤¥ó¥¯¤Î¿§" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "»Ä¤ê¤Î³ä¹ç" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ" "²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5574,7 +5656,7 @@ msgstr "" "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5640,12 +5722,12 @@ msgstr "" "¤µ¤¤¡£\n" "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5664,19 +5746,19 @@ msgstr "" "ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n" "ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5685,19 +5767,19 @@ msgstr "" "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" "¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5713,17 +5795,17 @@ msgstr "" "¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" "\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "¼ºÇԤǤ¹¡ª\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5732,27 +5814,27 @@ msgstr "" "¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" "ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5769,12 +5851,12 @@ msgstr "" "°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n" "ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5785,42 +5867,42 @@ msgstr "" "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ" "¤¹¡£\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "¥Ñ¥¹ #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "´Ö³ÖÊäÀµÃæ..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5833,7 +5915,7 @@ msgstr "" "¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n" "ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "ÆþÎÏ¥¨¥é¡¼\n" @@ -5969,6 +6051,10 @@ msgstr " msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" diff --git a/po/nb.gmo b/po/nb.gmo index 5e8ce67..192e5c6 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 5ade1f1..151dc9b 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-07-01 19:36+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Sett til standardverdier" @@ -278,9 +279,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Vanlig papir" @@ -290,9 +291,9 @@ msgid "Plain Paper PIXMA" msgstr "Vanlig papir" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Gjennomsiktighet" @@ -333,9 +334,10 @@ msgid "Photo Paper Pro" msgstr "Profesjonelt fotopapir" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Annet" @@ -398,7 +400,7 @@ msgstr "" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Oppløsning" @@ -535,9 +537,9 @@ msgstr "Lys cyan" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -555,8 +557,8 @@ msgid "Light Yellow Transition" msgstr "Lys cyan" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -586,12 +588,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Sort" @@ -611,14 +615,14 @@ msgstr "Foto CcMmY-farge" msgid "Photo CcMmYK Color" msgstr "Foto CcMmYK-farge" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Farger" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -659,8 +663,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Skriv ut" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Gråtoner" @@ -817,12 +821,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -830,12 +836,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -843,12 +851,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Gul" @@ -856,9 +866,10 @@ msgstr "Gul" msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -866,8 +877,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -875,9 +886,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1109,7 +1121,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1200,135 +1212,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manuell" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Skriv ut til fil?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Autovelg" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Høyde:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografi" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Lys cyan" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Lys magenta" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Sort" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Gul" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Matt papir" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Fotopapir" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Glanset film" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Sort" @@ -1566,85 +1589,77 @@ msgstr "Lys cyan" msgid "Medium Gray Transition" msgstr "Lys cyan" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Utskriftstype:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Skriv ut til fil?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Utskriftstype:" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Størrelse" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Skriver støtter ikke fargeutskrift\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1698,104 +1713,105 @@ msgid "test print" msgstr "testutskrift" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Glanset film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Konvolutter" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Matt papir" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papir for blekkskriver" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papir med fotokvalitet for blekkskriver" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotopapir" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1803,8 +1819,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1940,8 +1956,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD fil:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD/Fil?" @@ -1950,184 +1966,184 @@ msgstr "PPD/Fil?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Gråtoner" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Gråtoner" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Farge" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Farge" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Stylus Photo" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 #, fuzzy msgid "Plain Paper Fast Load" msgstr "Vanlig papir" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkort" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matt papir" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Glanset fotopapir" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Vanlig papir" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Matt papir" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2182,86 +2198,97 @@ msgstr "" msgid "720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "1200 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "150x150 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "150x150 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "1200 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "1200 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Skrivernavn:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Skrivernavn:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Lysstyrke:" @@ -3665,645 +3692,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4401,30 +4481,30 @@ msgstr "Sett til standardverdier" msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Avbryt" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Skriv ut v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4432,7 +4512,7 @@ msgstr "" "Skriv ut og\n" "lagre innstillinger" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4440,15 +4520,15 @@ msgstr "" "Lagre\n" "innstillinger" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Skriv ut" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Forhåndsvisning" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4462,252 +4542,252 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Størrelse:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Bredde:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Bredde på papiret du skal skrive ut på" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Høyde:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Høyde på papiret du skal skrive ut på" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Posisjon" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portrett" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Landskap" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Opp-ned" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Landskap" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Venstre:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Avstand fra venstre kant av arket til bildet" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Høyre:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Avstand fra venstre kant av arket til høyre kant av bildet" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Avstand fra høyre kant av arket til bildet" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Øverst:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Avstand fra toppen av arket til bildet" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Nederst:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Avstand fra toppen av arket til nedre kant av bildet" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Avstand fra nedre kant av arket til bildet" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Sentrer:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horisontalt" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Sentrer bildet horisontalt på arket" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Begge" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Sentrer bildet på arket" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Vertikalt" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Sentrer bildet vertikalt på arket" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Sett opp skriver" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Velg din skrivermodell" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Raskt heltall" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Velg din skrivermodell" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD fil:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Skriv inn korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Bla gjennom" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Velg korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Skriv inn korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "testutskrift" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Skriv ut til fil?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definer ny skriver" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Om Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print versjon " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4731,84 +4811,84 @@ msgid "" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" msgstr "" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Innstillinger for parametere" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Sett opp skriver..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Ny skriver..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Skalering" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Sett skalering (størrelse) på bildet" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Prosent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Skaler utskriften til størrelsen på papiret" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Skaler utskriften til antall punkter per tomme" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Sett bredde på utskriften" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Sett høyde for utskriften" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4816,67 +4896,67 @@ msgstr "" "Bruk opprinnelig\n" "bildestørrelse" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Sett størrelsen på utskriften til størrelsen på bildet" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Sett til standardverdier" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Lukk" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Forhåndsvisning av bilde" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Utskriftstype:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Utskriftstype:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Velg ønsket type for utdata" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Juster utskrift..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr ">" -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Velg basis måleenhet for utskrift" @@ -5017,15 +5097,15 @@ msgstr "Norwegian" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5199,18 +5279,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Kan ikke lese fra %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Kan ikke skrive til %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5219,7 +5300,8 @@ msgstr "" "\n" "Kan ikke skrive til %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5237,82 +5319,82 @@ msgstr "" "Kan ikke finne skrivertype.\n" "Vennligst bruk -m for å spesifisere din skrivermodell.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Du må bruke en rå enhet for å hente blekknivå.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Kan ikke tolke utskrift fra skriver\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Skriver støtter ikke fargeutskrift\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Blekkfarge" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Prosent gjenstående" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Skriver støtter ikke fargeutskrift\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Du må bruke en rå enhet for å hente blekknivå.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Du kan kun oppgi én skrivermodell." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Renser hoder...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5351,7 +5433,7 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5387,12 +5469,12 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Kan ikke sende kommando til skriveren, avslutter.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5404,20 +5486,20 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr ">" -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" "Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5426,7 +5508,7 @@ msgstr "" "OK, skriveren er justert, men justeringen er ikke lagret.\n" "Hvis du ønsker å lagre justeringen må d\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5435,12 +5517,12 @@ msgstr "" "Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n" "skrive «r»:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Gjentar justeringsprosessen.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5450,44 +5532,44 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "I ferd med å lagre innstillinger..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "feilet!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "fullført!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Innstillingene for justering er lagret til skriveren.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Kommandoen ble ikke gjenkjent.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Siste kommando ble ikke bekreftet.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5498,12 +5580,12 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Trykk linjeskift for å fortsette > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5511,42 +5593,42 @@ msgid "" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Gjennomgang #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Vennligst sett inn et nytt ark.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Tallet er utenfor gyldig område!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Kan ikke forstå det du skrev inn!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Prøver å sette justering..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "fullført.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5555,7 +5637,7 @@ msgid "" "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Feil i inndata\n" @@ -5691,6 +5773,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 "Cannot identify printer!\n" +#~ msgstr "Kan ikke tolke utskrift fra skriver\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Gul" diff --git a/po/nl.gmo b/po/nl.gmo index 2d586c7..1cbd16d 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 0f1f018..5e0faad 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-03-15 20:31+0100\n" "Last-Translator: Hylke Witjens \n" "Language-Team: Dutch \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 msgid "Default" msgstr "" @@ -283,9 +284,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Blank papier" @@ -295,9 +296,9 @@ msgid "Plain Paper PIXMA" msgstr "Blank papier" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparanten" @@ -338,9 +339,10 @@ msgid "Photo Paper Pro" msgstr "Professioneel fotopapier" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Overige" @@ -403,7 +405,7 @@ msgstr "" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Resolutie" @@ -544,9 +546,9 @@ msgstr "Licht Cyaan" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -564,8 +566,8 @@ msgid "Light Yellow Transition" msgstr "Licht Cyaan" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -595,12 +597,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Zwart" @@ -620,14 +624,14 @@ msgstr "Foto CcMmY kleuren" msgid "Photo CcMmYK Color" msgstr "Foto CcMmYK Kleuren" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Kleur" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -668,8 +672,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Afdrukken" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Grijswaarden" @@ -825,12 +829,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyaan" @@ -839,12 +845,14 @@ msgstr "Cyaan" msgid "Adjust the cyan gamma" msgstr "Pas de hoeveelheid cyaan aan" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -853,12 +861,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Pas de hoeveelheid magenta aan" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Geel" @@ -867,9 +877,10 @@ msgstr "Geel" msgid "Adjust the yellow gamma" msgstr "Pas de hoeveelheid geel aan" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -878,8 +889,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Pas de hoeveelheid geel aan" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -888,9 +899,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Pas de hoeveelheid magenta aan" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1125,7 +1137,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1216,135 +1228,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standaard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Rolinvoer" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Handmatig" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Afdrukken Naar Bestand" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Automatisch Selecteren" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Hoogte: " -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Foto" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Zes kleuren foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Licht Cyaan" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Licht Magenta" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Zwart" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Geel" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Mat papier" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Fotopapier" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Glanzende laag" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Zwart" @@ -1590,86 +1613,78 @@ msgstr "Licht Cyaan" msgid "Medium Gray Transition" msgstr "Licht Cyaan" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Afdrukken Naar Bestand" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Handmatig" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Grootte" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI unidirectioneel" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI unidirectioneel" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Printer ondersteund geen kleuren\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1723,104 +1738,105 @@ msgid "test print" msgstr "Test afdruk" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Vier kleuren standaard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Drie kleuren composiet" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Zes kleuren foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Vijf kleuren foto composiet" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Glanzende laag" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Enveloppen" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Mat papier" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Inkjet-papier" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Fotokwaliteit Inkjet-papier" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotopapier" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Premium glanzend fotopapier" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Premium Luster Photo Papier" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Fotokwaliteit glanzend papier" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" @@ -1828,8 +1844,8 @@ msgstr "Ilford Heavy Paper" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1969,8 +1985,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD Bestand:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD Bestand?" @@ -1979,183 +1995,183 @@ msgstr "PPD Bestand?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Grijswaarden" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Grijswaarden" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Zes kleuren verbeterd composiet" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Zeven kleuren verbeterd" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Zeven kleuren verbeterd" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Vier kleuren standaard" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Drie kleuren composiet" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Drie kleuren composiet" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Vier kleuren standaard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Vier kleuren standaard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Zes kleuren verbeterd composiet" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Zeven kleuren verbeterd" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Zes kleuren foto" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Blak papier snellader" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Briefkaart" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Mat papier" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Premium glanzend fotopapier" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Blank papier" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Mat papier" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2213,88 +2229,99 @@ msgstr "1200 DPI hoge kwaliteit" msgid "720 DPI Highest Quality" msgstr "1200 DPI Hoogste kwaliteit" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Hoogste kwaliteit" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Hoogste kwaliteit" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Printer Naam:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Printer Naam:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Helderheid:" @@ -3697,645 +3724,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4429,30 +4509,30 @@ msgstr "" msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Annuleren" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Info" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4460,7 +4540,7 @@ msgstr "" "Afdrukken en\n" "instellingen opslaan" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4468,15 +4548,15 @@ msgstr "" "Instellingen\n" "opslaan" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Afdrukken" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Voorbeeld" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4490,201 +4570,201 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Grootte" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Afmetingen" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Breedte: " -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Breedte van het papier waarop je wenst te printen" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Hoogte: " -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Hoogte van het papier waarop je wenst te printen" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Grootte" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Positie" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automatisch" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portret" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Landschap" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Ondersteboven" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 #, fuzzy msgid "Orientation:" msgstr "Gekleurdheid:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Links:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Rechts:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "" "Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Boven:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Onder:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Afstand vanaf de onderkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Midden X:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horzintaal" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centreer het plaatje horizontaal op het papier" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Beide" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centreer het plaatje op het papier" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Verticaal" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centreer het plaatje verticaal op het papier" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Stel Printer in" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Printer Naam:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Selecteer jouw printer model" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Printer model:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Selecteer jouw printer model" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD Bestand:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Geef de juiste PPD bestandsnaam voor jouw printer" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Bladeren" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Kies de juiste PPD bestandsnaam voor jouw printer" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4693,54 +4773,54 @@ msgstr "" "Selecteer de naam van de printer (Niet het type, of model, of printer) " "waarna je wenst te printen" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Printer Naam:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Geef de juiste PPD bestandsnaam voor jouw printer" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "Test afdruk" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Afdrukken Naar Bestand" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Stel nieuwe Printer in" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Printer Naam:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Info over Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print Versie" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4785,11 +4865,11 @@ msgstr "" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Printerinstellingen" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4797,11 +4877,11 @@ msgstr "" "Selecteer de naam van de printer (Niet het type, of model, of printer) " "waarna je wenst te printen" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Instellen Printer..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4809,129 +4889,129 @@ msgstr "" "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar " "deze printer af te drukken." -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Nieuwe Printer..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Grootte" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Schaldn" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Geef de schaal (formaat) van het plaatje" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Geef de breedte van de afdruk" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Geef de hoogte van de afdruk" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" msgstr "" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Sluiten" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Afdruk voorvertoning" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 msgid "Output" msgstr "" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Past uitvoer aan..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Eenheden" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr ">" -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Eenheden" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "" @@ -5071,15 +5151,15 @@ msgstr "Dutch" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5274,18 +5354,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Kan niet lezen van %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Kan %s niet openen lezen/schrijven: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Kan niet schrijven naar %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5294,7 +5375,8 @@ msgstr "" "\n" "Kan niet schrijven naar %s:%s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5312,84 +5394,84 @@ msgstr "" "Kan printer type niet vaststellen.\n" "Gebruik asjeblief -m om je printermodel te specificeren.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Printer status heeft een raw device nodig.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Kan de uitvoer van de printer niet verwerken\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Printer ondersteund geen kleuren\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Kleureninkt" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Overblijvend percentage" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Printer ondersteund geen kleuren\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Printer status heeft een raw device nodig.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "U mag maar een printermodel specificeren" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Bezig met het schoonmaken van de koppen..\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "Bezig met nozzle check, let er astublief op, dat er papier in de printer " "zit.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5467,7 +5549,7 @@ msgstr "" "It is essential that you not turn your printer off during this procedure.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5545,12 +5627,12 @@ msgstr "" "tijdens deze procedure.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Niet mogelijk om commando's naar de printer te sturen, eindigd.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5562,19 +5644,19 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr ">" -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5583,19 +5665,19 @@ msgstr "" "OK, je printer is uitgelijnt, maar de uitlijnen is niet bewaard.\n" "Als je de uitlijning wilt bewaren, moet je het proces herhalen.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Herhaal de uitlijn procedure.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5605,17 +5687,17 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Bezig met schrijven van instellingen..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "Gefaalt!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5624,27 +5706,27 @@ msgstr "" "Je instellingen werden niet succesvol weggeschreven. Je moet de\n" "uitlijn procedure herhalen.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "Gelukt!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, fuzzy, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Je uitlijn instellingen zijn bewaard door de printer.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Onbekend commando.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Laatste commando is niet bevestigd.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5655,12 +5737,12 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Druk enter om door te gaan >" -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5671,42 +5753,42 @@ msgstr "" "patroon.\n" "Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Voer astublief een nieuw vel papier in.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Nummer valt buiten bereik!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Probeert uitlijning in te stellen." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "gelukt.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5719,7 +5801,7 @@ msgstr "" "lijn patroon %d is. Als het dat niet is, zul je de procedure moeten\n" "herhalen om de beste kwaliteit te krijgen.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "" @@ -5855,6 +5937,10 @@ msgstr "" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "Zoek volgende rij faalde op %d\n" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Kan de uitvoer van de printer niet verwerken\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Pas de hoeveelheid geel aan" diff --git a/po/pl.gmo b/po/pl.gmo index 8f59c1e..71db317 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 6796d76..e7797db 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2001-10-18 11:53+0100\n" "Last-Translator: GNOME PL Team \n" "Language-Team: Polish \n" @@ -19,6 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Ustaw domy¶lne" @@ -285,9 +286,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Zwyk³y papier" @@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA" msgstr "Zwyk³y papier" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Przezroczyste" @@ -340,9 +341,10 @@ msgid "Photo Paper Pro" msgstr "" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Inne" @@ -404,7 +406,7 @@ msgstr "" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Rozdzielczo¶æ" @@ -540,9 +542,9 @@ msgstr "" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -558,8 +560,8 @@ msgid "Light Yellow Transition" msgstr "" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -588,12 +590,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Czarny" @@ -613,14 +617,14 @@ msgstr "" msgid "Photo CcMmYK Color" msgstr "" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Kolor" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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" @@ -660,8 +664,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Wydrukuj" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Odcienie szaro¶ci" @@ -818,12 +822,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Niebieskozielony" @@ -831,12 +837,14 @@ msgstr "Niebieskozielony" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Purpurowy" @@ -844,12 +852,14 @@ msgstr "Purpurowy" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "¯ó³æ" @@ -857,9 +867,10 @@ msgstr " msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -867,8 +878,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -876,9 +887,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1110,7 +1122,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1198,131 +1210,142 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 msgid "Manual Feed" msgstr "" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Wydrukowaæ do pliku?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Wysoko¶æ:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 msgid "Light Cyan" msgstr "" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Purpurowy" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Czarny" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "¯ó³æ" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Czarny" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Czarny" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Czarny" @@ -1553,86 +1576,78 @@ msgstr "" msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Typ wyj¶ciowy:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Wydrukowaæ do pliku?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Rozmiar" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "1440 x 720 DPI" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1686,104 +1701,105 @@ msgid "test print" msgstr "" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Koperty" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1791,8 +1807,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1925,8 +1941,8 @@ msgstr "" msgid "PPDFile" msgstr "Plik PPD:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "Plik PPD?" @@ -1935,181 +1951,181 @@ msgstr "Plik PPD?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "Odcienie szaro¶ci" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Odcienie szaro¶ci" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Stylus Photo" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 #, fuzzy msgid "Plain Paper Fast Load" msgstr "Zwyk³y papier" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 -msgid "Matte Paper Heavyweight" -msgstr "" - #: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 #: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 #: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +msgid "Matte Paper Heavyweight" +msgstr "" + +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Zwyk³y papier" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 msgid "Archival Matte Paper" msgstr "" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2163,86 +2179,97 @@ msgstr "" msgid "720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Ustawienia drukarki" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Ustawienia drukarki" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Jasno¶æ:" @@ -3644,645 +3671,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4376,30 +4456,30 @@ msgstr "Ustaw domy msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Anuluj" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Drukowanie v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Informacje o" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4407,7 +4487,7 @@ msgstr "" "Ustawienia drukowania\n" "i zapisu" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4415,15 +4495,15 @@ msgstr "" "Zapisz\n" "ustawienia" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Podgl±d" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4437,249 +4517,249 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Wymiary:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Szeroko¶æ:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Wysoko¶æ:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Po³o¿enie" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automatycznie" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Portret" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Pejza¿" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Z góry na dó³" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Pejza¿" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "U³o¿enie:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Lewa:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Prawa:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Góra:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Dó³:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Poziomo" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Oba" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Pionowo" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Ustawienia drukarki" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "Plik PPD:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Przegl±daj" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Wydrukowaæ do pliku?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "" "\n" "\n" @@ -4703,149 +4783,149 @@ msgid "" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" msgstr "" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Ustawienia drukarki" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "" -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "" -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Skalowanie:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" msgstr "" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Regulacja koloru wydruku" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Ustaw domy¶lne" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Zamknij" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Podgl±d obrazu" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Typ wyj¶ciowy:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Typ wyj¶ciowy:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Jednostki:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Jednostki:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "" @@ -4982,15 +5062,15 @@ msgstr "Polish" msgid "ISOLatin1" msgstr "ISOLatin2" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5164,18 +5244,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Nie mo¿na odczytaæ z %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Nie mo¿na zapisaæ do %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5184,7 +5265,8 @@ msgstr "" "\n" "Nie mo¿na zapisaæ do %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5199,82 +5281,82 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" - -#: src/escputil/escputil.c:927 -#, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Mo¿na podaæ tylko jeden model drukarki." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Czyszczenie g³owic...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5313,7 +5395,7 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5349,12 +5431,12 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5366,38 +5448,38 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "" -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" msgstr "" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5407,44 +5489,44 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "" -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5455,12 +5537,12 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "" -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5468,42 +5550,42 @@ msgid "" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "" -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5512,7 +5594,7 @@ msgid "" "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "" @@ -5648,6 +5730,10 @@ msgstr "" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "" +#, fuzzy +#~ msgid "Cannot identify printer!\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "¯ó³æ" diff --git a/po/pt.gmo b/po/pt.gmo index 906ed28..acd518e 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 7e6a140..a686b8c 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-10-16 19:24+0100\n" "Last-Translator: Filipe Maia \n" "Language-Team: Portuguese \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Definir Valores Padrão" @@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Papel Normal" @@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA" msgstr "Papel Normal" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Transparências" @@ -347,9 +348,10 @@ msgid "Photo Paper Pro" msgstr "Papel de Fotografia Profissional" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Outro" @@ -413,7 +415,7 @@ msgstr "Fonte do \"media\" para o qual est #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Resolução" @@ -554,9 +556,9 @@ msgstr "Ciano Claro" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -574,8 +576,8 @@ msgid "Light Yellow Transition" msgstr "Ciano Claro" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -605,12 +607,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Preto" @@ -630,14 +634,14 @@ msgstr "Cor CcMmY de Fotografia" msgid "Photo CcMmYK Color" msgstr "Cor CcMmYK de Fotografia<" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Cor" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -678,8 +682,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Imprimir" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Escala de Cinzento" @@ -841,12 +845,14 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Ciano" @@ -855,12 +861,14 @@ msgstr "Ciano" msgid "Adjust the cyan gamma" msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -869,12 +877,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Amarelo" @@ -883,9 +893,10 @@ msgstr "Amarelo" msgid "Adjust the yellow gamma" msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -894,8 +905,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -904,9 +915,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1146,7 +1158,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1237,135 +1249,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Rolo de Alimentação" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manual" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Imprimir para o Ficheiro?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Auto Seleccionar" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Altura" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Seis Cores Foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Ciano Claro" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Magenta Claro" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Preto" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Amarelo" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Papel Mate" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Papel de Fotografia" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Filme Lustroso" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Preto" @@ -1612,87 +1635,79 @@ msgstr "Ciano Claro" msgid "Medium Gray Transition" msgstr "Ciano Claro" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Tipo de Output:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Imprimir para o Ficheiro?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Tamanho" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidireccional" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidireccional" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, 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" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1746,104 +1761,105 @@ msgid "test print" msgstr "impressão de teste" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Quatro Cores Standard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Três Cores Compósito" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Seis Cores Foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Cinco Cores Foto Compósito" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Filme Lustroso" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Envelopes" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Papel Mate" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papel para Impressora Jacto de Tinta" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Papel de Fotografia" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Papel de Fotografia Lustroso Premium" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Papel de Fotografia Brilhante Premium" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Papel de Qualidade Fotografica Lustroso" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Papel Pesado Ilford" @@ -1851,8 +1867,8 @@ msgstr "Papel Pesado Ilford" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1992,8 +2008,8 @@ msgstr "" msgid "PPDFile" msgstr "Ficheiro PPD:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "Ficheiro PPD?" @@ -2002,181 +2018,181 @@ msgstr "Ficheiro PPD?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "Escala de Cinzento de 2 Níveis" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Escala de Cinzento de 2 Níveis" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quato Tons" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Seis Cores Compósito Realçado" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Três Cores Compósito" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Três Cores Compósito" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Seis Cores Compósito Realçado" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Papel Normal Carregação Rápida" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Cartão" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "Película" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Papel Mate" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Papel de Fotografia Lustroso Premium" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Papel ColorLife" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Papel Mate" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2234,88 +2250,99 @@ msgstr "1200 DPI alta qualidade" msgid "720 DPI Highest Quality" msgstr "1200 DPI qualidade máxima" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Máxima Qualidade" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Máxima Qualidade" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Nome da Impressora:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Nome da Impressora:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Brilho:" @@ -3717,645 +3744,698 @@ msgstr "Stylus c20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4453,30 +4533,30 @@ msgstr "Definir Valores Padr msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Cancelar" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Imprimir v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Acerca" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4484,21 +4564,21 @@ msgstr "" "Imprimir e\n" "Gravar Definições" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" msgstr "Gravar Definições" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Imprimir" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Previsualizar" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4526,76 +4606,76 @@ msgstr "" "sua\n" "posição original." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Dimensões:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Largura:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Largura do papel para o qual deseja imprimir" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Altura" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Altura do papel para o qual deseja imprimir" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Posição" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Retrato" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Paisagem" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "De cabeça para baixo" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Paisagem de cabeça para baixo" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -4603,124 +4683,124 @@ msgstr "" "Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem " "de cabeça para baixo" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientação:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Esquerda:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Distância da esquerda do papel até à imagem" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Direita:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Distência da esquerda do papel até à direita da imagem" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Distância da direita do papel até à imagem" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Topo:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Distência do topo do papel até à imagem" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Fundo:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Distância do topo do papel até ao fundo da imagem" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Distância do fundo do papel até à imagem" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centro:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horizontalmente" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centrar a imagem horizontalmente no papel" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Ambos" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centrar a imagem no papel" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Verticalmente" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centrar a imagem verticalmente no papel" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Configurar a Impressora" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Seleccione o seu modelo de impressora" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Modelo da Impressora:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Seleccione o seu modelo de impressora" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "Ficheiro PPD:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Insira o ficheiro PPD correct para a sua impressora" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Navegar" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Seleccione o ficheiro PPD correcto para a sua impressora" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4729,54 +4809,54 @@ msgstr "" "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" "a qual deseja imprimir" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Insira o ficheiro PPD correct para a sua impressora" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "impressão de teste" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Imprimir para o Ficheiro?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definir nova Impressora" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Insira o noma que deseja dar a esta impressora lógica" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Acerca do Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Versão do Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4821,11 +4901,11 @@ msgstr "" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Definições da Impressora" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4833,11 +4913,11 @@ msgstr "" "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" "a qual deseja imprimir" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Configurar Impressora..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4846,11 +4926,11 @@ msgstr "" "imprimir\n" "para esta impressora" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Nova Impressora..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4858,24 +4938,24 @@ msgstr "" "Definir uma nova impressora lógica. Isto pode ser usado para denominar uma " "colecção de definições que você deseje guardar para uso futuro" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Redimesionamento:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Definir a escala (tamanho) da imagem" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4883,31 +4963,31 @@ msgstr "" "Seleccione se a escala é medida em percentagem do tamanho de página " "disponível ou número de pontos por polegada na impressão" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Precentagem" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Redimensionar a impressão para o tamanho da página" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Redimensionar a impressão para o número de pontos por polegada" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Definir a largura da impressão" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Definir a altura da impressão" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4915,69 +4995,69 @@ msgstr "" "Usar Original\n" "Tamanho de Imagem" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Definir como tamanho de impressão o tamanho da imagem" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Ajustamento da Cor de Impressão" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Definir Valores Padrão" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Fechar" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Previsualização da Imagem" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Tipo de Output:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Tipo de Output:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Seleccione o tipo de output desejado" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Ajustar o Output..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de " "\"dither\"" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Seleccione a base das unidades de medida para impressão" @@ -5118,15 +5198,15 @@ msgstr "Portuguese" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5395,18 +5475,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Não é possível ler a partir de %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Não foi possível abrir %s escrita/leitura: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Não foi possível escrever para %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5415,7 +5496,8 @@ msgstr "" "\n" "Não foi possível escrever para %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5433,83 +5515,83 @@ msgstr "" "Não foi possível detecar o tipo de impressora.\n" "Por favor use a opção -m para especificar o modelo da sua impressora.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Não é possivel processar o output da impressora\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "A impressora não suporta a cor de impressão\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Cor da Tinta" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Percentagem restante" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "A impressora não suporta a cor de impressão\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Identificação da impressora requere a utilização de um dispositivo.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Você só pode especificar um modelo de impressora" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Limpando as cabeças...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "A testar a agulha, por favor assegure-se que existe papel na impressora.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5594,7 +5676,7 @@ msgstr "" "procedimento.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5669,12 +5751,12 @@ msgstr "" "os resultados. É essencial que você não desligue a impressora durante este " "procedimento.\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Não foi possível enviar o comando para a impressora, saindo.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5693,20 +5775,20 @@ msgstr "" "Vai-lhe ser pedido para confirmar a sua escolha.\n" "O que é que pretende fazer (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" "Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5715,7 +5797,7 @@ msgstr "" "A sua impressora está alinhada, mas o alinhamento não foi gravado.\n" "Se deseja gravar o alinhamento, terá de repetir o processo.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5724,12 +5806,12 @@ msgstr "" "Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n" "o processo de alinhamento:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Repetindo o processo de alinhamento.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5744,17 +5826,17 @@ msgstr "" "Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n" "as configurações para a sua impressora:\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Prestes a gravar as configurações..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "falhou!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5763,28 +5845,28 @@ msgstr "" "A suas configurações não foram gravados com sucesso.\n" "Vai ter de repetir o processo de alinhamento.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "sucesso!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" "As suas configurações do alinhamento foram gravadas para a impressora.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Comando desconhecido.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "O comando final não foi confirmado.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5801,12 +5883,12 @@ msgstr "" "Por favor coloque uma folha de papel na impressora para iniciar\n" "o processo de alinhamento da cabeça.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Pressione enter para continuar > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5817,42 +5899,42 @@ msgstr "" "padrão.\n" "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Passagem #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Por favor insira uma nova folha de papel.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Número fora do intervalo|\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Eu não consigo intender o que escreveu!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Tentando definir o alinhamento..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "sucesso.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5867,7 +5949,7 @@ msgstr "" "é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n" "qualidade de impressão.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Erro no input\n" @@ -6003,6 +6085,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 "Cannot identify printer!\n" +#~ msgstr "Não é possivel processar o output da impressora\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Ajustar o equilíbrio de amarelo na impressão" diff --git a/po/sk.gmo b/po/sk.gmo index 9b604f1..8e1bd40 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index ca6ab78..f350164 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-05-20 18:08+0100\n" "Last-Translator: Zdenko Podobný \n" "Language-Team: Slovak \n" @@ -17,6 +17,7 @@ msgstr "" "X-Generator: KBabel 0.9.5\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Nastavi» ¹tandardné" @@ -295,9 +296,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Obyèajný papier" @@ -307,9 +308,9 @@ msgid "Plain Paper PIXMA" msgstr "Obyèajný papier" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Priesvitná fólia" @@ -350,9 +351,10 @@ msgid "Photo Paper Pro" msgstr "Foto papier pro" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Iné" @@ -416,7 +418,7 @@ msgstr "Zdroj (vstupn #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Rozlí¹enie" @@ -557,9 +559,9 @@ msgstr "Jasn #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -577,8 +579,8 @@ msgid "Light Yellow Transition" msgstr "Jasná azúrová" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -608,12 +610,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Èierna" @@ -633,14 +637,14 @@ msgstr "Fotografick msgid "Photo CcMmYK Color" msgstr "Fotografická CcMmYK farba" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Farebne" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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,8 +685,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Tlaèi»" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "V odtieòoch ¹edej" @@ -843,12 +847,14 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Azúrová" @@ -857,12 +863,14 @@ msgstr "Az msgid "Adjust the cyan gamma" msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Purpurová" @@ -871,12 +879,14 @@ msgstr "Purpurov msgid "Adjust the magenta gamma" msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "®ltá" @@ -885,9 +895,10 @@ msgstr " msgid "Adjust the yellow gamma" msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -896,8 +907,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -906,9 +917,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1148,7 +1160,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1239,135 +1251,146 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "©tandardný" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Kotúèový podávaè" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manuál" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Tlaèi» do súboru?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Automatický výber" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Vý¹ka:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Fotografický ¹es»farebný" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Jasná azúrová" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Jasná purpurová" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Èierna" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "®ltá" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Matný papier" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Fotografický papier" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Lesklý film" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Èierna" @@ -1614,87 +1637,79 @@ msgstr "Jasn msgid "Medium Gray Transition" msgstr "Jasná azúrová" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Typ výstupu:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Tlaèi» do súboru?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Veµkos»" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Jednosmerne" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Jednosmerne" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Tlaèiareò nepodporuje farebný výstup\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1748,104 +1763,105 @@ msgid "test print" msgstr "Test tlaèe" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "©tandardný ¹tvorfarebný" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Kompozitný trojfarebný" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Fotografický ¹es»farebný" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Kompozitný fotografický pä»farebný" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Lesklý film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Obálky" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Matný papier" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Papier pre atramentovú tlaèiareò" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Papier s fotografickou kvalitou" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotografický papier" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Lesklý foto papier Premium" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Ligotavý foto papier Premium" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Lesklý fotografický papier" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Ilford »a¾ký papier" @@ -1853,8 +1869,8 @@ msgstr "Ilford msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1994,8 +2010,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD súbor:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD súbor?" @@ -2004,183 +2020,183 @@ msgstr "PPD s msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 #, fuzzy msgid "Two Level Grayscale" msgstr "V odtieòoch ¹edej" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "V odtieòoch ¹edej" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Kompozitný roz¹írený ¹es»farebný" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 #, fuzzy msgid "Seven Color Photo" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Kompozitný trojfarebný" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Kompozitný trojfarebný" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Kompozitný roz¹írený ¹es»farebný" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Obyèajný papier rýchle nasadenie" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Pohµadnica" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matný papier" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Lesklý foto papier Premium" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "Obyèajný papier" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Matný papier" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2238,88 +2254,99 @@ msgstr "1200 DPI Vysok msgid "720 DPI Highest Quality" msgstr "1200 DPI Najvy¹¹ia kvalita" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 x 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Najvy¹¹ia kvalita" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 x 360 DPI Najvy¹¹ia kvalita" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Názov tlaèiarne:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Názov tlaèiarne:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Jas:" @@ -3722,645 +3749,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4458,30 +4538,30 @@ msgstr "Nastavi msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Storno" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Tlaè v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "O programe" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4489,7 +4569,7 @@ msgstr "" "Ulo¾i» nastavenia\n" "a vytlaèi»" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4497,15 +4577,15 @@ msgstr "" "Ulo¾i»\n" "nastavenia" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Tlaèi»" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Náhµad" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4529,200 +4609,200 @@ msgstr "" "Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na " "pôvodnú pozíciu." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Rozmery:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "©írka:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "©írka papiera, na ktorý chcete tlaèi»" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Vý¹ka:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Pozícia" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automaticky" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Na vý¹ku" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Na ¹írku" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Hore nohami" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Na ¹írku" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" "Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami " -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientácia:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "¥avý:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Vzdialenos» od µavého okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Pravý:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Vzdialenos» od pravého okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Horný:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Vzdialenos» od horného okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Dolný:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Vzdialenos» od dolného okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centrovanie:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Vodorovne" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Vycentrova» vodorovne obrázok na papieri" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Oboje" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Vycentrova» obrázok na papieri" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Zvislo" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Vycentrova» obrázok zvisle na papieri" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Nastavi» tlaèiareò" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Vyberte model va¹ej tlaèiarne" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Model tlaèiarne:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Vyberte model va¹ej tlaèiarne" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD súbor:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Prechádza»" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4731,54 +4811,54 @@ msgstr "" "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete " "tlaèi»" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "Test tlaèe" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Tlaèi» do súboru?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Definovanie novej tlaèiarne" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "O Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Verzia Gimp-Print" -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4824,11 +4904,11 @@ msgstr "" "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" "MA 02111-1307, USA.\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Nastavenie tlaèiarne" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4836,11 +4916,11 @@ msgstr "" "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete " "tlaèi»" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Nastavenie tlaèiarne..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4848,11 +4928,11 @@ msgstr "" "Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na " "tejto tlaèiarni" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Nová tlaèiareò..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4860,24 +4940,24 @@ msgstr "" "Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie " "zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Zmena:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Nastavi» zväè¹enie (veµkos») obrázku" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4885,31 +4965,31 @@ msgstr "" "Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti " "stránky, alebo ako èíslo výstupného DPI" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Percentá" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Nastavi» ¹írku tlaèe" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Nastavi» vý¹ku tlaèe" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4917,68 +4997,68 @@ msgstr "" "Pou¾i» pôvodnú\n" "veµkos» obrázka" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Prispôsobenie farieb pre tlaè" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Nastavi» ¹tandardné" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Zatvori»" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Náhµad obrázku" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Zvoµte vytú¾ený typ výstupu" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Prispôsobi» výstup..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Zvoli» základnú mernú jednotku pre tlaè" @@ -5119,15 +5199,15 @@ msgstr "Slovak" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5410,18 +5490,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Nie je mo¾né èíta» z %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Nie je mo¾né zapisova» do %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5430,7 +5511,8 @@ msgstr "" "\n" "Nie je mo¾né zapisova» do %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5448,82 +5530,82 @@ msgstr "" "Nie je mo¾né zisti» typ tlaèiarne.\n" "Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Tlaèiareò nepodporuje farebný výstup\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Farebný atrament" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Zostávajúce percentá" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Tlaèiareò nepodporuje farebný výstup\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Je mo¾né zvoli» len jeden model tlaèiarne." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Èistenie hláv...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5598,7 +5680,7 @@ msgstr "" "toho procesu nevypli tlaèiareò\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5668,12 +5750,12 @@ msgstr "" "nevypli tlaèiareò\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5692,20 +5774,20 @@ msgstr "" "Potom bude po¾iadaný potvrdi» va¹u voµbu.\n" "Èo chcete spravi»? (s,q,r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" "Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5714,7 +5796,7 @@ msgstr "" "V poriadku, va¹a tlaèiareò je zarovnaná, ale zarovnanie nebolo ulo¾ené.\n" "Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5723,12 +5805,12 @@ msgstr "" "Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces " "zarovnávania:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Opakujem proces zarovnávania.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5743,17 +5825,17 @@ msgstr "" "Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n" "va¹ej tlaèiarne:\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "O nastaveniach ukladania..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "zlyhalo!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5762,27 +5844,27 @@ msgstr "" "Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n" "procedúru zarovnávania.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "úspe¹ne!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Neznámy príkaz.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Závereèný príkaz nebol potvrdený.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5799,12 +5881,12 @@ msgstr "" "Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n" "procedúra zarovnávania hlavy.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Pre pokraèovanie stlaète enter > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5814,42 +5896,42 @@ msgstr "" "Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n" "Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Prechod #%d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Vlo¾te prosím nový hárok papiera.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Èíslo je mimo rozsahu!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Nedoká¾em pochopi», èo ste napísali!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Pokú¹am sa nastavi» zarovnávanie..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "úspe¹né.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5862,7 +5944,7 @@ msgstr "" "d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie " "výsledky pri tlaèi.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Chyba na vstupe\n" @@ -5998,6 +6080,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 "Cannot identify printer!\n" +#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" diff --git a/po/sv.gmo b/po/sv.gmo index 66aa5ad..faaa933 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 158128c..8acb8f0 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-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2002-10-03 13:47+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -17,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 #, fuzzy msgid "Default" msgstr "Ställ in standardvärden" @@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400×600 DPI" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "Vanligt papper" @@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA" msgstr "Vanligt papper" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "Genomskinligheter" @@ -349,9 +350,10 @@ msgid "Photo Paper Pro" msgstr "Professionellt fotopapper" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "Annat" @@ -415,7 +417,7 @@ msgstr "K #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "Upplösning" @@ -556,9 +558,9 @@ msgstr "Ljus cyan" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -576,8 +578,8 @@ msgid "Light Yellow Transition" msgstr "Ljus cyan" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -607,12 +609,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "Svart" @@ -632,14 +636,14 @@ msgstr "CcMmY-fotof msgid "Photo CcMmYK Color" msgstr "CcMmYK-fotofärg" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "Färg" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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 @@ -680,8 +684,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "Skriv ut" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "Gråtoner" @@ -843,12 +847,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "Cyan" @@ -857,12 +863,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Justera cyanbalansen på utskriften" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "Magenta" @@ -871,12 +879,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Justera magentabalansen på utskriften" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "Gult" @@ -885,9 +895,10 @@ msgstr "Gult" msgid "Adjust the yellow gamma" msgstr "Justera gulbalansen på utskriften" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "" @@ -896,8 +907,8 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Justera gulbalansen på utskriften" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "" @@ -906,9 +917,10 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Justera magentabalansen på utskriften" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "" @@ -1148,7 +1160,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1239,136 +1251,147 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "Rullmatning" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 #, fuzzy msgid "Manual Feed" msgstr "Manuell" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 #, fuzzy msgid "Print to CD" msgstr "Skriv ut till fil?" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Välj automatiskt" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Höjd:" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografi" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Sexfärgs foto" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 #, fuzzy msgid "Light Cyan" msgstr "Ljus cyan" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 #, fuzzy msgid "Light Magenta" msgstr "Ljus magenta" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 #, fuzzy msgid "Light Black" msgstr "Svart" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 #, fuzzy msgid "Dark Yellow" msgstr "Gult" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 #, fuzzy msgid "Matte Black" msgstr "Matte-papper" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 #, fuzzy msgid "Photo Black" msgstr "Fotopapper" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 #, fuzzy msgid "Gloss Optimizer" msgstr "Glansig film" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 #, fuzzy msgid "Light Light Black" msgstr "Svart" @@ -1615,87 +1638,79 @@ msgstr "Ljus cyan" msgid "Medium Gray Transition" msgstr "Ljus cyan" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 #, fuzzy msgid "Full Manual Control" msgstr "Utdatatyp:" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 #, fuzzy msgid "Print To Hub" msgstr "Skriv ut till fil?" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Utdatatyp:" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 #, fuzzy msgid "Automatic" msgstr "Storlek" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 #, fuzzy msgid "Bidirectional" msgstr "600 DPI enkelriktad" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 #, fuzzy msgid "Unidirectional" msgstr "600 DPI enkelriktad" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Skrivaren stöder inte färgutskrift\n" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1750,107 +1765,108 @@ msgstr "testutskrift" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "Fyrfärgs standard" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "Trefärgers sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "Sexfärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "Femfärgsfoto sammansatt" -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "Glansig film" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "Kuvert" -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "Matte-papper" -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "Bläckstrålepapper" -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "Bläckstrålepapper med fotokvalitet" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "Fotopapper" -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "Premiumglansigt fotopapper" -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "Fotopapper med premiumlyster" -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "Glansigt papper med fotokvalitet" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "Tungt Ilford-papper" @@ -1858,8 +1874,8 @@ msgstr "Tungt Ilford-papper" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1999,8 +2015,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD-fil:" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 #, fuzzy msgid "PPD File" msgstr "PPD-fil?" @@ -2009,199 +2025,199 @@ msgstr "PPD-fil?" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "Tvånivås gråton" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 #, fuzzy msgid "Three Level Grayscale" msgstr "Tvånivås gråton" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "Quadtone" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "Sexfärgs förbättrad sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "Sjufärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "Sjufärgs förbättrad" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 #, fuzzy msgid "Eight Color Photo" msgstr "Sexfärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 #, fuzzy msgid "One Color Raw" msgstr "Sjufärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Sjufärgs förbättrad" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 #, fuzzy msgid "Two Color Raw" msgstr "Fyrfärgs standard" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 #, fuzzy msgid "Three Color Raw" msgstr "Trefärgers sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Trefärgers sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 #, fuzzy msgid "Four Color Raw" msgstr "Fyrfärgs standard" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Fyrfärgs standard" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 #, fuzzy msgid "Five Color Raw" msgstr "Sjufärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 #, fuzzy msgid "Six Color Raw" msgstr "Sexfärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Sexfärgs förbättrad sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 #, fuzzy msgid "Seven Color Raw" msgstr "Sjufärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Sjufärgs förbättrad" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 #, fuzzy msgid "Eight Color Raw" msgstr "Sexfärgs foto" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Sexfärgs foto" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "Snabbladdning av vanligt papper" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Vykort" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "Bakljusfilm" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matte-papper" -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Premiumglansigt fotopapper" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 #, fuzzy msgid "ColorLife Paper" msgstr "ColorLife-papper" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 #, fuzzy msgid "Archival Matte Paper" msgstr "Matte-papper" -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "" @@ -2259,88 +2275,99 @@ msgstr "1200 DPI h msgid "720 DPI Highest Quality" msgstr "1200 DPI högsta kvalitet" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "2880 × 720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 #, fuzzy msgid "1440 x 720 DPI" msgstr "1440 × 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 #, fuzzy msgid "1440 x 720 DPI Highest Quality" msgstr "1440 × 360 DPI högsta kvalitet" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 × 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 #, fuzzy msgid "2880 x 720 DPI" msgstr "2880 × 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 #, fuzzy msgid "2880 x 720 DPI Highest Quality" msgstr "1440 × 360 DPI högsta kvalitet" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 #, fuzzy msgid "1440 x 1440 DPI" msgstr "1440 × 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 #, fuzzy msgid "2880 x 1440 DPI" msgstr "1440 × 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "1440 × 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 × 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 #, fuzzy msgid "2880 x 2880 DPI" msgstr "2880 × 720 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 × 720 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 #, fuzzy msgid "Interleave" msgstr "Skrivarnamn:" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 #, fuzzy msgid "Interleave 2" msgstr "Skrivarnamn:" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 #, fuzzy msgid "Eight Pass" msgstr "Ljusstyrka:" @@ -3743,645 +3770,698 @@ msgstr "Stylus C20sx" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "EPSON Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "EPSON Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "EPSON Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "EPSON Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "EPSON Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "EPSON Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "EPSON Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "EPSON Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "EPSON Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "EPSON Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "EPSON Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "EPSON PM-D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "EPSON PM-D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "EPSON PM-D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "EPSON PM-G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 #, fuzzy msgid "EPSON PM-G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 #, fuzzy msgid "EPSON PM-G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "EPSON PM-G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "EPSON PX-G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "EPSON PX-G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "EPSON PX-G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "EPSON PX-V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "EPSON PX-V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4479,30 +4559,30 @@ msgstr "St msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "Avbryt" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Utskrift v%s" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4510,7 +4590,7 @@ msgstr "" "Skriv ut och\n" "spara inställningar" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4518,15 +4598,15 @@ msgstr "" "Spara\n" "inställningar" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "Skriv ut" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "Förhandsgranskning" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4550,200 +4630,200 @@ msgstr "" "Om du klickar någon annan knapp under tiden du drar med musen kommer bilden " "att återgå till sin ursprungliga position." -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 #, fuzzy msgid "Paper Size" msgstr "Storlek" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "Dimensioner:" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "Bredd:" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "Bredd på pappret som du vill skriva ut till" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "Höjd:" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "Höjd på pappret som du vill skriva ut till" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 #, fuzzy msgid "Automatic Paper Size" msgstr "Storlek" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 #, fuzzy msgid "Image Position" msgstr "Position" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "Automatik" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "Stående" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "Liggande" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "Uppochner" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "Liggande uppochner" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" "Välj orientering: stående, liggande, uppochner eller liggande uppochner" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "Vänster:" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "Avstånd från vänsterkanten på pappret till bilden" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "Höger:" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "Avstånd från högerkanten på pappret till bilden" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "Övre kant:" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "Avstånd från överkanten på pappret till bilden" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "Nedre kant:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Avstånd från överkanten på pappret till nederkanten på bilden" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "Avstånd från nederkanten på pappret till bilden" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "Centrera:" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 #, fuzzy msgid "Horizontal" msgstr "Horisontellt" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "Centrera bilden horisontellt på pappret" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "Både och" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "Centrera bilden på pappret" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 #, fuzzy msgid "Vertical" msgstr "Vertikalt" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "Centrera bilden vertikalt på pappret" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "Konfigurera skrivare" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 #, fuzzy msgid "Printer Make:" msgstr "Skrivarnamn:" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 #, fuzzy msgid "Select the make of your printer" msgstr "Välj din skrivarmodell" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "Skrivarmodell:" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "Välj din skrivarmodell" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD-fil:" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "Ange rätt PPD-filnamn för din skrivare" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "Bläddra" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "Välj rätt PPD-filnamn för din skrivare" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -4752,54 +4832,54 @@ msgstr "" "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill " "skriva ut till" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Printer Queue:" msgstr "Skrivarnamn:" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Ange rätt PPD-filnamn för din skrivare" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 #, fuzzy msgid "File to print to" msgstr "testutskrift" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 #, fuzzy msgid "Print To File" msgstr "Skriv ut till fil?" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "Ange ny skrivare" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "Skrivarnamn:" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "Ange det namn som du vill ge denna logiska skrivare" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 #, fuzzy msgid "About Gutenprint " msgstr "Om Gimp-Print " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print version " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4862,11 +4942,11 @@ msgstr "" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "Skrivarinställningar" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -4874,11 +4954,11 @@ msgstr "" "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill " "skriva ut till" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "Konfigurera skrivare..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -4886,11 +4966,11 @@ msgstr "" "Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut " "till denna skrivare" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "Ny skrivare..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -4898,24 +4978,24 @@ msgstr "" "Ange en ny logisk skrivare. Detta kan användas för att namnge en samling " "inställningar som du vill komma ihåg för framtida användning." -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 #, fuzzy msgid "Image Size" msgstr "Storlek" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "Skalning:" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "Ändra skalningen (storleken) på bilden" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -4923,31 +5003,31 @@ msgstr "" "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal " "utdatapunkter per tum" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "Skala utskriften till storleken på sidan" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "Skala utskriften till antalet punkter per tum" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "Ställ in bredden på utskriften" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "Ställ in bredden på utskriften" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4955,68 +5035,68 @@ msgstr "" "Använd\n" "originalbildstorlek" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "Ställ in storleken på utskriften till storleken på sidan" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "Justera utskriftsfärg" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "Ställ in standardvärden" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "Stäng" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "Förhandsgranskning av bild" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 #, fuzzy msgid "Output" msgstr "Utdatatyp:" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "Utdatatyp:" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "Välj önskad typ av utdata" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "Justera utdata..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 #, fuzzy msgid "Size Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "Välj grundenheten för utskrift" @@ -5159,15 +5239,15 @@ msgstr "Swedish" msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -5457,18 +5537,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "Kan inte läsa från %s: %s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "Kan inte öppna %s för läsning och skrivning: %s\n" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "Kan inte skriva till %s: %s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -5477,7 +5558,8 @@ msgstr "" "\n" "Kan inte skriva till %s: %s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -5495,84 +5577,84 @@ msgstr "" "Kan inte detektera skrivartyp.\n" "Använd flaggan -m för att ange din skrivarmodell.\n" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "" -#: src/escputil/escputil.c:908 +#: src/escputil/escputil.c:927 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n" -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, fuzzy, c-format -msgid "Cannot identify printer!\n" -msgstr "Kan inte tolka utdata från skrivare\n" - -#: src/escputil/escputil.c:927 -#, fuzzy, c-format -msgid "Printer does not support listing ink types!\n" -msgstr "Skrivaren stöder inte färgutskrift\n" - -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "Bläckfärg" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "Återstående procent" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, fuzzy, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "Skrivaren stöder inte färgutskrift\n" + +#: src/escputil/escputil.c:1144 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "Skrivaridentifiering kräver att en rå enhet används.\n" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, fuzzy, c-format msgid "Cannot identify printer model.\n" msgstr "Du kan endast ange en skrivarmodell." -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "Rensar huvuden...\n" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" "Kör kontroll av munstycken, försäkra dig om att det finns papper i\n" "skrivaren.\n" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5646,7 +5728,7 @@ msgstr "" "Det är viktigt att du inte stänger av din skrivare under denna process.\n" "\n" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5714,12 +5796,12 @@ msgstr "" "process.\n" "\n" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5738,20 +5820,20 @@ msgstr "" "Du kommer att få bekräfta ditt val.\n" "Vad vill du göra (s, q, r)?\n" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" "Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" @@ -5760,7 +5842,7 @@ msgstr "" "OK, din skrivare är justerad, men justeringen har inte sparats.\n" "Om du vill spara justeringen måste du upprepa detta förlopp.\n" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" @@ -5769,12 +5851,12 @@ msgstr "" "Bekräfta att du vill upprepa justeringsprocessen genom att\n" "ange \"r\" igen:\n" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "Upprepar justeringsprocessen.\n" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5789,17 +5871,17 @@ msgstr "" "Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n" "\"s\" igen:\n" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "Kommer att spara inställningar..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "misslyckades!\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" @@ -5808,27 +5890,27 @@ msgstr "" "Dina inställningar sparades inte utan problem. Du måste upprepa\n" "justeringsproceduren.\n" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "lyckades!\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "Dina justeringsinställningar har sparats till skrivaren.\n" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "Okänt kommando.\n" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "Sista kommandot bekräftades inte.\n" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5845,12 +5927,12 @@ msgstr "" "Placera ett pappersark i skrivaren för att påbörja justeringen\n" "av huvudena.\n" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "Tryck retur för att fortsätta > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5861,42 +5943,42 @@ msgstr "" "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa " "proceduren.\n" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "Pass %d" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "Mata in ett nytt pappersark.\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "Numret är utanför intervallet!\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "Jag kan inte förstå vad du skrev!\n" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "Försöker ställa in justering..." -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "lyckades.\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5909,7 +5991,7 @@ msgstr "" "linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n" "att få bästa utskriftskvalitet.\n" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "Fel i indata\n" @@ -6045,6 +6127,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 "Cannot identify printer!\n" +#~ msgstr "Kan inte tolka utdata från skrivare\n" + #, fuzzy #~ msgid "Red Balance" #~ msgstr "Justera gulbalansen på utskriften" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 8f77f5c..62ac886 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 6833c5d..d860213 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gutenprint 5.0.0-b5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 14:52+0000\n" +"POT-Creation-Date: 2006-01-14 15:38-0500\n" "PO-Revision-Date: 2005-08-07 12:56+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -15,6 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/main/dither-main.c:46 src/main/print-color.c:49 +#: src/main/print-escp2.c:1527 msgid "Default" msgstr "é è¨­" @@ -257,9 +258,9 @@ msgid "2400x2400 DPI DMT" msgstr "2400x2400 DPI DMT" #: src/main/print-canon.c:1432 src/main/print-lexmark.c:857 -#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194 -#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286 -#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378 +#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204 +#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296 +#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388 msgid "Plain Paper" msgstr "普通紙張" @@ -269,9 +270,9 @@ msgid "Plain Paper PIXMA" msgstr "普通紙張" #: src/main/print-canon.c:1434 src/main/print-lexmark.c:865 -#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202 -#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294 -#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386 +#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212 +#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304 +#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396 msgid "Transparencies" msgstr "é€æ˜Žè† ç‰‡" @@ -317,9 +318,10 @@ msgid "Photo Paper Pro" msgstr "專業級相紙" #: src/main/print-canon.c:1444 src/main/print-lexmark.c:905 -#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 -#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 -#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418 +#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240 +#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336 +#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428 +#: src/main/escp2-papers.c:1438 msgid "Other" msgstr "其它" @@ -379,7 +381,7 @@ msgstr "é€ç´™åŒ£æˆ–者紙張的來æº" #: src/main/print-canon.c:1472 src/main/print-escp2.c:213 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283 -#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275 +#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282 msgid "Resolution" msgstr "解æžåº¦" @@ -509,9 +511,9 @@ msgstr "" #: src/main/print-escp2.c:476 src/main/print-escp2.c:484 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516 -#: src/main/print-escp2.c:524 src/main/print-escp2.c:532 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258 +#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250 +#: src/main/print-pcl.c:1258 msgid "Advanced Ink Adjustment" msgstr "" @@ -527,8 +529,8 @@ msgid "Light Yellow Transition" msgstr "" #: src/main/print-canon.c:1589 src/main/print-pcl.c:1439 -#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456 -#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479 +#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487 +#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510 msgid "Off" msgstr "" @@ -557,12 +559,14 @@ msgid "CD tray" msgstr "" #: src/main/print-canon.c:2017 src/main/print-color.c:314 -#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589 -#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614 -#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633 -#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613 -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132 -#: src/escputil/escputil.c:861 +#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 +#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647 +#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671 +#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697 +#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727 +#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613 +#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144 +#: src/escputil/escputil.c:863 src/escputil/escputil.c:884 msgid "Black" msgstr "黑" @@ -582,14 +586,14 @@ msgstr "" msgid "Photo CcMmYK Color" msgstr "" -#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752 +#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285 msgid "Color" msgstr "彩色" -#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754 +#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787 #: 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" @@ -627,8 +631,8 @@ msgstr "" msgid "Pre-Dithered" msgstr "" -#: src/main/print-color.c:121 src/main/escp2-channels.c:695 -#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722 +#: src/main/print-color.c:121 src/main/escp2-channels.c:820 +#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286 msgid "Grayscale" msgstr "ç°éšŽ" @@ -774,12 +778,14 @@ msgstr "" msgid "Gamma value assumed by application" msgstr "程å¼ä½¿ç”¨çš„ Gamma 值" -#: src/main/print-color.c:266 src/main/print-escp2-data.c:580 -#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602 -#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628 -#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659 -#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111 -#: src/escputil/escputil.c:864 +#: src/main/print-color.c:266 src/main/print-escp2-data.c:618 +#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637 +#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660 +#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685 +#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712 +#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741 +#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123 +#: src/escputil/escputil.c:866 src/escputil/escputil.c:885 msgid "Cyan" msgstr "æ°°è—" @@ -787,12 +793,14 @@ msgstr "æ°°è—" msgid "Adjust the cyan gamma" msgstr "調整氰è—色 gamma 值" -#: src/main/print-color.c:274 src/main/print-escp2-data.c:581 -#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603 -#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629 -#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660 -#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118 -#: src/escputil/escputil.c:865 +#: src/main/print-color.c:274 src/main/print-escp2-data.c:619 +#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638 +#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662 +#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686 +#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711 +#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742 +#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130 +#: src/escputil/escputil.c:867 src/escputil/escputil.c:886 msgid "Magenta" msgstr "æ´‹ç´…" @@ -800,12 +808,14 @@ msgstr "æ´‹ç´…" msgid "Adjust the magenta gamma" msgstr "調整洋紅色 gamma 值" -#: src/main/print-color.c:282 src/main/print-escp2-data.c:582 -#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604 -#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630 -#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661 -#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125 -#: src/escputil/escputil.c:866 +#: src/main/print-color.c:282 src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639 +#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664 +#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687 +#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710 +#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743 +#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137 +#: src/escputil/escputil.c:868 src/escputil/escputil.c:887 msgid "Yellow" msgstr "黃" @@ -813,9 +823,10 @@ msgstr "黃" msgid "Adjust the yellow gamma" msgstr "調整黃色 gamma 值" -#: src/main/print-color.c:290 src/main/print-escp2-data.c:645 -#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139 -#: src/escputil/escputil.c:873 +#: src/main/print-color.c:290 src/main/print-escp2-data.c:715 +#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152 +#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875 +#: src/escputil/escputil.c:893 msgid "Red" msgstr "ç´…" @@ -823,8 +834,8 @@ msgstr "ç´…" msgid "Adjust the red gamma" msgstr "調整紅色 gamma 值" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148 -#: src/gutenprintui2/panel.c:2146 +#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159 +#: src/gutenprintui2/panel.c:2158 msgid "Green" msgstr "綠" @@ -832,9 +843,10 @@ msgstr "綠" msgid "Adjust the green gamma" msgstr "調整綠色 gamma 值" -#: src/main/print-color.c:306 src/main/print-escp2-data.c:646 -#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153 -#: src/escputil/escputil.c:874 +#: src/main/print-color.c:306 src/main/print-escp2-data.c:716 +#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166 +#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876 +#: src/escputil/escputil.c:894 msgid "Blue" msgstr "è—" @@ -1044,7 +1056,7 @@ msgstr "" msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1675 +#: src/main/print-color.c:1668 msgid "Traditional Gutenprint color conversion" msgstr "" @@ -1132,121 +1144,132 @@ msgid "" "d\n" msgstr "" -#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324 -#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416 -#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555 -#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601 -#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227 -#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573 -#: src/gutenprintui2/panel.c:2597 +#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330 +#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422 +#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569 +#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597 +#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638 +#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227 +#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36 +#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609 msgid "Standard" msgstr "標準" -#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443 -#: src/main/print-escp2-data.c:471 +#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449 +#: src/main/print-escp2-data.c:477 msgid "Roll Feed" msgstr "" -#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388 +#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397 +#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425 +#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431 msgid "Manual Feed" msgstr "人手é€ç´™" -#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434 +#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440 msgid "Print to CD" msgstr "列å°è‡³å…‰ç¢Ÿ" -#: src/main/print-escp2-data.c:490 +#: src/main/print-escp2-data.c:496 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/print-escp2-data.c:499 +#: src/main/print-escp2-data.c:505 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/print-escp2-data.c:508 +#: src/main/print-escp2-data.c:514 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/print-escp2-data.c:517 +#: src/main/print-escp2-data.c:523 msgid "Manual Selection" msgstr "" -#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33 +#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581 +#: src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" -#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34 +#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582 +#: src/main/generic-options.c:34 msgid "Economy" msgstr "" -#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35 +#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583 +#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35 msgid "Draft" msgstr "" -#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37 +#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585 +#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37 msgid "High" msgstr "" -#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38 +#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586 +#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38 msgid "Photo" msgstr "相片" -#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39 +#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587 +#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39 msgid "Super Photo" msgstr "" -#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40 +#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588 +#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "" -#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41 +#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589 +#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41 msgid "Best" msgstr "" -#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605 -#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631 -#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867 +#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661 +#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688 +#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738 +#: src/escputil/escputil.c:869 msgid "Light Cyan" msgstr "" -#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606 -#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632 -#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868 +#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663 +#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689 +#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737 +#: src/escputil/escputil.c:870 msgid "Light Magenta" msgstr "" -#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657 -#: src/escputil/escputil.c:871 +#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739 +#: src/escputil/escputil.c:873 msgid "Light Black" msgstr "" -#: src/main/print-escp2-data.c:620 +#: src/main/print-escp2-data.c:690 msgid "Dark Yellow" msgstr "" -#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293 -#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872 +#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439 +#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874 msgid "Matte Black" msgstr "" -#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289 -#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862 +#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435 +#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864 msgid "Photo Black" msgstr "" -#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875 +#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877 msgid "Gloss Optimizer" msgstr "" -#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876 +#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878 msgid "Light Light Black" msgstr "" @@ -1466,81 +1489,73 @@ msgstr "" msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:532 -msgid "Red and Blue Ink Usage" -msgstr "" - -#: src/main/print-escp2.c:533 -msgid "Amount of red and blue ink to use" -msgstr "" - -#: src/main/print-escp2.c:1387 +#: src/main/print-escp2.c:1443 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1389 +#: src/main/print-escp2.c:1445 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6 +#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "5 å‹å…‰ç¢Ÿ" -#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7 +#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "3 å‹å…‰ç¢Ÿ" -#: src/main/print-escp2.c:1424 +#: src/main/print-escp2.c:1480 msgid "Normal" msgstr "" -#: src/main/print-escp2.c:1426 +#: src/main/print-escp2.c:1482 msgid "Print To Hub" msgstr "" -#: src/main/print-escp2.c:1451 src/main/generic-options.c:213 +#: src/main/print-escp2.c:1507 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "" -#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284 +#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291 msgid "Automatic" msgstr "自動" -#: src/main/print-escp2.c:1580 +#: src/main/print-escp2.c:1619 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1582 +#: src/main/print-escp2.c:1621 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1615 +#: src/main/print-escp2.c:1652 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1617 +#: src/main/print-escp2.c:1654 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1619 +#: src/main/print-escp2.c:1656 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1621 +#: src/main/print-escp2.c:1658 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1623 +#: src/main/print-escp2.c:1660 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2026 +#: src/main/print-escp2.c:2057 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752 +#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1594,111 +1609,112 @@ msgid "test print" msgstr "" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040 -#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068 -#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106 -#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134 -#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162 +#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165 +#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193 +#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231 +#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259 +#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904 -#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932 -#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960 -#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990 -#: src/main/escp2-channels.c:1004 +#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029 +#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057 +#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085 +#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115 +#: src/main/escp2-channels.c:1129 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250 -#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490 -#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522 +#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375 +#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615 +#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645 +#: src/main/escp2-channels.c:1662 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199 -#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434 -#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466 +#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324 +#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559 +#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591 msgid "Five Color Photo Composite" msgstr "" # (Abel) from Epson -#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156 -#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244 -#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340 -#: src/main/escp2-papers.c:1384 +#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166 +#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254 +#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350 +#: src/main/escp2-papers.c:1394 msgid "Glossy Film" msgstr "å…‰é¢è† ç‰‡" -#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160 -#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248 -#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344 -#: src/main/escp2-papers.c:1388 +#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170 +#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 +#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 +#: src/main/escp2-papers.c:1398 msgid "Envelopes" msgstr "ä¿¡å°" # (Abel) from fuji, epson -#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164 -#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252 -#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348 -#: src/main/escp2-papers.c:1392 +#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174 +#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 +#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 +#: src/main/escp2-papers.c:1402 msgid "Matte Paper" msgstr "雪é¢éŠ…版紙" # (Abel) from Epson -#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168 -#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256 -#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352 -#: src/main/escp2-papers.c:1396 +#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178 +#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 +#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 +#: src/main/escp2-papers.c:1406 msgid "Inkjet Paper" msgstr "噴墨專用紙" # (Abel) from Epson -#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170 -#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258 -#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354 -#: src/main/escp2-papers.c:1398 +#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180 +#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268 +#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364 +#: src/main/escp2-papers.c:1408 msgid "Photo Quality Inkjet Paper" msgstr "優質噴墨專用紙" -#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172 -#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260 -#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356 -#: src/main/escp2-papers.c:1400 +#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182 +#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270 +#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366 +#: src/main/escp2-papers.c:1410 msgid "Photo Paper" msgstr "相紙" # (Abel) from Epson -#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174 -#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262 -#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358 -#: src/main/escp2-papers.c:1402 +#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184 +#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272 +#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368 +#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436 msgid "Premium Glossy Photo Paper" msgstr "é ‚ç´šå…‰é¢ç›¸ç´™" # (Abel) from Epson -#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178 -#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266 -#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362 -#: src/main/escp2-papers.c:1406 +#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188 +#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276 +#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372 +#: src/main/escp2-papers.c:1416 msgid "Premium Luster Photo Paper" msgstr "ç²¾é¸å…‰é¢ç›¸ç´™" # (Abel) from Epson -#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180 -#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272 -#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364 -#: src/main/escp2-papers.c:1412 +#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190 +#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282 +#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374 +#: src/main/escp2-papers.c:1422 msgid "Photo Quality Glossy Paper" msgstr "å…‰é¢ç´™" -#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182 -#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274 -#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366 -#: src/main/escp2-papers.c:1414 +#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192 +#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284 +#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376 +#: src/main/escp2-papers.c:1424 msgid "Ilford Heavy Paper" msgstr "" @@ -1706,8 +1722,8 @@ msgstr "" msgid "Coated" msgstr "" -#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415 -#: src/cups/genppd.c:1463 +#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422 +#: src/cups/genppd.c:1470 msgid "None" msgstr "" @@ -1840,8 +1856,8 @@ msgstr "" msgid "PPDFile" msgstr "PPD 檔" -#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738 -#: src/gutenprintui2/panel.c:1737 +#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749 +#: src/gutenprintui2/panel.c:1749 msgid "PPD File" msgstr "PPD 檔" @@ -1849,163 +1865,164 @@ msgstr "PPD 檔" msgid "Image dimensions must match paper dimensions" msgstr "" -#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757 +#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882 msgid "Two Level Grayscale" msgstr "" -#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792 +#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917 +#, fuzzy msgid "Three Level Grayscale" -msgstr "" +msgstr "ç°éšŽ" -#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827 -#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853 -#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072 -#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115 -#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155 +#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952 +#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 +#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261 +#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300 +#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337 -#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387 +#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462 +#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512 msgid "Seven Color Photo" msgstr "" -#: src/main/escp2-channels.c:1373 +#: src/main/escp2-channels.c:1498 msgid "Seven Color Enhanced" msgstr "" -#: src/main/escp2-channels.c:1410 +#: src/main/escp2-channels.c:1535 msgid "Eight Color Photo" msgstr "" -#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1555 +#: src/main/escp2-channels.c:1695 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580 +#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608 -#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648 -#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675 -#: src/main/escp2-channels.c:1689 +#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748 +#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788 +#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815 +#: src/main/escp2-channels.c:1829 msgid "Three Color Raw" msgstr "" -#: src/main/escp2-channels.c:1622 +#: src/main/escp2-channels.c:1762 msgid "Three Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702 -#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714 -#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726 -#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738 +#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842 +#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854 +#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866 +#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878 msgid "Four Color Raw" msgstr "" -#: src/main/escp2-channels.c:1744 +#: src/main/escp2-channels.c:1884 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773 +#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795 -#: src/main/escp2-channels.c:1810 +#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935 +#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956 msgid "Six Color Raw" msgstr "" -#: src/main/escp2-channels.c:1816 +#: src/main/escp2-channels.c:1962 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846 -#: src/main/escp2-channels.c:1861 +#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992 +#: src/main/escp2-channels.c:2007 msgid "Seven Color Raw" msgstr "" -#: src/main/escp2-channels.c:1878 +#: src/main/escp2-channels.c:2024 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:1896 +#: src/main/escp2-channels.c:2042 msgid "Eight Color Raw" msgstr "" -#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064 -#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087 -#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127 -#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167 -#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185 -#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189 -#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225 +#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210 +#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233 +#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273 +#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313 +#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331 +#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335 +#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270 +#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416 msgid "UltraChrome Photo Black" msgstr "" -#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274 +#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196 -#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288 -#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380 +#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 +#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 +#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 msgid "Plain Paper Fast Load" msgstr "" -#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198 -#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290 -#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382 +#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208 +#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300 +#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "明信片" -#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206 -#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298 -#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390 +#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216 +#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308 +#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210 -#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302 -#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394 +#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 +#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 +#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 msgid "Matte Paper Heavyweight" msgstr "" # (Abel) from Epson -#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220 -#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312 -#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404 +#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230 +#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322 +#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414 msgid "Premium Semigloss Photo Paper" msgstr "頂級柔光相紙" -#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228 -#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324 -#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416 +#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238 +#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334 +#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426 msgid "ColorLife Paper" msgstr "" -#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316 -#: src/main/escp2-papers.c:1408 +#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326 +#: src/main/escp2-papers.c:1418 msgid "Archival Matte Paper" msgstr "" # (Abel) from Epson -#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318 -#: src/main/escp2-papers.c:1410 +#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328 +#: src/main/escp2-papers.c:1420 msgid "Watercolor Paper - Radiant White" msgstr "水彩紙-亮白色" @@ -2054,79 +2071,90 @@ msgstr "" msgid "720 DPI Highest Quality" msgstr "720 DPI 最高å“質" -#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104 +#: src/main/escp2-resolutions.c:100 +#, fuzzy +msgid "720 x 720 DPI" +msgstr "720x720 DPI" + +#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:119 msgid "1440 x 720 DPI" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:107 +#: src/main/escp2-resolutions.c:110 msgid "1440 x 720 DPI Highest Quality" msgstr "1440 x 720 DPI 最高å“質" -#: src/main/escp2-resolutions.c:110 +#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Transposed" msgstr "1440 x 720 DPI" -#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117 +#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126 msgid "2880 x 720 DPI" msgstr "2880 x 720 DPI" -#: src/main/escp2-resolutions.c:120 +#: src/main/escp2-resolutions.c:129 msgid "2880 x 720 DPI Highest Quality" msgstr "2880 x 720 DPI 最高å“質" -#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127 -#: src/main/escp2-resolutions.c:130 +#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136 +#: src/main/escp2-resolutions.c:139 msgid "1440 x 1440 DPI" msgstr "1440 x 1440 DPI" -#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137 +#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146 msgid "2880 x 1440 DPI" msgstr "2880 x 1440 DPI" -#: src/main/escp2-resolutions.c:140 +#: src/main/escp2-resolutions.c:149 #, fuzzy msgid "2880 x 1440 DPI Transposed" msgstr "2880 x 1440 DPI" -#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147 +#: src/main/escp2-resolutions.c:153 +#, fuzzy +msgid "5760 x 1440 DPI" +msgstr "1440 x 1440 DPI" + +#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160 msgid "2880 x 2880 DPI" msgstr "2880 x 2880 DPI" -#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154 +#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167 #, fuzzy msgid "5760 x 2880 DPI" msgstr "2880 x 2880 DPI" -#: src/main/escp2-resolutions.c:449 +#: src/main/escp2-resolutions.c:480 msgid "On" msgstr "" -#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468 -#: src/main/escp2-resolutions.c:480 +#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499 +#: src/main/escp2-resolutions.c:511 msgid "Interleave" msgstr "" -#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469 -#: src/main/escp2-resolutions.c:481 +#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500 +#: src/main/escp2-resolutions.c:512 msgid "Full Overlap" msgstr "" -#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470 -#: src/main/escp2-resolutions.c:482 +#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501 +#: src/main/escp2-resolutions.c:513 msgid "Four Pass" msgstr "" -#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471 -#: src/main/escp2-resolutions.c:483 +#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502 +#: src/main/escp2-resolutions.c:514 msgid "Full Overlap 2" msgstr "" -#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484 +#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515 msgid "Interleave 2" msgstr "" -#: src/main/escp2-resolutions.c:485 +#: src/main/escp2-resolutions.c:516 msgid "Eight Pass" msgstr "" @@ -2844,7 +2872,7 @@ msgstr "Canon S400" #: src/main/xmli18n-tmp.h:169 #, fuzzy msgid "EPSON Stylus C20" -msgstr "EPSON Stylus C20SX" +msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:170 msgid "EPSON Stylus C20SX" @@ -2857,7 +2885,7 @@ msgstr "EPSON Stylus C20UX" #: src/main/xmli18n-tmp.h:172 #, fuzzy msgid "EPSON Stylus C40" -msgstr "EPSON Stylus C40SX" +msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:173 msgid "EPSON Stylus C40SX" @@ -2870,7 +2898,7 @@ msgstr "EPSON Stylus C40UX" #: src/main/xmli18n-tmp.h:175 #, fuzzy msgid "EPSON Stylus C41" -msgstr "EPSON Stylus C41SX" +msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:176 msgid "EPSON Stylus C41SX" @@ -2883,7 +2911,7 @@ msgstr "EPSON Stylus C41UX" #: src/main/xmli18n-tmp.h:178 #, fuzzy msgid "EPSON Stylus C42" -msgstr "EPSON Stylus C42SX" +msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:179 msgid "EPSON Stylus C42SX" @@ -2896,7 +2924,7 @@ msgstr "EPSON Stylus C42UX" #: src/main/xmli18n-tmp.h:181 #, fuzzy msgid "EPSON Stylus C43" -msgstr "EPSON Stylus C43SX" +msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:182 msgid "EPSON Stylus C43SX" @@ -2909,7 +2937,7 @@ msgstr "EPSON Stylus C43UX" #: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "EPSON Stylus C44" -msgstr "EPSON Stylus C44SX" +msgstr "EPSON Stylus C44UX" #: src/main/xmli18n-tmp.h:185 msgid "EPSON Stylus C44SX" @@ -3390,632 +3418,685 @@ msgstr "EPSON Stylus CX3650" #: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "EPSON Stylus CX3700" -msgstr "EPSON Stylus CX3100" +msgstr "EPSON Stylus CX8300" #: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "EPSON Stylus CX3800" -msgstr "EPSON Stylus CX3100" +msgstr "EPSON Stylus CX8400" #: src/main/xmli18n-tmp.h:304 #, fuzzy +msgid "EPSON Stylus CX3805" +msgstr "EPSON Stylus C85" + +#: src/main/xmli18n-tmp.h:305 +#, fuzzy msgid "EPSON Stylus CX3810" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:306 +#, fuzzy +msgid "EPSON Stylus CX4100" +msgstr "EPSON Stylus CX8400" + +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "EPSON Stylus CX4200" -msgstr "EPSON Stylus CX3200" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:308 +#, fuzzy +msgid "EPSON Stylus CX4500" +msgstr "EPSON Stylus CX8400" + +#: src/main/xmli18n-tmp.h:309 msgid "EPSON Stylus CX4600" msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "EPSON Stylus CX4700" -msgstr "EPSON Stylus CX4600" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "EPSON Stylus CX4800" -msgstr "EPSON Stylus CX4600" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:312 msgid "EPSON Stylus CX5100" msgstr "EPSON Stylus CX5100" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:313 msgid "EPSON Stylus CX5200" msgstr "EPSON Stylus CX5200" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:314 msgid "EPSON Stylus CX5300" msgstr "EPSON Stylus CX5300" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:315 msgid "EPSON Stylus CX5400" msgstr "EPSON Stylus CX5400" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:316 +#, fuzzy +msgid "EPSON Stylus CX5700" +msgstr "EPSON Stylus CX6500" + +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "EPSON Stylus CX5800" -msgstr "EPSON Stylus CX1500" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:318 msgid "EPSON Stylus CX6300" msgstr "EPSON Stylus CX6300" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:319 msgid "EPSON Stylus CX6400" msgstr "EPSON Stylus CX6400" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:320 msgid "EPSON Stylus CX6500" msgstr "EPSON Stylus CX6500" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:321 msgid "EPSON Stylus CX6600" msgstr "EPSON Stylus CX6600" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "EPSON Stylus CX7700" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "EPSON Stylus CX7800" -msgstr "EPSON Stylus CX8300" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:324 msgid "EPSON Stylus CX8300" msgstr "EPSON Stylus CX8300" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:325 msgid "EPSON Stylus CX8400" msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "EPSON Stylus D68" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "EPSON Stylus D88" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "EPSON Stylus DX3800" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "EPSON Stylus DX3850" msgstr "EPSON Stylus CX3500" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "EPSON Stylus DX4200" msgstr "EPSON Stylus CX3200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:331 +#, fuzzy +msgid "EPSON Stylus DX4250" +msgstr "EPSON Stylus C50" + +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "EPSON Stylus DX4800" msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:333 +msgid "EPSON PictureMate" +msgstr "" + +#: src/main/xmli18n-tmp.h:334 +msgid "EPSON PictureMate Deluxe" +msgstr "" + +#: src/main/xmli18n-tmp.h:335 msgid "EPSON CL-700" msgstr "EPSON CL-700" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:336 msgid "EPSON CL-750" msgstr "EPSON CL-750" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:337 msgid "EPSON CL-760" msgstr "EPSON CL-760" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:338 +#, fuzzy +msgid "EPSON E-100" +msgstr "EPSON EM-900C" + +#: src/main/xmli18n-tmp.h:339 msgid "EPSON EM-900C" msgstr "EPSON EM-900C" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:340 msgid "EPSON EM-930C" msgstr "EPSON EM-930C" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:341 msgid "EPSON MC-2000" msgstr "EPSON MC-2000" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:342 msgid "EPSON MC-5000" msgstr "EPSON MC-5000" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:343 msgid "EPSON MC-7000" msgstr "EPSON MC-7000" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:344 msgid "EPSON MC-9000" msgstr "EPSON MC-9000" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:345 msgid "EPSON MC-10000" msgstr "EPSON MC-10000" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:346 msgid "EPSON MJ-930C" msgstr "EPSON MJ-930C" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:347 msgid "EPSON MJ-5100C" msgstr "EPSON MJ-5100C" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:348 msgid "EPSON MJ-6000C" msgstr "EPSON MJ-6000C" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:349 msgid "EPSON MJ-8000C" msgstr "EPSON MJ-8000C" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:350 msgid "EPSON PM-700C" msgstr "EPSON PM-700C" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:351 msgid "EPSON PM-730C" msgstr "EPSON PM-730C" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:352 msgid "EPSON PM-740C" msgstr "EPSON PM-740C" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:353 msgid "EPSON PM-750C" msgstr "EPSON PM-750C" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:354 msgid "EPSON PM-760C" msgstr "EPSON PM-760C" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:355 msgid "EPSON PM-770C" msgstr "EPSON PM-770C" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:356 msgid "EPSON PM-780C" msgstr "EPSON PM-780C" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:357 msgid "EPSON PM-790PT" msgstr "EPSON PM-790PT" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:358 msgid "EPSON PM-800C" msgstr "EPSON PM-800C" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:359 msgid "EPSON PM-850PT" msgstr "EPSON PM-850PT" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:360 msgid "EPSON PM-870C" msgstr "EPSON PM-870C" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:361 msgid "EPSON PM-880C" msgstr "EPSON PM-880C" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:362 msgid "EPSON PM-930C" msgstr "EPSON PM-930C" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:363 msgid "EPSON PM-940C" msgstr "EPSON PM-940C" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:364 msgid "EPSON PM-950C" msgstr "EPSON PM-950C" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:365 msgid "EPSON PM-970C" msgstr "EPSON PM-970C" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:366 msgid "EPSON PM-980C" msgstr "EPSON PM-980C" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:367 msgid "EPSON PM-2000C" msgstr "EPSON PM-2000C" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:368 msgid "EPSON PM-2200C" msgstr "EPSON PM-2200C" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:369 msgid "EPSON PM-3000C" msgstr "EPSON PM-3000C" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:370 msgid "EPSON PM-3300C" msgstr "EPSON PM-3300C" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:371 msgid "EPSON PM-3500C" msgstr "EPSON PM-3500C" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:372 msgid "EPSON PM-3700C" msgstr "EPSON PM-3700C" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:373 msgid "EPSON PM-4000PX" msgstr "EPSON PM-4000PX" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:374 msgid "EPSON PM-5000C" msgstr "EPSON PM-5000C" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:375 msgid "EPSON PM-7000C" msgstr "EPSON PM-7000C" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:376 msgid "EPSON PM-9000C" msgstr "EPSON PM-9000C" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:377 msgid "EPSON PM-10000" msgstr "EPSON PM-10000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:378 +#, fuzzy +msgid "EPSON PM-A900" +msgstr "EPSON PM-9000C" + +#: src/main/xmli18n-tmp.h:379 msgid "EPSON PM-D750" msgstr "EPSON PM-D750" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:380 msgid "EPSON PM-D770" msgstr "EPSON PM-D770" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:381 msgid "EPSON PM-D1000" msgstr "EPSON PM-D1000" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:382 msgid "EPSON PM-G700" msgstr "EPSON PM-G700" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:383 msgid "EPSON PM-G720" msgstr "EPSON PM-G720" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:384 msgid "EPSON PM-G800" msgstr "EPSON PM-G800" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:385 msgid "EPSON PM-G820" msgstr "EPSON PM-G820" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:386 +#, fuzzy +msgid "EPSON PX-A650" +msgstr "EPSON PX-V600" + +#: src/main/xmli18n-tmp.h:387 msgid "EPSON PX-G900" msgstr "EPSON PX-G900" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:388 msgid "EPSON PX-G920" msgstr "EPSON PX-G920" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:389 msgid "EPSON PX-G5000" msgstr "EPSON PX-G5000" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:390 msgid "EPSON PX-V500" msgstr "EPSON PX-V500" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:391 msgid "EPSON PX-V600" msgstr "EPSON PX-V600" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:392 +#, fuzzy +msgid "EPSON PX-5500" +msgstr "EPSON PX-V500" + +#: src/main/xmli18n-tmp.h:393 msgid "EPSON PX-7000" msgstr "EPSON PX-7000" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:394 msgid "EPSON PX-9000" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:395 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:396 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:397 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:398 msgid "HP DeskJet 340" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:399 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:400 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:401 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:402 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:403 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:404 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:405 msgid "HP DesignJet 2500C" msgstr "HP DesignJet 2500C" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:406 msgid "HP DesignJet 3500C" msgstr "HP DesignJet 3500C" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:407 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:408 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:409 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:410 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:411 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:412 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:413 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:414 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:415 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:416 msgid "HP DeskJet 600/600C" msgstr "HP DeskJet 600/600C" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:417 msgid "HP DeskJet 600 series" msgstr "HP DeskJet 600 系列" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:418 msgid "HP DeskJet 690 series" msgstr "HP DeskJet 690 系列" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:419 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:420 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:421 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:422 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:423 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:424 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:425 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:426 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:427 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:428 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:429 msgid "HP DeskJet 900 series" msgstr "HP DeskJet 900 系列" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:430 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:431 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:432 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:433 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:434 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:435 msgid "HP DeskJet 2000 series" msgstr "HP DeskJet 2000 系列" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:436 msgid "HP DeskJet 2500 series" msgstr "HP DeskJet 2500 系列" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:437 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:438 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:439 msgid "HP LaserJet II series" msgstr "HP LaserJet II 系列" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:440 msgid "HP LaserJet IIP series" msgstr "HP LaserJet IIP 系列" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:441 msgid "HP LaserJet III series" msgstr "HP LaserJet III 系列" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:442 msgid "HP LaserJet 4 series" msgstr "HP LaserJet 4 系列" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:443 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:444 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:445 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:446 msgid "HP LaserJet 5 series" msgstr "HP LaserJet 5 系列" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:447 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:448 msgid "HP LaserJet 6 series" msgstr "HP LaserJet 6 系列" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:449 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:450 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:451 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:452 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:453 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:454 msgid "Olympus P10" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:455 msgid "Olympus P200" msgstr "Olympus P200" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:456 msgid "Olympus P300" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:457 msgid "Olympus P400" msgstr "Olympus P400" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:458 msgid "Olympus P440" msgstr "Olympus P440" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:459 msgid "Canon CP100" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:460 msgid "Canon CP220" msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:461 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:462 #, fuzzy msgid "Sony UP-DR150" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:463 msgid "Fujifilm Printpix CX-400" msgstr "Fujifilm Printpix CX-400" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:464 msgid "Fujifilm Printpix CX-550" msgstr "Fujifilm Printpix CX-550" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:465 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:466 msgid "RAW DATA 8 bit" msgstr "" @@ -4105,30 +4186,30 @@ msgstr "" msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517 -#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517 -#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788 +#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528 +#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800 +#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529 +#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800 msgid "OK" msgstr "確定" -#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181 -#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759 -#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182 -#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758 +#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193 +#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770 +#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770 msgid "Cancel" msgstr "å–消" -#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165 +#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177 #, c-format msgid "%s -- Print v%s" msgstr "%s -- 列å°å¢žæ•ˆæ¨¡çµ„ %s 版本" -#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174 +#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186 msgid "About" msgstr "關於" -#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176 +#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188 msgid "" "Print and\n" "Save Settings" @@ -4136,7 +4217,7 @@ msgstr "" "列å°ä¸¦\n" "儲存設定" -#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178 +#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 msgid "" "Save\n" "Settings" @@ -4144,15 +4225,15 @@ msgstr "" "儲存\n" "設定" -#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180 +#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 msgid "Print" msgstr "列å°" -#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232 +#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244 msgid "Preview" msgstr "é è¦½" -#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257 +#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -4174,238 +4255,238 @@ msgstr "" "拖曳影åƒæ™‚按下 shift éµï¼Œæœƒé™åˆ¶å½±åƒåªå‘水平或垂直方å‘移動。\n" "如果拖曳的時候å†æŒ‰å¤šä¸€å€‹æ»‘鼠按鈕，影åƒæœƒé‚„原至原來ä½ç½®ã€‚" -#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304 +#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316 msgid "Paper Size" msgstr "紙張尺寸" -#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327 +#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339 msgid "Show All Paper Sizes" msgstr "顯示所有紙張尺寸" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355 msgid "Dimensions:" msgstr "尺寸：" -#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023 -#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034 +#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033 msgid "Width:" msgstr "寬度：" -#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349 +#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361 msgid "Width of the paper that you wish to print to" msgstr "列å°æ™‚的紙張寬度" -#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025 -#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036 +#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035 msgid "Height:" msgstr "高度：" -#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354 +#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366 msgid "Height of the paper that you wish to print to" msgstr "列å°æ™‚的紙張高度" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376 +#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388 msgid "Number of Copies" msgstr "份數" -#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388 +#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "è«‹é¸æ“‡åˆ—å°å¤šå°‘份 (1-100 之間)" -#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420 +#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432 msgid "Image Position" msgstr "å½±åƒä½ç½®" -#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437 +#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449 msgid "Auto" msgstr "自動" -#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439 +#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451 msgid "Portrait" msgstr "ç›´å‘" -#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441 +#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 msgid "Landscape" msgstr "æ©«å‘" -#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443 +#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 msgid "Upside down" msgstr "ç›´å‘倒置" -#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445 +#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 msgid "Seascape" msgstr "æ©«å‘倒置" -#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449 +#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "指定列å°æ™‚çš„æ–¹å‘：直å‘ã€æ©«å‘ã€ç›´å‘倒置ã€æ©«å‘倒置" -#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451 +#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463 msgid "Orientation:" msgstr "æ–¹å‘：" -#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462 +#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474 msgid "Left:" msgstr "左：" -#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463 +#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475 msgid "Distance from the left of the paper to the image" msgstr "從紙張左邊邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470 -#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470 +#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 +#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482 msgid "Right:" msgstr "å³ï¼š" -#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 msgid "Distance from the left of the paper to the right of the image" msgstr "從紙張左邊邊緣至影åƒå³é‚Šé‚Šç·£ä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471 +#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 msgid "Distance from the right of the paper to the image" msgstr "從紙張å³é‚Šé‚Šç·£è‡³å½±åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473 +#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485 msgid "Top:" msgstr "上：" -#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474 +#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486 msgid "Distance from the top of the paper to the image" msgstr "從紙張頂部邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481 -#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481 +#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492 +#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493 msgid "Bottom:" msgstr "下：" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 msgid "Distance from the top of the paper to bottom of the image" msgstr "從紙張頂部邊緣至影åƒåº•éƒ¨é‚Šç·£ä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482 +#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 msgid "Distance from the bottom of the paper to the image" msgstr "從紙張底部邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492 +#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504 msgid "Center:" msgstr "置中：" -#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495 +#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507 msgid "Horizontal" msgstr "æ°´å¹³" -#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496 +#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 msgid "Center the image horizontally on the paper" msgstr "將影åƒçš„æ°´å¹³ä½ç½®èª¿æ•´è‡³ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510 msgid "Both" msgstr "兩者" -#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499 +#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 msgid "Center the image on the paper" msgstr "將影åƒæ”¾ç½®åœ¨ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501 +#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513 msgid "Vertical" msgstr "åž‚ç›´" -#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502 +#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 msgid "Center the image vertically on the paper" msgstr "將影åƒçš„åž‚ç›´ä½ç½®èª¿æ•´è‡³ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527 msgid "Setup Printer" msgstr "設定å°è¡¨æ©Ÿ" -#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539 +#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551 msgid "Printer Make:" msgstr "" -#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550 +#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860 -#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859 +#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871 +#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871 msgid "Printer Model:" msgstr "å°è¡¨æ©Ÿåž‹è™Ÿï¼š" -#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579 +#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591 msgid "Select your printer model" msgstr "è«‹é¸å–å°è¡¨æ©Ÿåž‹è™Ÿ" -#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627 +#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639 msgid "PPD File:" msgstr "PPD 檔：" -#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641 +#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653 msgid "Enter the correct PPD filename for your printer" msgstr "請輸入é©åˆæ‚¨çš„å°è¡¨æ©Ÿä½¿ç”¨çš„ PPD 檔案å稱" -#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711 -#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722 +#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722 msgid "Browse" msgstr "ç€è¦½" -#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650 +#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662 msgid "Choose the correct PPD filename for your printer" msgstr "è«‹é¸æ“‡é©åˆæ‚¨çš„å°è¡¨æ©Ÿä½¿ç”¨çš„ PPD 檔案å稱" -#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679 +#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681 +#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693 msgid "Printer Queue:" msgstr "å°è¡¨æ©Ÿä½‡åˆ—：" -#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697 +#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709 msgid "Enter the correct command to print to your printer. " msgstr "請輸入列å°æ‰€ä½¿ç”¨çš„指令。" -#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720 msgid "Enter the file to print to. " msgstr "請輸入列å°æ™‚寫入的檔案。" -#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716 +#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724 +#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736 msgid "Print To File" msgstr "列å°è‡³æª”案" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754 +#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766 msgid "Define New Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857 -#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856 +#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868 +#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868 msgid "Printer Name:" msgstr "å°è¡¨æ©Ÿå稱：" -#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776 +#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788 msgid "Enter the name you wish to give this logical printer" msgstr "為這個虛擬å°è¡¨æ©Ÿå‘½å" -#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786 +#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798 msgid "About Gutenprint " msgstr "關於 Gutenprint " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 msgid "Gutenprint Version " msgstr "Gutenprint 版本 " -#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793 +#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805 #, fuzzy msgid "" "\n" @@ -4444,83 +4525,83 @@ msgstr "" "您應已收到附隨於本程å¼çš„GNU通用公共授權的副本；如無，請寫信至自由軟體基金會：" "59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n" -#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841 +#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853 msgid "Printer Settings" msgstr "å°è¡¨æ©Ÿè¨­å®š" -#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854 +#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "指定å°è¡¨æ©Ÿå稱 (ä¸æ˜¯å°è¡¨æ©Ÿé¡žåž‹æˆ–者型號)" -#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871 +#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883 msgid "Setup Printer..." msgstr "設定å°è¡¨æ©Ÿ..." -#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873 +#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "é¸å–列å°æ™‚使用的å°è¡¨æ©Ÿåž‹è™Ÿã€PPD 檔åŠæŒ‡ä»¤" -#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886 +#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898 msgid "New Printer..." msgstr "新增å°è¡¨æ©Ÿ..." -#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." msgstr "定義新的虛擬å°è¡¨æ©Ÿã€‚這個「å°è¡¨æ©Ÿã€å…¶å¯¦æ˜¯ä»£è¡¨ä¸€çµ„設定，以便將來使用。" -#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930 +#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942 msgid "Image Size" msgstr "å½±åƒå°ºå¯¸" -#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955 +#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967 msgid "Scaling:" msgstr "縮放：" -#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959 +#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971 msgid "Set the scale (size) of the image" msgstr "指定影åƒçš„縮放比例 (尺寸)" -#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981 +#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986 +#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "指定放大縮å°å½±åƒæ™‚çš„å–®ä½ï¼Œæ˜¯é é¢å°ºå¯¸çš„百分比，還是æ¯è‹±å‹æœ‰å¤šå°‘點" -#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989 +#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001 msgid "Percent" msgstr "百分比" -#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994 +#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006 msgid "Scale the print to the size of the page" msgstr "指定列å°æ™‚çš„å½±åƒå°ºå¯¸ç‚ºé é¢å°ºå¯¸çš„æŸå€‹ç™¾åˆ†æ¯”" -#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998 +#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003 +#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015 msgid "Scale the print to the number of dots per inch" msgstr "列å°æ™‚，é€éŽæŒ‡å®šæ¯è‹±å‹æœ‰å¤šå°‘點來放大縮å°å½±åƒ" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021 +#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033 msgid "Set the width of the print" msgstr "指定列å°æ™‚çš„å½±åƒå¯¬åº¦" -#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035 msgid "Set the height of the print" msgstr "指定列å°æ™‚çš„å½±åƒé«˜åº¦" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029 +#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041 msgid "" "Use Original\n" "Image Size" @@ -4528,64 +4609,64 @@ msgstr "" "使用影åƒ\n" "原來的尺寸" -#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035 +#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047 msgid "Set the print size to the size of the image" msgstr "將列å°æ™‚çš„å½±åƒå°ºå¯¸è¨­å®šç‚ºå½±åƒåŽŸä¾†çš„尺寸" -#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059 +#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 msgid "Print Color Adjust" msgstr "列å°è‰²å½©èª¿æ•´" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062 +#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074 msgid "Set Defaults" msgstr "" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064 +#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076 msgid "Close" msgstr "關閉" -#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093 +#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105 msgid "Image preview" msgstr "å½±åƒé è¦½" -#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107 +#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198 +#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210 msgid "Output" msgstr "" -#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226 +#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238 msgid "Output Type:" msgstr "" -#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230 +#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242 msgid "Select the desired output type" msgstr "指定輸出類型：" -#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251 +#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263 msgid "Adjust Output..." msgstr "調整輸出çµæžœ..." -#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260 +#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "調整色彩平衡ã€å…‰åº¦ã€åå·®ã€å½©åº¦åŠæ“¬è‰²çš„é‹ç®—æ–¹å¼" -#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279 +#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291 msgid "Size Units:" msgstr "尺寸單ä½ï¼š" -#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282 +#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306 +#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318 msgid "Units:" msgstr "å–®ä½ï¼š" -#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311 +#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323 msgid "Select the base unit of measurement for printing" msgstr "指定列å°æ™‚的基本長度單ä½" @@ -4715,15 +4796,15 @@ msgstr "" msgid "ISOLatin1" msgstr "" -#: src/cups/genppd.c:1417 +#: src/cups/genppd.c:1424 msgid "No" msgstr "å¦" -#: src/cups/genppd.c:1419 +#: src/cups/genppd.c:1426 msgid "Yes" msgstr "是" -#: src/cups/genppd.c:1447 +#: src/cups/genppd.c:1454 msgid "Fine Adjustment" msgstr "" @@ -4897,18 +4978,19 @@ msgstr "" msgid "Cannot read from %s: %s\n" msgstr "無法由 %s 讀å–資料：%s\n" -#: src/escputil/escputil.c:659 src/escputil/escputil.c:934 -#: src/escputil/escputil.c:1147 +#: src/escputil/escputil.c:659 src/escputil/escputil.c:943 +#: src/escputil/escputil.c:1161 #, c-format msgid "Cannot open %s read/write: %s\n" msgstr "" -#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034 +#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040 #, c-format msgid "Cannot write to %s: %s\n" msgstr "無法寫入 %s：%s\n" -#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013 +#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:1230 #, c-format msgid "" "\n" @@ -4917,7 +4999,8 @@ msgstr "" "\n" "無法寫入 %s：%s\n" -#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020 +#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026 +#: src/escputil/escputil.c:1237 #, c-format msgid "" "\n" @@ -4932,82 +5015,82 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" -#: src/escputil/escputil.c:863 src/escputil/escputil.c:869 -#: src/escputil/escputil.c:870 src/escputil/escputil.c:982 +#: src/escputil/escputil.c:865 src/escputil/escputil.c:871 +#: src/escputil/escputil.c:872 src/escputil/escputil.c:888 +#: src/escputil/escputil.c:889 src/escputil/escputil.c:890 +#: src/escputil/escputil.c:891 src/escputil/escputil.c:892 +#: src/escputil/escputil.c:895 src/escputil/escputil.c:896 +#: src/escputil/escputil.c:897 src/escputil/escputil.c:898 +#: src/escputil/escputil.c:899 src/escputil/escputil.c:990 msgid "Unknown" msgstr "ä¸è©³" -#: src/escputil/escputil.c:900 +#: src/escputil/escputil.c:919 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:903 +#: src/escputil/escputil.c:922 msgid "status" msgstr "狀態" -#: src/escputil/escputil.c:908 -#, c-format -msgid "Obtaining %s requires using a raw device.\n" -msgstr "" - -#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138 -#, c-format -msgid "Cannot identify printer!\n" -msgstr "無法識別å°è¡¨æ©Ÿï¼\n" - #: src/escputil/escputil.c:927 #, c-format -msgid "Printer does not support listing ink types!\n" +msgid "Obtaining %s requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Ink color" msgstr "墨水é¡è‰²" -#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071 -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Percent remaining" msgstr "" -#: src/escputil/escputil.c:1131 +#: src/escputil/escputil.c:1079 +#, c-format +msgid "Printer does not support listing ink types!\n" +msgstr "" + +#: src/escputil/escputil.c:1144 #, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216 -#: src/escputil/escputil.c:1236 +#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312 +#: src/escputil/escputil.c:1332 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217 -#: src/escputil/escputil.c:1237 +#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313 +#: src/escputil/escputil.c:1333 msgid "Date" msgstr "日期" -#: src/escputil/escputil.c:1273 +#: src/escputil/escputil.c:1371 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1289 +#: src/escputil/escputil.c:1389 #, c-format msgid "Cannot identify printer model.\n" msgstr "無法識別å°è¡¨æ©Ÿåž‹è™Ÿã€‚\n" -#: src/escputil/escputil.c:1308 +#: src/escputil/escputil.c:1408 #, c-format msgid "Cleaning heads...\n" msgstr "" -#: src/escputil/escputil.c:1319 +#: src/escputil/escputil.c:1419 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -#: src/escputil/escputil.c:1323 +#: src/escputil/escputil.c:1423 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5046,7 +5129,7 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1358 +#: src/escputil/escputil.c:1458 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -5082,12 +5165,12 @@ msgid "" "\n" msgstr "" -#: src/escputil/escputil.c:1402 +#: src/escputil/escputil.c:1502 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "" -#: src/escputil/escputil.c:1412 +#: src/escputil/escputil.c:1512 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -5099,38 +5182,38 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427 -#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456 -#: src/escputil/escputil.c:1558 +#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527 +#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556 +#: src/escputil/escputil.c:1658 msgid "> " msgstr "> " -#: src/escputil/escputil.c:1425 +#: src/escputil/escputil.c:1525 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1430 +#: src/escputil/escputil.c:1530 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" msgstr "" -#: src/escputil/escputil.c:1437 +#: src/escputil/escputil.c:1537 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1443 +#: src/escputil/escputil.c:1543 #, c-format msgid "Repeating the alignment process.\n" msgstr "" -#: src/escputil/escputil.c:1449 +#: src/escputil/escputil.c:1549 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -5140,44 +5223,44 @@ msgid "" "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1459 +#: src/escputil/escputil.c:1559 #, c-format msgid "About to save settings..." msgstr "準備儲存設定..." -#: src/escputil/escputil.c:1465 +#: src/escputil/escputil.c:1565 #, c-format msgid "failed!\n" msgstr "失敗ï¼\n" -#: src/escputil/escputil.c:1466 +#: src/escputil/escputil.c:1566 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1470 +#: src/escputil/escputil.c:1570 #, c-format msgid "succeeded!\n" msgstr "æˆåŠŸï¼\n" -#: src/escputil/escputil.c:1471 +#: src/escputil/escputil.c:1571 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" -#: src/escputil/escputil.c:1476 +#: src/escputil/escputil.c:1576 #, c-format msgid "Unrecognized command.\n" msgstr "" -#: src/escputil/escputil.c:1479 +#: src/escputil/escputil.c:1579 #, c-format msgid "Final command was not confirmed.\n" msgstr "" -#: src/escputil/escputil.c:1484 +#: src/escputil/escputil.c:1584 #, c-format msgid "" "This procedure assumes that your printer is an Epson %s.\n" @@ -5188,12 +5271,12 @@ msgid "" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566 -#: src/escputil/escputil.c:1609 +#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666 +#: src/escputil/escputil.c:1709 msgid "Press enter to continue > " msgstr "請按 enter 繼續 > " -#: src/escputil/escputil.c:1551 +#: src/escputil/escputil.c:1651 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -5201,42 +5284,42 @@ msgid "" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:1557 +#: src/escputil/escputil.c:1657 #, c-format msgid "Pass #%d" msgstr "第 %d 次" -#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608 +#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "請放入白紙。\n" -#: src/escputil/escputil.c:1582 +#: src/escputil/escputil.c:1682 #, c-format msgid "Number out of range!\n" msgstr "數字超出範åœä»¥å¤–ï¼\n" -#: src/escputil/escputil.c:1587 +#: src/escputil/escputil.c:1687 #, c-format msgid "I cannot understand what you typed!\n" msgstr "" -#: src/escputil/escputil.c:1593 +#: src/escputil/escputil.c:1693 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:1600 +#: src/escputil/escputil.c:1700 #, c-format msgid "Attempting to set alignment..." msgstr "" -#: src/escputil/escputil.c:1603 +#: src/escputil/escputil.c:1703 #, c-format msgid "succeeded.\n" msgstr "æˆåŠŸã€‚\n" -#: src/escputil/escputil.c:1604 +#: src/escputil/escputil.c:1704 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -5245,7 +5328,7 @@ msgid "" "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:1650 +#: src/escputil/escputil.c:1750 #, c-format msgid "Error in input\n" msgstr "" @@ -5381,6 +5464,9 @@ msgstr "" msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" msgstr "" +#~ msgid "Cannot identify printer!\n" +#~ msgstr "無法識別å°è¡¨æ©Ÿï¼\n" + #~ msgid "Red Balance" #~ msgstr "紅色平衡" diff --git a/samples/Makefile.in b/samples/Makefile.in index 5e8f1af..fe732ef 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 9c9e1b9..ee4e868 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -39,7 +39,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/scripts/global.mk compile config.guess \ - config.rpath config.sub install-sh ltmain.sh missing \ + config.rpath config.sub depcomp install-sh ltmain.sh missing \ mkinstalldirs subdir = scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -273,10 +273,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/scripts/depcomp b/scripts/depcomp new file mode 100755 index 0000000..ffcd540 --- /dev/null +++ b/scripts/depcomp @@ -0,0 +1,529 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2005-02-09.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# 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. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh index db4982d..8fc56db 100644 --- a/scripts/ltmain.sh +++ b/scripts/ltmain.sh @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.20 Debian 1.5.20-2" -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION="1.5.22 Debian 1.5.22-2" +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ run= show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ o2lo="s/\\.${objext}\$/.lo/" # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ func_win32_libid () if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -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 - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -295,9 +333,9 @@ func_extract_archives () $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +390,8 @@ func_extract_archives () # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +508,11 @@ do preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +544,18 @@ if test -n "$prevopt"; then exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +912,9 @@ EOF if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1117,7 @@ EOF no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1146,15 @@ EOF if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1329,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1417,8 @@ EOF prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1482,17 @@ EOF continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1520,8 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1535,15 @@ EOF esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1552,11 @@ EOF -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1568,15 @@ EOF # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1536,7 +1618,12 @@ EOF # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1635,7 @@ EOF esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1873,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +1983,9 @@ EOF if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2048,6 @@ EOF newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2197,7 +2286,7 @@ EOF esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2448,8 +2537,12 @@ EOF fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2562,11 +2655,15 @@ EOF if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) 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 /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3322,9 +3419,9 @@ EOF # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3377,7 +3474,12 @@ EOF ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3421,7 +3523,7 @@ EOF int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3466,7 +3568,7 @@ EOF # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3713,6 +3815,35 @@ EOF deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3796,6 +3927,7 @@ EOF fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4227,6 +4359,35 @@ EOF ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4271,10 +4432,15 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4391,10 +4557,22 @@ extern \"C\" { export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4511,16 +4689,29 @@ static const void *lt_preloaded_setup() { esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4545,7 +4736,7 @@ static const void *lt_preloaded_setup() { # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4553,7 +4744,7 @@ static const void *lt_preloaded_setup() { $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4693,10 +4884,12 @@ static const void *lt_preloaded_setup() { esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4731,15 +4927,19 @@ EOF #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' -#endif +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif #ifndef DIR_SEPARATOR_2 @@ -4749,17 +4949,32 @@ EOF (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4769,29 +4984,50 @@ main (int argc, char *argv[]) char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4812,48 +5048,148 @@ xstrdup (const char *string) ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - /* Is it qualified already? */ + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } #endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - /* prepend the current directory */ - /* doesn't handle '~' */ + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char* path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char* q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR(*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + return NULL; } char * @@ -4897,16 +5233,16 @@ lt_fatal (const char *message, ...) va_end (ap); } EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource + ;; + esac + $rm $output + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -5136,9 +5472,9 @@ fi\ $run ${rm}r "$gentop" $show "$mkdir $gentop" $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$gentop"; then + exit $exit_status fi fi @@ -5805,18 +6141,7 @@ relink_command=\"$relink_command\"" outputname= if test "$fast_install" = no && test -n "$relink_command"; then 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 - else - umask $save_umask - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi + tmpdir=`func_mktempdir` file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -5940,7 +6265,7 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = : && exit $EXIT_SUCCESS - $echo "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" @@ -5973,7 +6298,7 @@ relink_command=\"$relink_command\"" $echo $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 "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS ;; @@ -6190,9 +6515,17 @@ relink_command=\"$relink_command\"" rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test "$mode" = uninstall; then + case "$mode" in + clean) + case " $library_names " in + # " " in the beginning catches empty $dlname + *" $dlname "*) ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; + esac + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + ;; + uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. cmds=$postuninstall_cmds @@ -6225,7 +6558,8 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - fi + ;; + esac fi ;; @@ -6524,12 +6858,11 @@ exit $? # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes +disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: diff --git a/src/Makefile.in b/src/Makefile.in index 63a4960..3d4243a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -280,10 +280,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in index f506b11..9f1ccf9 100644 --- a/src/cups/Makefile.in +++ b/src/cups/Makefile.in @@ -351,10 +351,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in index 94e9085..1b90140 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.21 2005/08/14 10:07:36 rleigh Exp $ +# $Id: cups-genppdupdate.in,v 1.22 2005/12/24 22:41:11 rlk Exp $ # Update CUPS PPDs for Gutenprint queues. # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org) # @@ -173,6 +173,7 @@ sub update_ppd ($) { open ORIG, $_ or die "$_: can't open PPD file: $!"; seek (ORIG, 0, 0) or die "can't seek to start of PPD file"; + my @orig_metadata = stat(ORIG); if ($debug) { print "Source Filename: $ppd_source_filename\n"; } @@ -277,8 +278,6 @@ sub update_ppd ($) { # Save new PPD in a temporary file, for processing... my($tmpfile, $tmpfilename) = tmpnam(); - chown(0, 0, $tmpfilename); # root.root - chmod(0644, $tmpfilename); unlink $tmpfilename or warn "can't unlink temporary file $tmpfile: $!\n"; print $tmpfile $source_data; @@ -366,8 +365,6 @@ default_loop: warn "Can't open $tmpnew for writing: $!\n"; return 0; } - chown(0, 0, $tmpnew); # Bad idea to hardcode this... - chmod(0644, $tmpnew); # Bad idea to hardcode this... print NEWPPD $source_data; if (! close NEWPPD) { warn "Can't close ${tmpnew}.new for writing: $!\n"; @@ -380,6 +377,8 @@ default_loop: unlink $tmpnew; return 0; } + chown($orig_metadata[4], $orig_metadata[5], $ppd_source_filename); + chmod(($orig_metadata[2] & 0777), $ppd_source_filename); if (!$quiet || $verbose) { print STDOUT "Updated $ppd_source_filename using $source\n"; diff --git a/src/cups/genppd.c b/src/cups/genppd.c index c39d768..bdff9fe 100644 --- a/src/cups/genppd.c +++ b/src/cups/genppd.c @@ -1,5 +1,5 @@ /* - * "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $" + * "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $" * * PPD file generation program for the CUPS drivers. * @@ -1234,10 +1234,17 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ stp_set_string_parameter(v, "Quality", opt->name); stp_describe_resolution(v, &xdpi, &ydpi); if (xdpi == -1 || ydpi == -1) - gzprintf(fp, "*StpQuality %s/%s: \"\"\n", opt->name, opt->text); - else - gzprintf(fp, "*StpQuality %s/%s:\t\"<>setpagedevice\"\n", - opt->name, opt->text, xdpi, ydpi); + { + stp_parameter_t res_desc; + stp_clear_string_parameter(v, "Quality"); + stp_describe_parameter(v, "Resolution", &res_desc); + stp_set_string_parameter(v, "Resolution", res_desc.deflt.str); + stp_describe_resolution(v, &xdpi, &ydpi); + stp_clear_string_parameter(v, "Resolution"); + stp_parameter_description_destroy(&res_desc); + } + gzprintf(fp, "*StpQuality %s/%s:\t\"<>setpagedevice\"\n", + opt->name, opt->text, xdpi, ydpi, i + 1); } gzputs(fp, "*CloseUI: *StpQuality\n\n"); } @@ -1300,7 +1307,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ */ gzprintf(fp, "*Resolution %s/%s:\t\"<>setpagedevice\"\n", - opt->name, opt->text, xdpi, ydpi, i); + opt->name, opt->text, xdpi, ydpi, i + 1); } stp_parameter_description_destroy(&desc); @@ -1488,169 +1495,6 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ print_group_close(fp, j, k); } } - if (has_quality_parameter) - { - stp_parameter_t qdesc; - const char *tname = NULL; - stp_describe_parameter(v, "Quality", &qdesc); - if (qdesc.p_type == STP_PARAMETER_TYPE_STRING_LIST && - stp_string_list_count(qdesc.bounds.str) > 1) - { - for (l = 0; l < stp_string_list_count(qdesc.bounds.str); l++) - { - opt = stp_string_list_param(qdesc.bounds.str, l); - if (opt && strcmp(opt->name, "None") != 0) - { - tname = opt->name; - break; - } - } - } - for (l = 0; l < stp_parameter_list_count(param_list); l++) - { - const stp_parameter_t *lparam = - stp_parameter_list_param(param_list, l); - if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT || - lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 || - strcmp(lparam->name, "Quality") == 0 || - (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST && - lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN && - lparam->p_type != STP_PARAMETER_TYPE_DIMENSION && - lparam->p_type != STP_PARAMETER_TYPE_DOUBLE)) - continue; - stp_clear_string_parameter(v, "Quality"); - stp_describe_parameter(v, lparam->name, &desc); - if (desc.is_active) - { - stp_parameter_description_destroy(&desc); - stp_set_string_parameter(v, "Quality", tname); - stp_describe_parameter(v, lparam->name, &desc); - if (!desc.is_active) - { - gzprintf(fp, "*UIConstraints: *StpQuality *Stp%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *Stp%s *StpQuality\n\n", - lparam->name); - if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE) - { - gzprintf(fp, "*UIConstraints: *StpQuality *StpFine%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *StpFine%s *StpQuality\n\n", - lparam->name); - } - } - } - stp_clear_string_parameter(v, "Quality"); - stp_parameter_description_destroy(&desc); - } - stp_parameter_description_destroy(&qdesc); - } - if (has_image_type_parameter) - { - stp_parameter_t qdesc; - const char *tname = NULL; - stp_describe_parameter(v, "ImageType", &qdesc); - if (qdesc.p_type == STP_PARAMETER_TYPE_STRING_LIST && - stp_string_list_count(qdesc.bounds.str) > 1) - { - for (l = 0; l < stp_string_list_count(qdesc.bounds.str); l++) - { - opt = stp_string_list_param(qdesc.bounds.str, l); - if (opt && strcmp(opt->name, "None") != 0) - { - tname = opt->name; - break; - } - } - } - for (l = 0; l < stp_parameter_list_count(param_list); l++) - { - const stp_parameter_t *lparam = - stp_parameter_list_param(param_list, l); - if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT || - lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 || - strcmp(lparam->name, "ImageType") == 0 || - (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST && - lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN && - lparam->p_type != STP_PARAMETER_TYPE_DIMENSION && - lparam->p_type != STP_PARAMETER_TYPE_DOUBLE)) - continue; - stp_clear_string_parameter(v, "ImageType"); - stp_describe_parameter(v, lparam->name, &desc); - if (desc.is_active) - { - stp_parameter_description_destroy(&desc); - stp_set_string_parameter(v, "ImageType", tname); - stp_describe_parameter(v, lparam->name, &desc); - if (!desc.is_active) - { - gzprintf(fp, "*UIConstraints: *StpImageType *Stp%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *Stp%s *StpImageType\n\n", - lparam->name); - if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE) - { - gzprintf(fp, "*UIConstraints: *StpImageType *StpFine%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *StpFine%s *StpImageType\n\n", - lparam->name); - } - } - } - stp_clear_string_parameter(v, "ImageType"); - stp_parameter_description_destroy(&desc); - } - stp_parameter_description_destroy(&qdesc); - } - if (printer_is_color) - { - for (l = 0; l < stp_parameter_list_count(param_list); l++) - { - const stp_parameter_t *lparam = - stp_parameter_list_param(param_list, l); - if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT || - lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 || - strcmp(lparam->name, "Quality") == 0 || - is_special_option(lparam->name) || - (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST && - lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN && - lparam->p_type != STP_PARAMETER_TYPE_DIMENSION && - lparam->p_type != STP_PARAMETER_TYPE_DOUBLE)) - continue; - stp_set_string_parameter(v, "PrintingMode", "Color"); - stp_describe_parameter(v, lparam->name, &desc); - if (desc.is_active) - { - stp_parameter_description_destroy(&desc); - stp_set_string_parameter(v, "PrintingMode", "BW"); - stp_describe_parameter(v, lparam->name, &desc); - if (!desc.is_active) - { - gzprintf(fp, "*UIConstraints: *ColorModel Gray *Stp%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *ColorModel Black *Stp%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *Stp%s *ColorModel Gray\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *Stp%s *ColorModel Black\n\n", - lparam->name); - if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE) - { - gzprintf(fp, "*UIConstraints: *ColorModel Gray *StpFine%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *ColorModel Black *StpFine%s\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *StpFine%s *ColorModel Gray\n", - lparam->name); - gzprintf(fp, "*UIConstraints: *StpFine%s *ColorModel Black\n\n", - lparam->name); - } - } - } - stp_parameter_description_destroy(&desc); - } - stp_set_string_parameter(v, "PrintingMode", "Color"); - } stp_parameter_list_destroy(param_list); /* @@ -1707,5 +1551,5 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ /* - * End of "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $". + * End of "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $". */ diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c index b9da368..64b0d0d 100644 --- a/src/cups/rastertoprinter.c +++ b/src/cups/rastertoprinter.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertoprinter.c,v 1.96 2005/04/23 00:26:07 rlk Exp $" + * "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $" * * Gutenprint based raster filter for the Common UNIX Printing System. * @@ -131,7 +131,13 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice) stp_describe_parameter(v, name, &desc); if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST) { - if (choice >= stp_string_list_count(desc.bounds.str)) + if (choice < 0) + { + stp_clear_string_parameter(v, name); + fprintf(stderr, "DEBUG: Gutenprint clear special parameter %s\n", + name); + } + else if (choice >= stp_string_list_count(desc.bounds.str)) fprintf(stderr, "ERROR: Gutenprint unable to set %s!\n", name); else { @@ -368,8 +374,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings) break; } - if (cups->header.cupsCompression >= 0) - set_special_parameter(v, "Resolution", cups->header.cupsCompression); + set_special_parameter(v, "Resolution", cups->header.cupsCompression - 1); + + set_special_parameter(v, "Quality", cups->header.cupsRowFeed - 1); if (cups->header.MediaClass && strlen(cups->header.MediaClass) > 0) set_string_parameter(v, "InputSlot", cups->header.MediaClass); @@ -1091,5 +1098,5 @@ Image_width(stp_image_t *image) /* I - Image */ /* - * End of "$Id: rastertoprinter.c,v 1.96 2005/04/23 00:26:07 rlk Exp $". + * End of "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $". */ diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in index 91cb23a..4ba8eb2 100644 --- a/src/escputil/Makefile.in +++ b/src/escputil/Makefile.in @@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c index 8e3b092..3ae79a2 100644 --- a/src/escputil/d4lib.c +++ b/src/escputil/d4lib.c @@ -180,12 +180,12 @@ static errorMessage_t errorMessage[] = int SafeWrite(int fd, const void *data, int len) { int status; - int retries=3; + int retries=30; do { status = write(fd, data, len); if(status < len) - usleep(100000); + usleep(d4WrTimeout); retries--; } while ((status < len) && (retries > 0)); @@ -390,7 +390,7 @@ int readAnswer(int fd, unsigned char *buf, int len) long dt; int count = 0; /* wait a little bit before reading an answer */ - usleep(20000); + usleep(d4RdTimeout); /* for error handling in case of timeout */ timeoutGot = 0; @@ -444,7 +444,7 @@ int readAnswer(int fd, unsigned char *buf, int len) len = (len > sizeof(buf))?sizeof(buf) - 1:len; } } - usleep(20000); + usleep(d4RdTimeout); } if ( debugD4 ) @@ -475,8 +475,8 @@ static void _flushData(int fd) struct itimerval ti, oti; char buf[1024]; int len = 1023; - int count = 20; - usleep(20000); + int count = 200; + usleep(d4RdTimeout); /* for error handling in case of timeout */ timeoutGot = 0; @@ -489,7 +489,7 @@ static void _flushData(int fd) fprintf(stderr, "flush data: length: %i\n", len); do { - usleep(50000); + usleep(d4RdTimeout); SET_TIMER(ti,oti, d4RdTimeout); rd = read(fd, buf, len); if (debugD4) @@ -990,7 +990,7 @@ int askForCredit(int fd, unsigned char socketID, int *sndSize, int *rcvSize) while (credit == 0 ) { while((credit=CreditRequest(fd,socketID)) == 0 && count < MAX_CREDIT_REQUEST ) - usleep(250000); + usleep(d4RdTimeout); if ( credit == -1 ) { diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c index 3be1bf3..8997a97 100644 --- a/src/escputil/escputil.c +++ b/src/escputil/escputil.c @@ -1,5 +1,5 @@ /* - * "$Id: escputil.c,v 1.76 2005/10/01 18:47:29 rlk Exp $" + * "$Id: escputil.c,v 1.79 2005/12/31 21:23:08 rlk Exp $" * * Printer maintenance utility for EPSON Stylus (R) printers * @@ -503,7 +503,7 @@ read_from_printer(int fd, char *buf, int bufsize, int quiet) status = read(fd, buf, bufsize - 1); if (status == 0 || (status < 0 && errno == EAGAIN)) { - usleep(20000); + usleep(2000); status = 0; /* not an error (read would have blocked) */ } } @@ -838,7 +838,8 @@ initialize_printer(int quiet, int fail_if_not_found) } close(fd); - STP_DEBUG(fprintf(stderr, "new? %s\n", isnew?"yes":"no")); + STP_DEBUG(fprintf(stderr, "new? %s found? %s\n", isnew?"yes":"no", + found?"yes":"no")); return (found)?the_printer_t:NULL; } @@ -851,7 +852,8 @@ get_printer(int quiet, int fail_if_not_found) { const stp_printer_t *printer = initialize_printer(quiet, fail_if_not_found); - STP_DEBUG(fprintf(stderr, "init done...\n")); + STP_DEBUG(fprintf(stderr, "init done, printer found? %s...\n", + printer ? "yes" : "no")); return printer; } } @@ -875,24 +877,41 @@ static const char *colors_new[] = N_("Gloss Optimizer"), /* e */ N_("Light Light Black"), /* f */ }; - static int color_count = sizeof(colors_new) / sizeof(const char *); +static const char *aux_colors[] = + { + N_("Black"), /* 0 */ + N_("Cyan"), /* 1 */ + N_("Magenta"), /* 2 */ + N_("Yellow"), /* 3 */ + N_("Unknown"), /* 4 */ + N_("Unknown"), /* 5 */ + N_("Unknown"), /* 6 */ + N_("Unknown"), /* 7 */ + N_("Unknown"), /* 8 */ + N_("Red"), /* 9 */ + N_("Blue"), /* a */ + N_("Unknown"), /* b */ + N_("Unknown"), /* c */ + N_("Unknown"), /* d */ + N_("Unknown"), /* e */ + N_("Unknown"), /* f */ + }; +static int aux_color_count = sizeof(aux_colors) / sizeof(const char *); + static void do_status_command_internal(status_cmd_t cmd) { int fd; int status; int credit; - int col_number; int retry = 4; char buf[1024]; char *ind = NULL; char *oind; int i; const stp_printer_t *printer; - const stp_vars_t *printvars; - stp_parameter_t desc; const char *cmd_name = NULL; switch (cmd) { @@ -912,21 +931,11 @@ do_status_command_internal(status_cmd_t cmd) STP_DEBUG(fprintf(stderr, "%s...\n", cmd_name)); printer = get_printer(1, 0); - if (!printer) - { - fprintf(stderr, _("Cannot identify printer!\n")); - exit(0); - } if (!found_unknown_old_printer) - STP_DEBUG(fprintf(stderr, "%s found %s\n", cmd_name, - stp_printer_get_long_name(printer))); - printvars = stp_printer_get_defaults(printer); - stp_describe_parameter(printvars, "ChannelNames", &desc); - if (desc.p_type != STP_PARAMETER_TYPE_STRING_LIST) - { - fprintf(stderr, _("Printer does not support listing ink types!\n")); - exit(1); - } + STP_DEBUG(fprintf(stderr, "%s found %s%s\n", cmd_name, + printer ? stp_printer_get_long_name(printer) : + printer_model, + printer ? "" : "(Unknown model)")); fd = open(raw_device, O_RDWR, 0666); if (fd == -1) @@ -948,7 +957,6 @@ do_status_command_internal(status_cmd_t cmd) { if ( ( status = readData(fd, socket_id, (unsigned char*)buf, 1023) ) <= -1 ) { - stp_parameter_description_destroy(&desc); exit(1); } STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status)); @@ -957,7 +965,6 @@ do_status_command_internal(status_cmd_t cmd) /* "@BCD ST ST" found */ if (!retry) { - stp_parameter_description_destroy(&desc); exit(1); } buf[status] = '\0'; @@ -972,18 +979,19 @@ do_status_command_internal(status_cmd_t cmd) i += buf[i + 1] + 2; ind = buf + i; i = 3; - col_number = 0; printf("%18s %20s\n", _("Ink color"), _("Percent remaining")); while (i < ind[1]) { if (ind[i] < color_count) printf("%18s %20d\n", _(colors_new[(int) ind[i]]), ind[i + 2]); + else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count) + printf("%18s %20d\n", _(aux_colors[(int) ind[i + 1]]), ind[i + 2]); else - printf("%18s %20d\n", _("Unknown"), ind[i + 2]); - col_number++; + printf("%8s 0x%2x 0x%2x %20d\n", _("Unknown"), (unsigned char) ind[i], (unsigned char) ind[i + 1], ind[i + 2]); i+=3; } ind = NULL; + exit(0); } else /* old format */ @@ -1009,14 +1017,12 @@ do_status_command_internal(status_cmd_t cmd) } else /* could not write */ { - stp_parameter_description_destroy(&desc); fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno)); exit(1); } } else /* no credit */ { - stp_parameter_description_destroy(&desc); STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n"))); exit(1); } @@ -1038,7 +1044,6 @@ do_status_command_internal(status_cmd_t cmd) status = read_from_printer(fd, buf, 1024, 1); if (status < 0) { - stp_parameter_description_destroy(&desc); exit(1); } ind = buf; @@ -1060,12 +1065,20 @@ do_status_command_internal(status_cmd_t cmd) if (!ind) { - stp_parameter_description_destroy(&desc); exit(1); } if (cmd == CMD_INK_LEVEL) { + stp_parameter_t desc; + const stp_vars_t *printvars; + printvars = stp_printer_get_defaults(printer); + stp_describe_parameter(printvars, "ChannelNames", &desc); + if (desc.p_type != STP_PARAMETER_TYPE_STRING_LIST) + { + fprintf(stderr, _("Printer does not support listing ink types!\n")); + exit(1); + } ind += 3; printf("%18s %20s\n", _("Ink color"), _("Percent remaining")); @@ -1090,6 +1103,7 @@ do_status_command_internal(status_cmd_t cmd) val); ind += 2; } + stp_parameter_description_destroy(&desc); } else { @@ -1098,7 +1112,6 @@ do_status_command_internal(status_cmd_t cmd) *where = '\n'; printf("%s\n", ind); } - stp_parameter_description_destroy(&desc); (void) close(fd); exit(0); } @@ -1133,13 +1146,14 @@ do_extended_ink_info(int extended_output) } printer = get_printer(1, 0); - if (!printer) + if (printer) { - fprintf(stderr, _("Cannot identify printer!\n")); - exit(0); + printvars = stp_printer_get_defaults(printer); + stp_describe_parameter(printvars, "ChannelNames", &desc); } - printvars = stp_printer_get_defaults(printer); - stp_describe_parameter(printvars, "ChannelNames", &desc); + else + printf("Warning! Printer %s is not known; information may be incomplete or incorrect\n", + printer_model); fd = open(raw_device, O_RDWR, 0666); if (fd == -1) @@ -1151,7 +1165,89 @@ do_extended_ink_info(int extended_output) if (isnew) { - for (i = 0; i < stp_string_list_count(desc.bounds.str); i++) + stp_string_list_t *color_list = stp_string_list_create(); + + if (!printer) + { + /* + * If we're using the "new" ink status format and we don't know + * about the printer, take the colors from the ink status + * message rather than from the ink list. This gives us a + * last chance to determine the inks + */ + credit = askForCredit(fd, socket_id, &send_size, &receive_size); + if ( credit > -1 ) + { + /* request status command */ + if ( (status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1", 5, 1)) > 0 ) + { + do + { + if ((status = readData(fd, socket_id, (unsigned char*)buf, 1023)) <= -1) + { + stp_parameter_description_destroy(&desc); + exit(1); + } + STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status)); + } + while ( (retry-- != 0) && strncmp("st", buf, 2) && strncmp("@BDC ST", buf, 7) ); + /* "@BCD ST ST" found */ + if (!retry) + { + stp_parameter_description_destroy(&desc); + exit(1); + } + buf[status] = '\0'; + if ( buf[7] == '2' ) + { + STP_DEBUG(fprintf(stderr, "New format ink!\n")); + /* new binary format ! */ + i = 10; + while (buf[i] != 0x0f && i < status) + i += buf[i + 1] + 2; + ind = buf + i; + i = 3; + while (i < ind[1]) + { + if (ind[i] < color_count) + stp_string_list_add_string(color_list, + colors_new[(int) ind[i]], + colors_new[(int) ind[i]]); + else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count) + stp_string_list_add_string(color_list, + aux_colors[(int) ind[i + 1]], + aux_colors[(int) ind[i + 1]]); + else + stp_string_list_add_string(color_list, "Unknown", + "Unknown"); + i+=3; + } + } + } + else /* could not write */ + { + stp_parameter_description_destroy(&desc); + fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno)); + exit(1); + } + } + else /* no credit */ + { + stp_parameter_description_destroy(&desc); + STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n"))); + exit(1); + } + STP_DEBUG(fprintf(stderr, "Using color list from status message\n")); + } + else + { + color_list = stp_string_list_create_copy(desc.bounds.str); + STP_DEBUG(fprintf(stderr, "Using color list from driver (%d %d)\n", + stp_string_list_count(desc.bounds.str), + stp_string_list_count(color_list))); + stp_parameter_description_destroy(&desc); + } + for (i = 0; i < stp_string_list_count(color_list); i++) { credit = askForCredit(fd, socket_id, &send_size, &receive_size); if ( credit > -1 ) @@ -1166,37 +1262,37 @@ do_extended_ink_info(int extended_output) { if ( ( status = readData(fd, socket_id, (unsigned char*) buf, 1023) ) <= -1 ) { - stp_parameter_description_destroy(&desc); exit(1); } } while ((retry-- != 0) && strncmp("ii", buf, 2) && strncmp("@BDC PS", buf, 7)); if (!retry) /* couldn't read answer */ { - stp_parameter_description_destroy(&desc); exit(1); } ind = strchr(buf, 'I'); - if (sscanf(ind, - "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;", - &iv[0], &year, &month, &id, - &iv[1], &iv[2], &iv[3], &iv[4], &iv[5], - &year2, &month2, &id2) == 12 || - sscanf(ind, - "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;", - &iv[0], &year, &month, &id, - &iv[1], &iv[2], &iv[3], &iv[4], &iv[5], - &year2, &month2, &id2) == 12) + if (!ind) + printf("Cannot identify cartridge in slot %d\n", i); + else if (sscanf(ind, + "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;", + &iv[0], &year, &month, &id, + &iv[1], &iv[2], &iv[3], &iv[4], &iv[5], + &year2, &month2, &id2) == 12 || + sscanf(ind, + "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;", + &iv[0], &year, &month, &id, + &iv[1], &iv[2], &iv[3], &iv[4], &iv[5], + &year2, &month2, &id2) == 12) { int j; printf("%18s %20s %12s %7s\n", _("Ink color"), _("Percent remaining"), _("Part number"), _("Date")); printf("%18s %20d T0%03d %2d%02d-%02d\n", - _(stp_string_list_param(desc.bounds.str, 0)->text), + _(stp_string_list_param(color_list, 0)->text), iv[0], id, (year > 80 ? 19 : 20), year, month); for (j = 1; j < 6; j++) printf("%18s %20d T0%03d %2d%02d-%02d\n", - _(stp_string_list_param(desc.bounds.str, j)->text), + _(stp_string_list_param(color_list, j)->text), iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2); break; } @@ -1216,11 +1312,11 @@ do_extended_ink_info(int extended_output) _("Ink color"), _("Percent remaining"), _("Part number"), _("Date")); printf("%18s %20d T0%03d %2d%02d-%02d\n", - _(stp_string_list_param(desc.bounds.str, 0)->text), + _(stp_string_list_param(color_list, 0)->text), iv[0], id, (year > 80 ? 19 : 20), year, month); for (j = 1; j < 4; j++) printf("%18s %20d T0%03d %2d%02d-%02d\n", - _(stp_string_list_param(desc.bounds.str, j)->text), + _(stp_string_list_param(color_list, j)->text), iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2); break; } @@ -1236,22 +1332,25 @@ do_extended_ink_info(int extended_output) _("Ink color"), _("Percent remaining"), _("Part number"), _("Date")); printf("%18s %20d T0%03d %2d%02d-%02d\n", - _(stp_string_list_param(desc.bounds.str, i)->text), + _(stp_string_list_param(color_list, i)->text), val, id, (year > 80 ? 19 : 20), year, month); } + else + { + printf("Cannot identify cartridge in slot %d\n", i); + } } else /* could not write */ { - stp_parameter_description_destroy(&desc); exit(1); } } else /* no credit */ { - stp_parameter_description_destroy(&desc); exit(1); } } + stp_string_list_destroy(color_list); CloseChannel(fd, socket_id); } else @@ -1259,7 +1358,6 @@ do_extended_ink_info(int extended_output) (void) close(fd); do_ink_level(); } - stp_parameter_description_destroy(&desc); exit(0); } @@ -1284,6 +1382,8 @@ do_identify(void) printf("%s\n", _(stp_printer_get_long_name(printer))); exit(0); } + else if (printer_model) + printf("EPSON %s\n", printer_model); else { fprintf(stderr, _("Cannot identify printer model.\n")); diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in index 2cbf359..52bb281 100644 --- a/src/foomatic/Makefile.in +++ b/src/foomatic/Makefile.in @@ -310,10 +310,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in index e1ffa44..d3cf386 100644 --- a/src/foomatic/foomatic-generator.in +++ b/src/foomatic/foomatic-generator.in @@ -1269,6 +1269,8 @@ sub qualityorder { "hquni", "hq2", "hq2uni", + "ov", + "oov", # Canon "dmt", ); diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap index a7d7ee7..4e3eeef 100644 --- a/src/foomatic/foomatic-printermap +++ b/src/foomatic/foomatic-printermap @@ -245,8 +245,11 @@ #gptofoo escp2-cx3650 printer/Epson-Stylus_CX3650 #gptofoo escp2-cx3700 printer/Epson-Stylus_CX3700 #gptofoo escp2-cx3800 printer/Epson-Stylus_CX3800 +#gptofoo escp2-cx3805 printer/Epson-Stylus_CX3805 #gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810 +#gptofoo escp2-cx4100 printer/Epson-Stylus_CX4100 #gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200 +#gptofoo escp2-cx4500 printer/Epson-Stylus_CX4500 #gptofoo escp2-cx4600 printer/Epson-Stylus_CX4600 #gptofoo escp2-cx4700 printer/Epson-Stylus_CX4700 #gptofoo escp2-cx4800 printer/Epson-Stylus_CX4800 @@ -254,6 +257,7 @@ #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400 +#gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800 #gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300 #gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400 @@ -268,10 +272,14 @@ #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200 +#gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250 #gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800 +#gptofoo escp2-picmate printer/Epson-PictureMate +#gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe #gptofoo escp2-cl700 printer/Epson-CL_700 #gptofoo escp2-cl750 printer/Epson-CL_750 #gptofoo escp2-cl760 printer/Epson-CL_760 +#gptofoo escp2-e100 printer/Epson-E_100 #gptofoo escp2-em900c printer/Epson-EM_900C #gptofoo escp2-em930c printer/Epson-EM_930C #gptofoo escp2-mc2000 printer/Epson-MC_2000 @@ -284,16 +292,9 @@ #gptofoo escp2-mj6000c printer/Epson-MJ_6000C #gptofoo escp2-mj8000c printer/Epson-MJ_8000C #gptofoo escp2-pm700c printer/Epson-PM_700C -#gptofoo escp2-pmg700 printer/Epson-PM_G700 -#gptofoo escp2-pmg720 printer/Epson-PM_G720 -#gptofoo escp2-pmg800 printer/Epson-PM_G800 -#gptofoo escp2-pmg820 printer/Epson-PM_G820 #gptofoo escp2-pm730c printer/Epson-PM_730C #gptofoo escp2-pm740c printer/Epson-PM_740C #gptofoo escp2-pm750c printer/Epson-PM_750C -#gptofoo escp2-pmd750 printer/Epson-PM_D750 -#gptofoo escp2-pmd770 printer/Epson-PM_D770 -#gptofoo escp2-pmd1000 printer/Epson-PM_D1000 #gptofoo escp2-pm760c printer/Epson-PM_760C #gptofoo escp2-pm770c printer/Epson-PM_770C #gptofoo escp2-pm780c printer/Epson-PM_780C @@ -318,11 +319,21 @@ #gptofoo escp2-pm7000c printer/Epson-PM_7000C #gptofoo escp2-pm9000c printer/Epson-PM_9000C #gptofoo escp2-pm10000 printer/Epson-PM_10000 +#gptofoo escp2-pma900 printer/Epson-PM_A900 +#gptofoo escp2-pmd750 printer/Epson-PM_D750 +#gptofoo escp2-pmd770 printer/Epson-PM_D770 +#gptofoo escp2-pmd1000 printer/Epson-PM_D1000 +#gptofoo escp2-pmg700 printer/Epson-PM_G700 +#gptofoo escp2-pmg720 printer/Epson-PM_G720 +#gptofoo escp2-pmg800 printer/Epson-PM_G800 +#gptofoo escp2-pmg820 printer/Epson-PM_G820 +#gptofoo escp2-pxa650 printer/Epson-PX_A650 #gptofoo escp2-pxg900 printer/Epson-PX_G900 #gptofoo escp2-pxg920 printer/Epson-PX_G920 #gptofoo escp2-pxg5000 printer/Epson-PX_G5000 #gptofoo escp2-pxv500 printer/Epson-PX_V500 #gptofoo escp2-pxv600 printer/Epson-PX_V600 +#gptofoo escp2-px5500 printer/Epson-PX_5500 #gptofoo escp2-px7000 printer/Epson-PX_7000 #gptofoo escp2-px9000 printer/Epson-PX_9000 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400 diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in index 6479033..4db2b1d 100644 --- a/src/ghost/Makefile.in +++ b/src/ghost/Makefile.in @@ -297,10 +297,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in index 95fccd5..fa5c842 100644 --- a/src/gimp/Makefile.in +++ b/src/gimp/Makefile.in @@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in index fbcb0fb..d520068 100644 --- a/src/gimp2/Makefile.in +++ b/src/gimp2/Makefile.in @@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in index f9cd11b..55f33a0 100644 --- a/src/gutenprintui/Makefile.in +++ b/src/gutenprintui/Makefile.in @@ -311,10 +311,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/gutenprintui/gutenprintui.pc.in b/src/gutenprintui/gutenprintui.pc.in index 4e98dcf..42e350e 100644 --- a/src/gutenprintui/gutenprintui.pc.in +++ b/src/gutenprintui/gutenprintui.pc.in @@ -7,5 +7,6 @@ Name: Gutenprint UI (GTK+-1.2 version) Description: Gutenprint Top Quality Printer Drivers - GTK+-1.2 User Interface Requires: gutenprint Version: @VERSION@ -Libs: -L${libdir} @gutenprintui_libs@ +Libs: -L${libdir} @GUTENPRINTUI_LIBS@ +Libs.private: @gutenprintui_libdeps@ Cflags: -I${includedir} @gutenprintui_cflags@ diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c index e6ba4db..81ce574 100644 --- a/src/gutenprintui/panel.c +++ b/src/gutenprintui/panel.c @@ -1,5 +1,5 @@ /* - * "$Id: panel.c,v 1.5 2005/09/17 21:54:33 rlk Exp $" + * "$Id: panel.c,v 1.7 2005/12/30 20:32:07 rlk Exp $" * * Main window code for Print plug-in for the GIMP. * @@ -882,11 +882,18 @@ populate_options(const stp_vars_t *v) stp_parameter_list_destroy(params); } +static void +destroy_something(GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy(widget); +} + static void populate_option_table(GtkWidget *table, int p_class) { int i, j; int current_pos = 0; + GtkWidget *previous_sep = NULL; int counts[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; int vpos[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++) @@ -897,6 +904,8 @@ populate_option_table(GtkWidget *table, int p_class) } + gtk_container_foreach(GTK_CONTAINER(table), destroy_something, NULL); + /* First scan the options to figure out where to start */ for (i = 0; i < current_option_count; i++) { @@ -925,26 +934,29 @@ populate_option_table(GtkWidget *table, int p_class) } /* Now, figure out where we're going to put the options */ - for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++) + for (i = 0; i <= MAXIMUM_PARAMETER_LEVEL + 1; i++) { int level_count = 0; - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - level_count += counts[i][j]; + if (i <= MAXIMUM_PARAMETER_LEVEL) + for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) + level_count += counts[i][j]; if (level_count > 0 && current_pos > 0) { GtkWidget *sep = gtk_hseparator_new(); gtk_table_attach(GTK_TABLE(table), sep, 0, 4, current_pos, current_pos + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); - if (i <= MAXIMUM_PARAMETER_LEVEL) - gtk_widget_show(sep); + if (previous_sep) + gtk_widget_show(previous_sep); + previous_sep = sep; current_pos++; } - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - { - vpos[i][j] = current_pos; - current_pos += counts[i][j]; - } + if (i <= MAXIMUM_PARAMETER_LEVEL) + for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) + { + vpos[i][j] = current_pos; + current_pos += counts[i][j]; + } } for (i = 0; i < current_option_count; i++) @@ -1372,7 +1384,6 @@ create_copy_number_frame(void) GtkWidget *event_box; GtkAdjustment *adj; - fprintf(stderr, "create_copy_number_frame\n"); frame = gtk_frame_new (_("Number of Copies")); gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c index ee98f73..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,43 +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 - * @param yy_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()" ); @@ -1907,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()" ); @@ -1917,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 @@ -2083,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 a0a27da..1609566 100644 --- a/src/gutenprintui/printrcy.c +++ b/src/gutenprintui/printrcy.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,9 +36,6 @@ /* Identify Bison output. */ #define YYBISON 1 -/* Bison version. */ -#define YYBISON_VERSION "2.1" - /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -96,7 +93,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 @@ -187,11 +183,6 @@ static stpui_plist_t *current_printer = NULL; # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) typedef int YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -204,48 +195,22 @@ typedef int YYSTYPE; /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 209 "printrcy.c" - -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif +/* Line 214 of yacc.c. */ +#line 199 "printrcy.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# else +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) # define YYSTACK_ALLOC alloca -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYINCLUDED_STDLIB_H +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -254,51 +219,25 @@ typedef int YYSTYPE; # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ -# endif # else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) -# endif -# ifdef __cplusplus -extern "C" { -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifdef __cplusplus -} +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t # endif +# 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; }; @@ -308,20 +247,20 @@ 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 # define YYCOPY(To, From, Count) \ do \ { \ - YYSIZE_T yyi; \ + register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -350,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. */ @@ -371,7 +310,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 295 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -450,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, @@ -463,37 +402,37 @@ static const unsigned short int yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. 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, @@ -634,6 +573,22 @@ static const unsigned char yystos[] = 4, 3, 6, 7 }; +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -641,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. @@ -663,59 +617,26 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ + { \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ while (0) - #define YYTERROR 1 #define YYERRCODE 256 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (N) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (0) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# 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. */ #ifdef YYLEX_PARAM @@ -738,30 +659,36 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ + yysymprint (stderr, \ + Token, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) /*------------------------------------------------------------------. | 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"); @@ -791,13 +718,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", - yyrule - 1, yylno); + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + 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]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -811,7 +738,8 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -826,9 +754,13 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ +#if YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -850,7 +782,7 @@ yystrlen (yystr) const char *yystr; # endif { - const char *yys = yystr; + register const char *yys = yystr; while (*yys++ != '\0') continue; @@ -875,8 +807,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - char *yyd = yydest; - const char *yys = yysrc; + register char *yyd = yydest; + register const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -886,55 +818,7 @@ yystpcpy (yydest, yysrc) # endif # endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - size_t yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -#endif /* YYERROR_VERBOSE */ +#endif /* !YYERROR_VERBOSE */ @@ -958,15 +842,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif switch (yytype) { default: @@ -982,11 +866,10 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; +yydestruct (yytype, yyvaluep) int yytype; YYSTYPE *yyvaluep; #endif @@ -994,10 +877,6 @@ yydestruct (yymsg, yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) { @@ -1025,10 +904,10 @@ int yyparse (); -/* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1054,17 +933,17 @@ yyparse (void) #else int yyparse () - ; + #endif #endif { - int yystate; - int yyn; + register int yystate; + register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1076,14 +955,14 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - short int *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + register YYSTYPE *yyvsp; @@ -1140,14 +1019,14 @@ 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 data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), + yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1158,21 +1037,21 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; + goto yyoverflowlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyoverflowlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyexhaustedlab; + goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1204,18 +1083,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ +/* Read a lookahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1230,7 +1109,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1250,8 +1129,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1303,27 +1182,27 @@ yyreduce: case 2: #line 101 "printrcy.y" { - current_printer = stpui_plist_create((yyvsp[-1].sval), (yyvsp[0].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 3: #line 112 "printrcy.y" { - if ((yyvsp[0].sval)) - g_free((yyvsp[0].sval)); + if (yyvsp[0].sval) + g_free(yyvsp[0].sval); } break; case 4: #line 119 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_queue_name(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_queue_name(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1331,10 +1210,10 @@ yyreduce: case 5: #line 129 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_output_filename(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_output_filename(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1342,10 +1221,10 @@ yyreduce: case 6: #line 139 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_extra_printer_options(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1353,10 +1232,10 @@ yyreduce: case 7: #line 149 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_custom_command(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_custom_command(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1364,44 +1243,44 @@ yyreduce: case 8: #line 159 "printrcy.y" { - stpui_plist_set_command_type(current_printer, (yyvsp[0].ival)); + stpui_plist_set_command_type(current_printer, yyvsp[0].ival); } break; case 9: #line 165 "printrcy.y" - { current_printer->scaling = (yyvsp[0].dval); } + { current_printer->scaling = yyvsp[0].dval; } break; case 10: #line 169 "printrcy.y" - { current_printer->orientation = (yyvsp[0].ival); } + { current_printer->orientation = yyvsp[0].ival; } break; case 11: #line 173 "printrcy.y" - { current_printer->auto_size_roll_feed_paper = (yyvsp[0].ival); } + { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; } break; case 12: #line 177 "printrcy.y" - { current_printer->unit = (yyvsp[0].ival); } + { current_printer->unit = yyvsp[0].ival; } break; case 13: #line 181 "printrcy.y" - { stp_set_left(current_printer->v, (yyvsp[0].ival)); } + { stp_set_left(current_printer->v, yyvsp[0].ival); } break; case 14: #line 185 "printrcy.y" - { stp_set_top(current_printer->v, (yyvsp[0].ival)); } + { stp_set_top(current_printer->v, yyvsp[0].ival); } break; case 15: #line 189 "printrcy.y" { - switch ((yyvsp[0].ival)) + switch (yyvsp[0].ival) { case 0: stp_set_string_parameter @@ -1419,165 +1298,164 @@ yyreduce: case 16: #line 207 "printrcy.y" - { stp_set_page_width(current_printer->v, (yyvsp[0].ival)); } + { stp_set_page_width(current_printer->v, yyvsp[0].ival); } break; case 17: #line 211 "printrcy.y" - { stp_set_page_height(current_printer->v, (yyvsp[0].ival)); } + { stp_set_page_height(current_printer->v, yyvsp[0].ival); } break; case 19: #line 218 "printrcy.y" { - stp_set_int_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 20: #line 232 "printrcy.y" { - stp_set_string_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 21: #line 247 "printrcy.y" { - stp_set_file_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 22: #line 262 "printrcy.y" { - stp_set_float_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].dval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 23: #line 276 "printrcy.y" { - stp_set_dimension_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 24: #line 290 "printrcy.y" { - if (strcmp((yyvsp[0].sval), "False") == 0) - stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 0); + if (strcmp(yyvsp[0].sval, "False") == 0) + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0); else - stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 1); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 25: #line 308 "printrcy.y" { - stp_curve_t *curve = stp_curve_create_from_string((yyvsp[0].sval)); + stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval); if (curve) { - stp_set_curve_parameter(current_printer->v, (yyvsp[-3].sval), curve); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); stp_curve_destroy(curve); } - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 56: #line 353 "printrcy.y" - { stpui_printrc_current_printer = (yyvsp[0].sval); } + { stpui_printrc_current_printer = yyvsp[0].sval; } break; case 57: #line 357 "printrcy.y" { - if (strcmp((yyvsp[0].sval), "True") == 0) + if (strcmp(yyvsp[0].sval, "True") == 0) stpui_show_all_paper_sizes = 1; else stpui_show_all_paper_sizes = 0; - g_free((yyvsp[0].sval)); + g_free(yyvsp[0].sval); } break; case 61: #line 373 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_set_global_parameter((yyvsp[-1].sval), (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[0].sval); } - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-1].sval); } break; - default: break; } -/* Line 1126 of yacc.c. */ -#line 1581 "printrcy.c" +/* Line 991 of yacc.c. */ +#line 1458 "printrcy.c" yyvsp -= yylen; yyssp -= yylen; @@ -1616,153 +1494,104 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { + YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - char *yymsg = 0; -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -#if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -#endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; + char *yymsg; + 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 = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - 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) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("syntax error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yymsg; - int yyi = 0; - while ((*yyp = *yyf)) + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - { - yyerror (YY_("syntax error")); - goto yyexhaustedlab; - } + yyerror ("syntax error; also virtual memory exhausted"); } else #endif /* YYERROR_VERBOSE */ - yyerror (YY_("syntax error")); + yyerror ("syntax error"); } if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* 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) { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; + /* 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 - { - yydestruct ("Error: discarding", yytoken, &yylval); - yychar = YYEMPTY; - } + + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + } - /* Else will try to reuse look-ahead token after shifting the error + /* 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: - /* Pacify compilers like 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 (;;) @@ -1783,21 +1612,21 @@ yyerrlab1: if (yyssp == yyss) YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + yyvsp--; + yystate = *--yyssp; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; - yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) YYACCEPT; - *++yyvsp = yylval; + YYDPRINTF ((stderr, "Shifting error token, ")); + *++yyvsp = yylval; - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1818,25 +1647,16 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK; - } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); diff --git a/src/gutenprintui/printrcy.h b/src/gutenprintui/printrcy.h index a1ebec0..afa662b 100644 --- a/src/gutenprintui/printrcy.h +++ b/src/gutenprintui/printrcy.h @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -69,7 +69,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in index 0c0cecb..0d5e20e 100644 --- a/src/gutenprintui2/Makefile.in +++ b/src/gutenprintui2/Makefile.in @@ -313,10 +313,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/gutenprintui2/gutenprintui2.pc.in b/src/gutenprintui2/gutenprintui2.pc.in index 803aaae..afd0f00 100644 --- a/src/gutenprintui2/gutenprintui2.pc.in +++ b/src/gutenprintui2/gutenprintui2.pc.in @@ -7,5 +7,6 @@ Name: Gutenprint UI (GTK+-2.0 version) Description: Gutenprint Top Quality Printer Drivers - GTK+-2.0 User Interface Requires: gutenprint gtk+-2.0 Version: @VERSION@ -Libs: -L${libdir} @gutenprintui2_libs@ +Libs: -L${libdir} @GUTENPRINTUI2_LIBS@ +Libs.private: @gutenprintui2_libdeps@ Cflags: -I${includedir} @gutenprintui2_cflags@ diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c index df2fdb6..1e20809 100644 --- a/src/gutenprintui2/panel.c +++ b/src/gutenprintui2/panel.c @@ -1,5 +1,5 @@ /* - * "$Id: panel.c,v 1.7 2005/10/06 02:19:53 rlk Exp $" + * "$Id: panel.c,v 1.9 2005/12/30 20:32:07 rlk Exp $" * * Main window code for Print plug-in for the GIMP. * @@ -883,11 +883,18 @@ populate_options(const stp_vars_t *v) stp_parameter_list_destroy(params); } +static void +destroy_something(GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy(widget); +} + static void populate_option_table(GtkWidget *table, int p_class) { int i, j; int current_pos = 0; + GtkWidget *previous_sep = NULL; int counts[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; int vpos[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++) @@ -898,6 +905,8 @@ populate_option_table(GtkWidget *table, int p_class) } + gtk_container_foreach(GTK_CONTAINER(table), destroy_something, NULL); + /* First scan the options to figure out where to start */ for (i = 0; i < current_option_count; i++) { @@ -926,26 +935,29 @@ populate_option_table(GtkWidget *table, int p_class) } /* Now, figure out where we're going to put the options */ - for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++) + for (i = 0; i <= MAXIMUM_PARAMETER_LEVEL + 1; i++) { int level_count = 0; - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - level_count += counts[i][j]; + if (i <= MAXIMUM_PARAMETER_LEVEL) + for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) + level_count += counts[i][j]; if (level_count > 0 && current_pos > 0) { GtkWidget *sep = gtk_hseparator_new(); gtk_table_attach (GTK_TABLE(table), sep, 0, 4, current_pos, current_pos + 1, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0); - if (i <= MAXIMUM_PARAMETER_LEVEL) - gtk_widget_show(sep); + if (previous_sep) + gtk_widget_show(previous_sep); + previous_sep = sep; current_pos++; } - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - { - vpos[i][j] = current_pos; - current_pos += counts[i][j]; - } + if (i <= MAXIMUM_PARAMETER_LEVEL) + for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) + { + vpos[i][j] = current_pos; + current_pos += counts[i][j]; + } } for (i = 0; i < current_option_count; i++) diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c index 5cf2726..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,43 +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 - * @param yy_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()" ); @@ -1907,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()" ); @@ -1917,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 @@ -2083,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 c1f0cbe..0c96062 100644 --- a/src/gutenprintui2/printrcy.c +++ b/src/gutenprintui2/printrcy.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,9 +36,6 @@ /* Identify Bison output. */ #define YYBISON 1 -/* Bison version. */ -#define YYBISON_VERSION "2.1" - /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -96,7 +93,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 @@ -187,11 +183,6 @@ static stpui_plist_t *current_printer = NULL; # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) typedef int YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -204,48 +195,22 @@ typedef int YYSTYPE; /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 209 "printrcy.c" - -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif +/* Line 214 of yacc.c. */ +#line 199 "printrcy.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# else +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) # define YYSTACK_ALLOC alloca -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYINCLUDED_STDLIB_H +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -254,51 +219,25 @@ typedef int YYSTYPE; # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ -# endif # else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) -# endif -# ifdef __cplusplus -extern "C" { -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifdef __cplusplus -} +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t # endif +# 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; }; @@ -308,20 +247,20 @@ 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 # define YYCOPY(To, From, Count) \ do \ { \ - YYSIZE_T yyi; \ + register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -350,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. */ @@ -371,7 +310,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 295 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -450,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, @@ -463,37 +402,37 @@ static const unsigned short int yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. 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, @@ -634,6 +573,22 @@ static const unsigned char yystos[] = 4, 3, 6, 7 }; +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -641,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. @@ -663,59 +617,26 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ + { \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ while (0) - #define YYTERROR 1 #define YYERRCODE 256 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (N) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (0) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# 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. */ #ifdef YYLEX_PARAM @@ -738,30 +659,36 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ + yysymprint (stderr, \ + Token, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) /*------------------------------------------------------------------. | 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"); @@ -791,13 +718,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", - yyrule - 1, yylno); + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + 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]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -811,7 +738,8 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -826,9 +754,13 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ +#if YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -850,7 +782,7 @@ yystrlen (yystr) const char *yystr; # endif { - const char *yys = yystr; + register const char *yys = yystr; while (*yys++ != '\0') continue; @@ -875,8 +807,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - char *yyd = yydest; - const char *yys = yysrc; + register char *yyd = yydest; + register const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -886,55 +818,7 @@ yystpcpy (yydest, yysrc) # endif # endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - size_t yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -#endif /* YYERROR_VERBOSE */ +#endif /* !YYERROR_VERBOSE */ @@ -958,15 +842,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif switch (yytype) { default: @@ -982,11 +866,10 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; +yydestruct (yytype, yyvaluep) int yytype; YYSTYPE *yyvaluep; #endif @@ -994,10 +877,6 @@ yydestruct (yymsg, yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) { @@ -1025,10 +904,10 @@ int yyparse (); -/* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1054,17 +933,17 @@ yyparse (void) #else int yyparse () - ; + #endif #endif { - int yystate; - int yyn; + register int yystate; + register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1076,14 +955,14 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - short int *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + register YYSTYPE *yyvsp; @@ -1140,14 +1019,14 @@ 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 data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), + yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1158,21 +1037,21 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; + goto yyoverflowlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyoverflowlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyexhaustedlab; + goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1204,18 +1083,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ +/* Read a lookahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1230,7 +1109,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1250,8 +1129,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1303,27 +1182,27 @@ yyreduce: case 2: #line 101 "printrcy.y" { - current_printer = stpui_plist_create((yyvsp[-1].sval), (yyvsp[0].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 3: #line 112 "printrcy.y" { - if ((yyvsp[0].sval)) - g_free((yyvsp[0].sval)); + if (yyvsp[0].sval) + g_free(yyvsp[0].sval); } break; case 4: #line 119 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_queue_name(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_queue_name(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1331,10 +1210,10 @@ yyreduce: case 5: #line 129 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_output_filename(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_output_filename(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1342,10 +1221,10 @@ yyreduce: case 6: #line 139 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_extra_printer_options(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1353,10 +1232,10 @@ yyreduce: case 7: #line 149 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_plist_set_custom_command(current_printer, (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_plist_set_custom_command(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1364,44 +1243,44 @@ yyreduce: case 8: #line 159 "printrcy.y" { - stpui_plist_set_command_type(current_printer, (yyvsp[0].ival)); + stpui_plist_set_command_type(current_printer, yyvsp[0].ival); } break; case 9: #line 165 "printrcy.y" - { current_printer->scaling = (yyvsp[0].dval); } + { current_printer->scaling = yyvsp[0].dval; } break; case 10: #line 169 "printrcy.y" - { current_printer->orientation = (yyvsp[0].ival); } + { current_printer->orientation = yyvsp[0].ival; } break; case 11: #line 173 "printrcy.y" - { current_printer->auto_size_roll_feed_paper = (yyvsp[0].ival); } + { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; } break; case 12: #line 177 "printrcy.y" - { current_printer->unit = (yyvsp[0].ival); } + { current_printer->unit = yyvsp[0].ival; } break; case 13: #line 181 "printrcy.y" - { stp_set_left(current_printer->v, (yyvsp[0].ival)); } + { stp_set_left(current_printer->v, yyvsp[0].ival); } break; case 14: #line 185 "printrcy.y" - { stp_set_top(current_printer->v, (yyvsp[0].ival)); } + { stp_set_top(current_printer->v, yyvsp[0].ival); } break; case 15: #line 189 "printrcy.y" { - switch ((yyvsp[0].ival)) + switch (yyvsp[0].ival) { case 0: stp_set_string_parameter @@ -1419,165 +1298,164 @@ yyreduce: case 16: #line 207 "printrcy.y" - { stp_set_page_width(current_printer->v, (yyvsp[0].ival)); } + { stp_set_page_width(current_printer->v, yyvsp[0].ival); } break; case 17: #line 211 "printrcy.y" - { stp_set_page_height(current_printer->v, (yyvsp[0].ival)); } + { stp_set_page_height(current_printer->v, yyvsp[0].ival); } break; case 19: #line 218 "printrcy.y" { - stp_set_int_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 20: #line 232 "printrcy.y" { - stp_set_string_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 21: #line 247 "printrcy.y" { - stp_set_file_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 22: #line 262 "printrcy.y" { - stp_set_float_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].dval)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 23: #line 276 "printrcy.y" { - stp_set_dimension_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival)); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; case 24: #line 290 "printrcy.y" { - if (strcmp((yyvsp[0].sval), "False") == 0) - stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 0); + if (strcmp(yyvsp[0].sval, "False") == 0) + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0); else - stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 1); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 25: #line 308 "printrcy.y" { - stp_curve_t *curve = stp_curve_create_from_string((yyvsp[0].sval)); + stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval); if (curve) { - stp_set_curve_parameter(current_printer->v, (yyvsp[-3].sval), curve); - if (strcmp((yyvsp[-1].sval), "False") == 0) - stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval), + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); stp_curve_destroy(curve); } - g_free((yyvsp[-3].sval)); - g_free((yyvsp[-1].sval)); - g_free((yyvsp[0].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 56: #line 353 "printrcy.y" - { stpui_printrc_current_printer = (yyvsp[0].sval); } + { stpui_printrc_current_printer = yyvsp[0].sval; } break; case 57: #line 357 "printrcy.y" { - if (strcmp((yyvsp[0].sval), "True") == 0) + if (strcmp(yyvsp[0].sval, "True") == 0) stpui_show_all_paper_sizes = 1; else stpui_show_all_paper_sizes = 0; - g_free((yyvsp[0].sval)); + g_free(yyvsp[0].sval); } break; case 61: #line 373 "printrcy.y" { - if ((yyvsp[0].sval)) + if (yyvsp[0].sval) { - stpui_set_global_parameter((yyvsp[-1].sval), (yyvsp[0].sval)); - g_free((yyvsp[0].sval)); + stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[0].sval); } - g_free((yyvsp[-1].sval)); + g_free(yyvsp[-1].sval); } break; - default: break; } -/* Line 1126 of yacc.c. */ -#line 1581 "printrcy.c" +/* Line 991 of yacc.c. */ +#line 1458 "printrcy.c" yyvsp -= yylen; yyssp -= yylen; @@ -1616,153 +1494,104 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { + YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - char *yymsg = 0; -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -#if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -#endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; + char *yymsg; + 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 = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - 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) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("syntax error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yymsg; - int yyi = 0; - while ((*yyp = *yyf)) + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - { - yyerror (YY_("syntax error")); - goto yyexhaustedlab; - } + yyerror ("syntax error; also virtual memory exhausted"); } else #endif /* YYERROR_VERBOSE */ - yyerror (YY_("syntax error")); + yyerror ("syntax error"); } if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* 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) { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; + /* 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 - { - yydestruct ("Error: discarding", yytoken, &yylval); - yychar = YYEMPTY; - } + + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + } - /* Else will try to reuse look-ahead token after shifting the error + /* 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: - /* Pacify compilers like 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 (;;) @@ -1783,21 +1612,21 @@ yyerrlab1: if (yyssp == yyss) YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + yyvsp--; + yystate = *--yyssp; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; - yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) YYACCEPT; - *++yyvsp = yylval; + YYDPRINTF ((stderr, "Shifting error token, ")); + *++yyvsp = yylval; - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1818,25 +1647,16 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK; - } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); diff --git a/src/gutenprintui2/printrcy.h b/src/gutenprintui2/printrcy.h index a1ebec0..afa662b 100644 --- a/src/gutenprintui2/printrcy.h +++ b/src/gutenprintui2/printrcy.h @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -69,7 +69,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 diff --git a/src/main/Makefile.in b/src/main/Makefile.in index 7fe8e15..d4191c1 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -383,10 +383,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/main/dither-main.c b/src/main/dither-main.c index a5aadb6..62d6082 100644 --- a/src/main/dither-main.c +++ b/src/main/dither-main.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-main.c,v 1.50 2005/04/12 00:57:01 rlk Exp $" + * "$Id: dither-main.c,v 1.51 2005/12/29 04:07:46 rlk Exp $" * * Dither routine entrypoints * @@ -139,32 +139,19 @@ stp_dither_describe_parameter(const stp_vars_t *v, const char *name, else if (strcmp(name, "DitherAlgorithm") == 0) { stp_fill_parameter_settings(description, &(dither_parameters[1])); - if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) && - stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality"))) - description->is_active = 0; - else + description->bounds.str = stp_string_list_create(); + for (i = 0; i < num_dither_algos; i++) { - description->bounds.str = stp_string_list_create(); - for (i = 0; i < num_dither_algos; i++) - { - const stpi_dither_algorithm_t *dt = &dither_algos[i]; - if (dt->id != D_INVALID) - stp_string_list_add_string(description->bounds.str, - dt->name, dt->text); - } - description->deflt.str = - stp_string_list_param(description->bounds.str, 0)->name; + const stpi_dither_algorithm_t *dt = &dither_algos[i]; + if (dt->id != D_INVALID) + stp_string_list_add_string(description->bounds.str, + dt->name, dt->text); } + description->deflt.str = + stp_string_list_param(description->bounds.str, 0)->name; } else return; - if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) && - stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality"))) - description->is_active = 0; - else if (stp_check_string_parameter(v, "ImageType", STP_PARAMETER_ACTIVE) && - strcmp(stp_get_string_parameter(v, "ImageType"), "None") != 0 && - description->p_level > STP_PARAMETER_LEVEL_BASIC) - description->is_active = 0; } #define RETURN_DITHERFUNC(func, v) \ @@ -180,24 +167,37 @@ stpi_set_dither_function(stp_vars_t *v) const stpi_quality_t *quality = NULL; const char *image_type = stp_get_string_parameter(v, "ImageType"); const char *color_correction = stp_get_string_parameter(v,"ColorCorrection"); + const char *algorithm = stp_get_string_parameter(v, "DitherAlgorithm"); stpi_dither_t *d = (stpi_dither_t *) stp_get_component_data(v, "Dither"); int i; - const char *algorithm = stp_get_string_parameter(v, "DitherAlgorithm"); d->stpi_dither_type = -1; if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE)) quality = stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality")); - if (color_correction) + if (color_correction && strcmp(color_correction, "Predithered") == 0) + d->stpi_dither_type = D_PREDITHERED; + else if (algorithm && strcmp(algorithm, "None") != 0) { - if (strcmp(color_correction, "Predithered") == 0) - d->stpi_dither_type = D_PREDITHERED; - } - if (image_type && d->stpi_dither_type == -1) - { - if (strcmp(image_type, "Text") == 0) - d->stpi_dither_type = D_VERY_FAST; + for (i = 0; i < num_dither_algos; i++) + { + if (!strcmp(algorithm, _(dither_algos[i].name))) + { + d->stpi_dither_type = dither_algos[i].id; + break; + } + } + if (d->stpi_dither_type == -1) + { + d->stpi_dither_type = D_EVENTONE; + /* EvenTone performs poorly if the aspect ratio is greater than 2 */ + if ((d->stpi_dither_type & (D_EVENTONE | D_UNITONE)) && + (d->x_aspect > 2 || d->y_aspect > 2)) + d->stpi_dither_type = D_ADAPTIVE_HYBRID; + } } - if (quality && d->stpi_dither_type == -1) + else if (image_type && strcmp(image_type, "Text") == 0) + d->stpi_dither_type = D_VERY_FAST; + else if (quality) { switch (quality->quality_level) { @@ -249,25 +249,6 @@ stpi_set_dither_function(stp_vars_t *v) (d->x_aspect > 2 || d->y_aspect > 2)) d->stpi_dither_type = D_ADAPTIVE_HYBRID; } - else if (algorithm) - { - for (i = 0; i < num_dither_algos; i++) - { - if (!strcmp(algorithm, _(dither_algos[i].name))) - { - d->stpi_dither_type = dither_algos[i].id; - break; - } - } - if (d->stpi_dither_type == -1) - { - d->stpi_dither_type = D_EVENTONE; - /* EvenTone performs poorly if the aspect ratio is greater than 2 */ - if ((d->stpi_dither_type & (D_EVENTONE | D_UNITONE)) && - (d->x_aspect > 2 || d->y_aspect > 2)) - d->stpi_dither_type = D_ADAPTIVE_HYBRID; - } - } switch (d->stpi_dither_type) { case D_PREDITHERED: diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c index 15392c2..30636da 100644 --- a/src/main/escp2-channels.c +++ b/src/main/escp2-channels.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-channels.c,v 1.58 2005/10/29 21:31:19 rlk Exp $" + * "$Id: escp2-channels.c,v 1.60 2006/01/06 22:10:41 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -192,6 +192,96 @@ static hue_curve_t r800_blue_curve = "\n" }; +static hue_curve_t picturemate_cyan_curve = +{ + "CyanCurve", + "\n" + "\n" + "\n" + "\n" + /* C */ "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 " /* B */ + /* B */ "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 " /* M */ + /* M */ "0.000 0.000 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.125 0.250 0.375 0.500 0.625 0.750 0.875 " /* G */ + /* G */ "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 " /* C */ + "\n" + "\n" + "\n" +}; + +static hue_curve_t picturemate_magenta_curve = +{ + "CyanCurve", + "\n" + "\n" + "\n" + "\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.002 0.050 0.300 0.600 0.800 " /* M */ + /* M */ "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 " /* R */ + /* R */ "0.200 0.100 0.050 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 */ + "\n" + "\n" + "\n" +}; + +static hue_curve_t picturemate_yellow_curve = +{ + "CyanCurve", + "\n" + "\n" + "\n" + "\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.000 0.000 0.000 0.000 0.000 0.050 0.150 " /* R */ + /* R */ "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 " /* Y */ + /* Y */ "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 " /* G */ + /* G */ "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 " /* C */ + "\n" + "\n" + "\n" +}; + +static hue_curve_t picturemate_red_curve = +{ + "CyanCurve", + "\n" + "\n" + "\n" + "\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.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 */ + "\n" + "\n" + "\n" +}; + +static hue_curve_t picturemate_blue_curve = +{ + "CyanCurve", + "\n" + "\n" + "\n" + "\n" + /* 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 */ + "\n" + "\n" + "\n" +}; + static const physical_subchannel_t standard_black_subchannels[] = { @@ -249,6 +339,13 @@ static const physical_subchannel_t r800_cyan_subchannels[] = DECLARE_EXTENDED_INK_CHANNEL(r800_cyan); +static const physical_subchannel_t picturemate_cyan_subchannels[] = +{ + { 2, -1, 0, "CyanDensity", NULL } +}; + +DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan); + static const physical_subchannel_t cx3650_standard_cyan_subchannels[] = { { 2, -1, 2, "CyanDensity", NULL } @@ -291,6 +388,13 @@ static const physical_subchannel_t r800_magenta_subchannels[] = DECLARE_EXTENDED_INK_CHANNEL(r800_magenta); +static const physical_subchannel_t picturemate_magenta_subchannels[] = +{ + { 1, -1, 0, "MagentaDensity", NULL } +}; + +DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta); + static const physical_subchannel_t f360_standard_magenta_subchannels[] = { { 1, -1, 1, "MagentaDensity", NULL } @@ -361,6 +465,13 @@ static const physical_subchannel_t r800_yellow_subchannels[] = DECLARE_EXTENDED_INK_CHANNEL(r800_yellow); +static const physical_subchannel_t picturemate_yellow_subchannels[] = +{ + { 4, -1, 0, "YellowDensity", NULL } +}; + +DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow); + static const physical_subchannel_t r800_red_subchannels[] = { { 7, -1, 0, "RedDensity", NULL } @@ -368,6 +479,13 @@ static const physical_subchannel_t r800_red_subchannels[] = DECLARE_EXTENDED_INK_CHANNEL(r800_red); +static const physical_subchannel_t picturemate_red_subchannels[] = +{ + { 7, -1, 0, "RedDensity", NULL } +}; + +DECLARE_EXTENDED_INK_CHANNEL(picturemate_red); + static const physical_subchannel_t r800_blue_subchannels[] = { { 8, -1, 1, "BlueDensity", NULL } @@ -375,6 +493,13 @@ static const physical_subchannel_t r800_blue_subchannels[] = DECLARE_EXTENDED_INK_CHANNEL(r800_blue); +static const physical_subchannel_t picturemate_blue_subchannels[] = +{ + { 8, -1, 1, "BlueDensity", NULL } +}; + +DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue); + static const physical_subchannel_t standard_gloss_subchannels[] = { { 9, -1, 0, "GlossDensity", NULL } @@ -1506,6 +1631,21 @@ static const escp2_inkname_t six_color_r800_photo_inkset = &six_color_r800_photo_channel_set }; +static const ink_channel_t *const six_color_picturemate_channels[] = +{ + &photo_black_channel, &picturemate_cyan_channel, + &picturemate_magenta_channel, &picturemate_yellow_channel, + &picturemate_red_channel, &picturemate_blue_channel +}; + +DECLARE_CHANNEL_SET(six_color_picturemate); + +static const escp2_inkname_t six_color_picturemate_inkset = +{ + "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB, + &six_color_picturemate_channel_set +}; + static const ink_channel_t *const six_color_r800_photo_gloss_channels[] = { &f360_photo_black_channel, &f360_standard_cyan_channel, @@ -1796,6 +1936,12 @@ static const escp2_inkname_t six_color_r800_extended_inkset = &six_color_r800_channel_set }; +static const escp2_inkname_t six_color_picturemate_extended_inkset = +{ + "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED, + &six_color_picturemate_channel_set +}; + static const ink_channel_t *const f360_six_color_extended_channels[] = { &standard_black_channel, @@ -2326,6 +2472,15 @@ static const escp2_inkname_t *const cmykrb_photo_ink_types[] = DECLARE_INKLIST("cmykrbphoto", cmykrb_photo, cmykrb_photo, N_("Photo Black"), r800, r800_photo, standard); +static const escp2_inkname_t *const picturemate_photo_ink_types[] = +{ + &six_color_picturemate_inkset, + &six_color_picturemate_extended_inkset, +}; + +DECLARE_INKLIST("picturemate", picturemate, picturemate_photo, + N_("Standard"), picturemate, picturemate, standard); + #define DECLARE_INKGROUP(name) \ const inkgroup_t stpi_escp2_##name##_inkgroup = \ @@ -2473,3 +2628,10 @@ static const inklist_t *const cmykrb_group[] = }; DECLARE_INKGROUP(cmykrb); + +static const inklist_t *const picturemate_group[] = +{ + &picturemate_inklist, +}; + +DECLARE_INKGROUP(picturemate); diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c index d64ecf2..a680048 100644 --- a/src/main/escp2-driver.c +++ b/src/main/escp2-driver.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-driver.c,v 1.25 2005/04/17 23:13:59 rlk Exp $" + * "$Id: escp2-driver.c,v 1.27 2006/01/06 22:10:41 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -101,6 +101,8 @@ print_debug_params(stp_vars_t *v) print_remote_int_param(v, "Model", stp_get_model_id(v)); print_remote_int_param(v, "Ydpi", pd->res->vres); print_remote_int_param(v, "Xdpi", pd->res->hres); + print_remote_int_param(v, "Printed_ydpi", pd->res->printed_vres); + print_remote_int_param(v, "Printed_xdpi", pd->res->printed_hres); print_remote_int_param(v, "Use_softweave", pd->res->softweave); print_remote_int_param(v, "Use_printer_weave", pd->res->printer_weave); print_remote_int_param(v, "Use_printer_weave", pd->use_printer_weave); @@ -427,7 +429,7 @@ set_vertical_position(stp_vars_t *v, stp_pass_t *pass) escp2_privdata_t *pd = get_privdata(v); int advance = pass->logicalpassstart - pd->last_pass_offset - (pd->separation_rows - 1); - advance = advance * pd->vertical_units / pd->res->vres; + advance = advance * pd->vertical_units / pd->res->printed_vres; if (pass->logicalpassstart > pd->last_pass_offset || (pd->send_zero_pass_advance && pass->pass > pd->last_pass) || pd->printing_initial_vertical_offset != 0) diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c index eaffd03..6a5ee2e 100644 --- a/src/main/escp2-inks.c +++ b/src/main/escp2-inks.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-inks.c,v 1.42 2005/10/23 19:43:14 rlk Exp $" + * "$Id: escp2-inks.c,v 1.46 2006/01/07 02:43:28 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -115,6 +115,14 @@ static const escp2_dropsize_t escp2_1_5pl_2880_2880_dropsizes = static const escp2_dropsize_t escp2_1_5pl_5760_dropsizes = { "1_5pl_5760", 1, { 1.0 } }; +/* E-100/Picturemate */ +static const escp2_dropsize_t escp2_picturemate_1440_dropsizes = + { "picturemate_1440", 3, { 0.4, 0.65, 1.0 } }; +static const escp2_dropsize_t escp2_picturemate_2880_dropsizes = + { "picturemate_2880", 2, { 0.615, 1.0 } }; +static const escp2_dropsize_t escp2_picturemate_5760_dropsizes = + { "picturemate_5760", 1, { 1.0 } }; + /* Stylus Photo R300 */ static const escp2_dropsize_t escp2_r300_360_dropsizes = { "r300_360", 3, { 0.15, 0.3, 1.0 } }; @@ -131,11 +139,11 @@ static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes = static const escp2_dropsize_t escp2_r2400_360_dropsizes = { "r2400_360", 1, { 1 } }; static const escp2_dropsize_t escp2_r2400_720_dropsizes = - { "r2400_1440", 3, { 0.180, 0.44, 1 } }; + { "r2400_720", 3, { 0.180, 0.44, 1 } }; static const escp2_dropsize_t escp2_r2400_1440_dropsizes = { "r2400_1440", 3, { 0.180, 0.44, 1 } }; static const escp2_dropsize_t escp2_r2400_2880_dropsizes = - { "r2400_1440", 3, { 0.180, 0.44, 1 } }; + { "r2400_2880", 3, { 0.180, 0.44, 1 } }; static const escp2_dropsize_t escp2_r2400_2880_1440_dropsizes = { "r2400_2880_1440", 2, { 0.41, 1 } }; static const escp2_dropsize_t escp2_r2400_2880_2880_dropsizes = @@ -302,6 +310,19 @@ const escp2_drop_list_t stpi_escp2_variable_r2400_drops = &escp2_r2400_2880_2880_dropsizes, }; +const escp2_drop_list_t stpi_escp2_variable_picturemate_drops = +{ + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_1440_dropsizes, + &escp2_picturemate_2880_dropsizes, + &escp2_picturemate_5760_dropsizes, + &escp2_picturemate_5760_dropsizes, +}; + const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops = { &escp2_1_5pl_360_dropsizes, diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c index 3980be0..9796ac7 100644 --- a/src/main/escp2-papers.c +++ b/src/main/escp2-papers.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-papers.c,v 1.84 2005/10/30 00:57:40 rlk Exp $" + * "$Id: escp2-papers.c,v 1.91 2006/01/08 02:33:16 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -705,11 +705,11 @@ static const paper_adjustment_t photo3_adjustments[] = photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, { "Photo", 0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1, photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, - { "GlossyPhoto", 0.833, .75, 0.5, .25, .999, 1, .7, .8, .66, 1, 0.92, + { "GlossyPhoto", 0.75, .5, 0.3, .25, 1.05, 1, .85, .85, .66, 1, 0.92, photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, - { "Semigloss", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92, + { "Semigloss", 0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92, photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, - { "Luster", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92, + { "Luster", 0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92, photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, { "GlossyPaper", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1, photo3_hue_adj, photo3_lum_adj, photo3_sat_adj }, @@ -957,53 +957,53 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_matte); static const paper_adjustment_t r800_photo_adjustments[] = { - { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "GlossyPhoto", 0.82, 1, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92, + { "GlossyPhoto", 0.600, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Semigloss", 0.82, .8, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92, + { "Semigloss", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Luster", 0.82, .8, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92, + { "Luster", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0, + { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, }; @@ -1011,52 +1011,62 @@ DECLARE_PAPER_ADJUSTMENTS(r800_photo); static const paper_adjustment_t r800_matte_adjustments[] = { - { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .300, .6, 1, 1.0, + { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyPhoto", 0.72, 1, .5, .025, .5, .882, 1, .300, .6, 1, 0.92, + { "GlossyPhoto", 0.546, 1, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Semigloss", 0.72, .8, .5, .025, .5, .882, 1, .300, .6, 1, 0.92, + { "Semigloss", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Luster", 0.72, .8, .5, .025, .5, .882, 1, .300, .6, 1, 0.92, + { "Luster", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Other", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0, + { "Other", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, }; DECLARE_PAPER_ADJUSTMENTS(r800_matte); +static const paper_adjustment_t picturemate_adjustments[] = +{ + { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, + r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, + { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0, + r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, +}; + +DECLARE_PAPER_ADJUSTMENTS(picturemate); + static const paper_adjustment_t durabrite_adjustments[] = { { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0, @@ -1420,3 +1430,13 @@ static const paper_t r800_papers[] = }; DECLARE_PAPERS(r800); + +static const paper_t picturemate_papers[] = +{ + { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO, + 8, 0, 0x80, 0x00, 0x02, NULL, "picturematePhoto" }, + { "Other", N_("Other"), PAPER_PLAIN, + 0, 0, 0x6b, 0x1a, 0x01, NULL, "picturemateMatte" }, +}; + +DECLARE_PAPERS(picturemate); diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c index 419cf48..a60dad1 100644 --- a/src/main/escp2-resolutions.c +++ b/src/main/escp2-resolutions.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-resolutions.c,v 1.29 2005/10/23 19:43:14 rlk Exp $" + * "$Id: escp2-resolutions.c,v 1.31 2006/01/07 02:43:28 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -96,6 +96,9 @@ static const res_t r_720hq = static const res_t r_720hq2 = { "720hq2", N_("720 DPI Highest Quality"), 720, 720, 720, 720, 1, 0, 4 }; +static const res_t r_720x720oov = +{ "720x720oov", N_("720 x 720 DPI"), + 2880, 720, 720, 720, 1, 0, 1 }; static const res_t r_1440x720mw = { "1440x720mw", N_("1440 x 720 DPI"), @@ -109,6 +112,12 @@ static const res_t r_1440x720hq2 = static const res_t r_720x1440sw = { "720x1440sw", N_("1440 x 720 DPI Transposed"), 720, 1440, 720, 1440, 1, 0, 1 }; +static const res_t r_720x1440ov = +{ "720x1440ov", N_("1440 x 720 DPI Transposed"), + 1440, 1440, 720, 1440, 1, 0, 1}; +static const res_t r_1440x720ov = +{ "1440x720ov", N_("1440 x 720 DPI"), + 2880, 720, 1440, 720, 1, 0, 1 }; static const res_t r_2880x720mw = { "2880x720mw", N_("2880 x 720 DPI"), @@ -140,6 +149,10 @@ static const res_t r_1440x2880sw = { "1440x2880sw", N_("2880 x 1440 DPI Transposed"), 1440, 2880, 1440, 2880, 1, 0, 1}; +static const res_t r_5760x1440sw = +{ "5760x1440sw", N_("5760 x 1440 DPI"), + 5760, 1440, 5760, 1440, 1, 0, 1}; + static const res_t r_2880x2880mw = { "2880x2880mw", N_("2880 x 2880 DPI"), 2880, 2880, 2880, 2880, 0, 1, 1}; @@ -318,6 +331,24 @@ const res_t *const stpi_escp2_superfine_reslist[] = NULL }; +const res_t *const stpi_escp2_picturemate_reslist[] = +{ + + &r_720x720oov, + + &r_1440x720ov, + + &r_720x1440ov, + + &r_1440x1440sw, + + &r_2880x1440sw, + + &r_5760x1440sw, + + NULL +}; + const res_t *const stpi_escp2_sc500_reslist[] = { &r_360x90dpi, diff --git a/src/main/gutenprint.pc.in b/src/main/gutenprint.pc.in index 0f82a63..b7ad498 100644 --- a/src/main/gutenprint.pc.in +++ b/src/main/gutenprint.pc.in @@ -6,5 +6,6 @@ includedir=@includedir@ Name: Gutenprint Description: Gutenprint Top Quality Printer Drivers Version: @gutenprint_version@ -Libs: -L${libdir} @gutenprint_libs@ +Libs: -L${libdir} @GUTENPRINT_LIBS@ +Libs.private: @gutenprint_libdeps@ Cflags: -I${includedir} @gutenprint_cflags@ diff --git a/src/main/papers.xml b/src/main/papers.xml index b45ce57..44db989 100644 --- a/src/main/papers.xml +++ b/src/main/papers.xml @@ -4,7 +4,7 @@ XML description of papers known to libgutenprint. It should be edited by hand. - "$Id: papers.xml,v 1.18 2005/03/29 00:23:43 rlk Exp $" + "$Id: papers.xml,v 1.19 2005/12/31 17:22:32 rlk Exp $" --> 1.0 - 0.470 + 0.96 + 1.02 + 1.02 + 0.500 1.0 - 0.470 + 0.96 + 1.02 + 1.02 + 0.500 1.0 + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + + 0.470 1.0 - + 0.470 1.0 - + 0.470 1.0 - + 0.470 1.0 + + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + 0.96 1.02 @@ -736,6 +756,13 @@ 0.500 1.0 + + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + 0.96 1.02 @@ -785,6 +812,13 @@ 0.500 1.0 + + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + 0.96 1.02 @@ -856,11 +890,11 @@ 0.470 1.0 - + 0.470 1.0 - + 0.470 1.0 @@ -871,10 +905,25 @@ 0.500 1.0 + + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + 0.470 1.0 + + 0.470 + 1.0 + + + 0.470 + 1.0 + 0.95 0.9 @@ -893,6 +942,10 @@ 0.470 1.0 + + 0.470 + 1.0 + 0.470 1.0 @@ -1052,6 +1105,10 @@ 0.470 1.0 + + 0.470 + 1.0 + 0.470 1.0 @@ -1080,6 +1137,13 @@ 0.470 1.0 + + 0.96 + 1.02 + 1.02 + 0.500 + 1.0 + 0.470 1.0 @@ -1100,6 +1164,10 @@ 0.470 1.0 + + 0.470 + 1.0 + 0.470 1.0 diff --git a/src/main/util.h b/src/main/util.h index 5b3e01b..701a8eb 100644 --- a/src/main/util.h +++ b/src/main/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h,v 1.32 2004/09/17 18:38:27 rleigh Exp $" + * "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $" * * Gutenprint header. * @@ -42,12 +42,6 @@ extern "C" { #endif -#ifndef __GNUC__ -#ifndef __attribute__ -#define __attribute__(ignore) -#endif -#endif - /** * Utility functions (internal). * @@ -73,5 +67,5 @@ extern void stpi_init_printer(void); #endif /* GUTENPRINT_INTERNAL_UTIL_H */ /* - * End of "$Id: util.h,v 1.32 2004/09/17 18:38:27 rleigh Exp $". + * End of "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $". */ diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in index c34aede..0a5dbd8 100644 --- a/src/testpattern/Makefile.in +++ b/src/testpattern/Makefile.in @@ -311,10 +311,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern index eea5754..360c81a 100755 --- a/src/testpattern/run-testpattern +++ b/src/testpattern/run-testpattern @@ -126,6 +126,7 @@ run_testpattern() { if [ $? -ne 0 ] ; then retval=1 fi + exit $retval } set_args `getopt hgvp:nc "$@"` @@ -161,7 +162,7 @@ print_all_testpatterns() { } if [ -z "$dontrun" ] ; then - print_all_testpatterns | run_testpattern + print_all_testpatterns | run_testpattern 2>&1 else print_all_testpatterns fi diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1 index ee3af8c..466a476 100755 --- a/src/testpattern/run-testpattern-1 +++ b/src/testpattern/run-testpattern-1 @@ -1,6 +1,6 @@ #!/bin/sh -retval=0; +retval=0 if [ -z "$STP_DATA_PATH" ] ; then STP_DATA_PATH=`pwd`/../main @@ -218,6 +218,7 @@ run_testpattern() { if [ $? -ne 0 ] ; then retval=1 fi + exit $retval } set_args `getopt hgvp:nco "$@"` @@ -278,9 +279,9 @@ print_all_testpatterns() { } if [ -z "$dontrun" ] ; then - (print_all_testpatterns | run_testpattern) + print_all_testpatterns | run_testpattern 2>&1 else - (print_all_testpatterns) + print_all_testpatterns fi exit $? diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c index 2ebb6df..1585303 100644 --- a/src/testpattern/testpattern.c +++ b/src/testpattern/testpattern.c @@ -1,5 +1,5 @@ /* - * "$Id: testpattern.c,v 1.42 2004/06/08 02:51:42 rlk Exp $" + * "$Id: testpattern.c,v 1.43 2006/01/15 22:00:57 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -269,8 +269,11 @@ do_print(void) stp_set_string_parameter(v, "InputImageType", global_image_type); sprintf(tmp, "%d", global_bit_depth); stp_set_string_parameter(v, "ChannelBitDepth", tmp); - sprintf(tmp, "%d", global_channel_depth); - stp_set_string_parameter(v, "RawChannels", tmp); + if (strcmp(global_image_type, "Raw") == 0) + { + sprintf(tmp, "%d", global_channel_depth); + stp_set_string_parameter(v, "RawChannels", tmp); + } stp_set_float_parameter(v, "Density", global_density); stp_set_string_parameter(v, "Quality", "None"); stp_set_string_parameter(v, "ImageType", "None"); @@ -330,6 +333,7 @@ main(int argc, char **argv) { int c; int status; + int global_status = 0; while (1) { c = getopt(argc, argv, "n"); @@ -348,10 +352,12 @@ main(int argc, char **argv) while (1) { status = do_print(); - if (status != 0) + if (status == 1) break; + else if (status != 0) + global_status = 1; } - return status - 1; + return global_status; } static void diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c index cb68f00..ad2e0c6 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.17 2005/07/28 00:58:45 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 +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; - } +#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,43 +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 - * @param yy_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()" ); @@ -1941,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()" ); @@ -1951,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 @@ -2117,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 cd1c6d3..ede6285 100644 --- a/src/testpattern/testpatterny.c +++ b/src/testpattern/testpatterny.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,9 +36,6 @@ /* Identify Bison output. */ #define YYBISON 1 -/* Bison version. */ -#define YYBISON_VERSION "2.1" - /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -102,7 +99,6 @@ END = 301 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tSTRING 260 @@ -232,11 +228,6 @@ find_color(const char *name) # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) typedef int YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -249,48 +240,22 @@ typedef int YYSTYPE; /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 254 "testpatterny.c" - -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif +/* Line 214 of yacc.c. */ +#line 244 "testpatterny.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# else +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) # define YYSTACK_ALLOC alloca -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYINCLUDED_STDLIB_H +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -299,51 +264,25 @@ typedef int YYSTYPE; # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ -# endif # else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) -# endif -# ifdef __cplusplus -extern "C" { -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifdef __cplusplus -} +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t # endif +# 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; }; @@ -353,20 +292,20 @@ 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 # define YYCOPY(To, From, Count) \ do \ { \ - YYSIZE_T yyi; \ + register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -395,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. */ @@ -416,7 +355,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 301 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -458,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, @@ -511,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, @@ -528,38 +467,38 @@ static const unsigned short int yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. 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, @@ -628,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, @@ -642,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, @@ -664,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, @@ -739,6 +678,22 @@ static const unsigned char yystos[] = 4, 4, 4, 4, 79, 4, 4, 4, 4, 4 }; +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -746,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. @@ -768,59 +722,26 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ + { \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ while (0) - #define YYTERROR 1 #define YYERRCODE 256 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (N) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (0) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# 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. */ #ifdef YYLEX_PARAM @@ -843,30 +764,36 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ + yysymprint (stderr, \ + Token, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) /*------------------------------------------------------------------. | 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"); @@ -896,13 +823,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", - yyrule - 1, yylno); + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + 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]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -916,7 +843,8 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -931,9 +859,13 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ +#if YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -955,7 +887,7 @@ yystrlen (yystr) const char *yystr; # endif { - const char *yys = yystr; + register const char *yys = yystr; while (*yys++ != '\0') continue; @@ -980,8 +912,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - char *yyd = yydest; - const char *yys = yysrc; + register char *yyd = yydest; + register const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -991,55 +923,7 @@ yystpcpy (yydest, yysrc) # endif # endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - size_t yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -#endif /* YYERROR_VERBOSE */ +#endif /* !YYERROR_VERBOSE */ @@ -1063,15 +947,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif switch (yytype) { default: @@ -1087,11 +971,10 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; +yydestruct (yytype, yyvaluep) int yytype; YYSTYPE *yyvaluep; #endif @@ -1099,10 +982,6 @@ yydestruct (yymsg, yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) { @@ -1130,10 +1009,10 @@ int yyparse (); -/* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1159,17 +1038,17 @@ yyparse (void) #else int yyparse () - ; + #endif #endif { - int yystate; - int yyn; + register int yystate; + register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1181,14 +1060,14 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - short int *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + register YYSTYPE *yyvsp; @@ -1245,14 +1124,14 @@ 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 data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), + yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1263,21 +1142,21 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; + goto yyoverflowlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyoverflowlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyexhaustedlab; + goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1309,18 +1188,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ +/* Read a lookahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1335,7 +1214,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1355,8 +1234,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1409,12 +1288,12 @@ yyreduce: #line 144 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>cmykspec %d\n", yyvsp[0].ival); global_image_type = "CMYK"; global_channel_depth = 4; global_invert_data = 0; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1422,12 +1301,12 @@ yyreduce: #line 156 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>kcmyspec %d\n", yyvsp[0].ival); global_image_type = "KCMY"; global_channel_depth = 4; global_invert_data = 0; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1435,12 +1314,12 @@ yyreduce: #line 168 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>rgbspec %d\n", yyvsp[0].ival); global_image_type = "RGB"; global_channel_depth = 3; global_invert_data = 1; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1448,12 +1327,12 @@ yyreduce: #line 180 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>cmyspec %d\n", yyvsp[0].ival); global_image_type = "CMY"; global_channel_depth = 3; global_invert_data = 0; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1461,12 +1340,12 @@ yyreduce: #line 192 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>grayspec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>grayspec %d\n", yyvsp[0].ival); global_image_type = "Grayscale"; global_channel_depth = 1; global_invert_data = 0; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1474,12 +1353,12 @@ yyreduce: #line 204 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>whitespec %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>whitespec %d\n", yyvsp[0].ival); global_image_type = "Whitescale"; global_channel_depth = 1; global_invert_data = 1; - if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; @@ -1487,23 +1366,23 @@ yyreduce: #line 216 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[-1].ival)); + fprintf(stderr, ">>>extendedspec %d\n", yyvsp[-1].ival); global_image_type = "Raw"; global_invert_data = 0; - global_channel_depth = (yyvsp[-1].ival); - if ((yyvsp[-1].ival) == 8 || (yyvsp[-1].ival) == 16) - global_bit_depth = (yyvsp[0].ival); + global_channel_depth = yyvsp[-1].ival; + if (yyvsp[-1].ival == 8 || yyvsp[-1].ival == 16) + global_bit_depth = yyvsp[0].ival; } break; case 25: #line 234 "testpatterny.y" { - int channel = find_color((yyvsp[-1]).sval); + int channel = find_color(yyvsp[-1].sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>level %s %f\n", (yyvsp[-1]).sval, (yyvsp[0].dval)); + fprintf(stderr, ">>>level %s %f\n", yyvsp[-1].sval, yyvsp[0].dval); if (channel >= 0) - global_levels[channel] = (yyvsp[0].dval); + global_levels[channel] = yyvsp[0].dval; } break; @@ -1511,20 +1390,20 @@ yyreduce: #line 244 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[-1].ival), (yyvsp[0].dval)); - if ((yyvsp[-1].ival) >= 0 && (yyvsp[-1].ival) <= STP_CHANNEL_LIMIT) - global_levels[(yyvsp[-1].ival)] = (yyvsp[0].dval); + fprintf(stderr, ">>>channel_level %d %f\n", yyvsp[-1].ival, yyvsp[0].dval); + if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT) + global_levels[yyvsp[-1].ival] = yyvsp[0].dval; } break; case 27: #line 253 "testpatterny.y" { - int channel = find_color((yyvsp[-1]).sval); + int channel = find_color(yyvsp[-1].sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[-1]).sval, (yyvsp[0].dval)); + fprintf(stderr, ">>>gamma %s %f\n", yyvsp[-1].sval, yyvsp[0].dval); if (channel >= 0) - global_gammas[channel] = (yyvsp[0].dval); + global_gammas[channel] = yyvsp[0].dval; } break; @@ -1532,9 +1411,9 @@ yyreduce: #line 263 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[-1].ival), (yyvsp[0].dval)); - if ((yyvsp[-1].ival) >= 0 && (yyvsp[-1].ival) <= STP_CHANNEL_LIMIT) - global_gammas[(yyvsp[-1].ival)] = (yyvsp[0].dval); + fprintf(stderr, ">>>channel_gamma %d %f\n", yyvsp[-1].ival, yyvsp[0].dval); + if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT) + global_gammas[yyvsp[-1].ival] = yyvsp[0].dval; } break; @@ -1542,8 +1421,8 @@ yyreduce: #line 272 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[0].dval)); - global_gamma = (yyvsp[0].dval); + fprintf(stderr, ">>>global_gamma %f\n", yyvsp[0].dval); + global_gamma = yyvsp[0].dval; } break; @@ -1551,8 +1430,8 @@ yyreduce: #line 279 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>steps %d\n", (yyvsp[0].ival)); - global_steps = (yyvsp[0].ival); + fprintf(stderr, ">>>steps %d\n", yyvsp[0].ival); + global_steps = yyvsp[0].ival; } break; @@ -1560,8 +1439,8 @@ yyreduce: #line 286 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[0].dval)); - global_ink_limit = (yyvsp[0].dval); + fprintf(stderr, ">>>ink_limit %f\n", yyvsp[0].dval); + global_ink_limit = yyvsp[0].dval; } break; @@ -1569,9 +1448,9 @@ yyreduce: #line 293 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>printer %s\n", (yyvsp[0].sval)); - global_printer = strdup((yyvsp[0].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, ">>>printer %s\n", yyvsp[0].sval); + global_printer = strdup(yyvsp[0].sval); + free(yyvsp[0].sval); } break; @@ -1579,9 +1458,9 @@ yyreduce: #line 302 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[0].sval)); - stp_set_string_parameter(global_vars, "PageSize", (yyvsp[0].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, ">>>page_size_name %s\n", yyvsp[0].sval); + stp_set_string_parameter(global_vars, "PageSize", yyvsp[0].sval); + free(yyvsp[0].sval); } break; @@ -1589,9 +1468,9 @@ yyreduce: #line 311 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[-1].ival), (yyvsp[0].ival)); - stp_set_page_width(global_vars, (yyvsp[-1].ival)); - stp_set_page_height(global_vars, (yyvsp[0].ival)); + fprintf(stderr, ">>>page_size_custom %d %d\n", yyvsp[-1].ival, yyvsp[0].ival); + stp_set_page_width(global_vars, yyvsp[-1].ival); + stp_set_page_height(global_vars, yyvsp[0].ival); } break; @@ -1599,10 +1478,10 @@ yyreduce: #line 323 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[-1].sval), (yyvsp[0].sval)); - stp_set_string_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].sval)); - free((yyvsp[-1].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, ">>>parameter_string %s %s\n", yyvsp[-1].sval, yyvsp[0].sval); + stp_set_string_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].sval); + free(yyvsp[-1].sval); + free(yyvsp[0].sval); } break; @@ -1610,9 +1489,9 @@ yyreduce: #line 333 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[-1].sval), (yyvsp[0].ival)); - stp_set_int_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].ival)); - free((yyvsp[-1].sval)); + fprintf(stderr, ">>>parameter_int %s %d\n", yyvsp[-1].sval, yyvsp[0].ival); + stp_set_int_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].ival); + free(yyvsp[-1].sval); } break; @@ -1620,9 +1499,9 @@ yyreduce: #line 342 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[-1].sval), (yyvsp[0].dval)); - stp_set_float_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].dval)); - free((yyvsp[-1].sval)); + fprintf(stderr, ">>>parameter_float %s %f\n", yyvsp[-1].sval, yyvsp[0].dval); + stp_set_float_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].dval); + free(yyvsp[-1].sval); } break; @@ -1630,8 +1509,8 @@ yyreduce: #line 367 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>density %f\n", (yyvsp[0].dval)); - global_density = (yyvsp[0].dval); + fprintf(stderr, ">>>density %f\n", yyvsp[0].dval); + global_density = yyvsp[0].dval; } break; @@ -1639,8 +1518,8 @@ yyreduce: #line 374 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>top %f\n", (yyvsp[0].dval)); - global_xtop = (yyvsp[0].dval); + fprintf(stderr, ">>>top %f\n", yyvsp[0].dval); + global_xtop = yyvsp[0].dval; } break; @@ -1648,8 +1527,8 @@ yyreduce: #line 381 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>left %f\n", (yyvsp[0].dval)); - global_xleft = (yyvsp[0].dval); + fprintf(stderr, ">>>left %f\n", yyvsp[0].dval); + global_xleft = yyvsp[0].dval; } break; @@ -1657,8 +1536,8 @@ yyreduce: #line 388 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>hsize %f\n", (yyvsp[0].dval)); - global_hsize = (yyvsp[0].dval); + fprintf(stderr, ">>>hsize %f\n", yyvsp[0].dval); + global_hsize = yyvsp[0].dval; } break; @@ -1666,8 +1545,8 @@ yyreduce: #line 395 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>vsize %f\n", (yyvsp[0].dval)); - global_vsize = (yyvsp[0].dval); + fprintf(stderr, ">>>vsize %f\n", yyvsp[0].dval); + global_vsize = yyvsp[0].dval; } break; @@ -1675,8 +1554,8 @@ yyreduce: #line 402 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>blackline %d\n", (yyvsp[0].ival)); - global_noblackline = !((yyvsp[0].ival)); + fprintf(stderr, ">>>blackline %d\n", yyvsp[0].ival); + global_noblackline = !(yyvsp[0].ival); } break; @@ -1684,13 +1563,13 @@ yyreduce: #line 410 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval), + fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval, current_index); if (current_index < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[current_index] = (yyvsp[-2].dval); - current_testpattern->d.p.vals[current_index] = (yyvsp[-1].dval); - current_testpattern->d.p.gammas[current_index] = (yyvsp[0].dval); + current_testpattern->d.p.mins[current_index] = yyvsp[-2].dval; + current_testpattern->d.p.vals[current_index] = yyvsp[-1].dval; + current_testpattern->d.p.gammas[current_index] = yyvsp[0].dval; current_index++; } } @@ -1699,14 +1578,14 @@ yyreduce: case 55: #line 434 "testpatterny.y" { - int channel = find_color((yyvsp[-3]).sval); + int channel = find_color(yyvsp[-3].sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[-3]).sval, (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval)); + fprintf(stderr, ">>>color_block2a %s %f %f %f\n", yyvsp[-3].sval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval); if (channel >= 0 && channel < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[channel] = (yyvsp[-2].dval); - current_testpattern->d.p.vals[channel] = (yyvsp[-1].dval); - current_testpattern->d.p.gammas[channel] = (yyvsp[0].dval); + current_testpattern->d.p.mins[channel] = yyvsp[-2].dval; + current_testpattern->d.p.vals[channel] = yyvsp[-1].dval; + current_testpattern->d.p.gammas[channel] = yyvsp[0].dval; } } break; @@ -1715,12 +1594,12 @@ yyreduce: #line 448 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[-3].ival), (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval)); - if ((yyvsp[-3].ival) >= 0 && (yyvsp[-3].ival) < STP_CHANNEL_LIMIT) + fprintf(stderr, ">>>color_block2b %d %f %f %f\n", yyvsp[-3].ival, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval); + if (yyvsp[-3].ival >= 0 && yyvsp[-3].ival < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[(yyvsp[-3].ival)] = (yyvsp[-2].dval); - current_testpattern->d.p.vals[(yyvsp[-3].ival)] = (yyvsp[-1].dval); - current_testpattern->d.p.gammas[(yyvsp[-3].ival)] = (yyvsp[0].dval); + current_testpattern->d.p.mins[yyvsp[-3].ival] = yyvsp[-2].dval; + current_testpattern->d.p.vals[yyvsp[-3].ival] = yyvsp[-1].dval; + current_testpattern->d.p.gammas[yyvsp[-3].ival] = yyvsp[0].dval; } } break; @@ -1729,13 +1608,13 @@ yyreduce: #line 473 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[-4].dval), (yyvsp[-3].dval), (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval)); + fprintf(stderr, ">>>patvars %f %f %f %f %f\n", yyvsp[-4].dval, yyvsp[-3].dval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval); current_testpattern->t = E_PATTERN; - current_testpattern->d.p.lower = (yyvsp[-4].dval); - current_testpattern->d.p.upper = (yyvsp[-3].dval); - current_testpattern->d.p.levels[1] = (yyvsp[-2].dval); - current_testpattern->d.p.levels[2] = (yyvsp[-1].dval); - current_testpattern->d.p.levels[3] = (yyvsp[0].dval); + current_testpattern->d.p.lower = yyvsp[-4].dval; + current_testpattern->d.p.upper = yyvsp[-3].dval; + current_testpattern->d.p.levels[1] = yyvsp[-2].dval; + current_testpattern->d.p.levels[2] = yyvsp[-1].dval; + current_testpattern->d.p.levels[3] = yyvsp[0].dval; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -1761,9 +1640,9 @@ yyreduce: #line 506 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>grid %d\n", (yyvsp[0].ival)); + fprintf(stderr, ">>>grid %d\n", yyvsp[0].ival); current_testpattern->t = E_GRID; - current_testpattern->d.g.ticks = (yyvsp[0].ival); + current_testpattern->d.g.ticks = yyvsp[0].ival; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -1773,10 +1652,10 @@ yyreduce: #line 517 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>image %d %d\n", (yyvsp[-1].ival), (yyvsp[0].ival)); + fprintf(stderr, ">>>image %d %d\n", yyvsp[-1].ival, yyvsp[0].ival); current_testpattern->t = E_IMAGE; - current_testpattern->d.i.x = (yyvsp[-1].ival); - current_testpattern->d.i.y = (yyvsp[0].ival); + current_testpattern->d.i.x = yyvsp[-1].ival; + current_testpattern->d.i.y = yyvsp[0].ival; if (current_testpattern->d.i.x <= 0 || current_testpattern->d.i.y <= 0) { @@ -1790,50 +1669,50 @@ yyreduce: case 70: #line 534 "testpatterny.y" { - fprintf(stderr, (yyvsp[0].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, yyvsp[0].sval); + free(yyvsp[0].sval); } break; case 71: #line 540 "testpatterny.y" { - fprintf(stderr, (yyvsp[-1].sval), (yyvsp[0].sval)); - free((yyvsp[-1].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, yyvsp[-1].sval, yyvsp[0].sval); + free(yyvsp[-1].sval); + free(yyvsp[0].sval); } break; case 72: #line 547 "testpatterny.y" { - fprintf(stderr, (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval)); - free((yyvsp[-2].sval)); - free((yyvsp[-1].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval); + free(yyvsp[-2].sval); + free(yyvsp[-1].sval); + free(yyvsp[0].sval); } break; case 73: #line 555 "testpatterny.y" { - fprintf(stderr, (yyvsp[-3].sval), (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval)); - free((yyvsp[-3].sval)); - free((yyvsp[-2].sval)); - free((yyvsp[-1].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval); + free(yyvsp[-3].sval); + free(yyvsp[-2].sval); + free(yyvsp[-1].sval); + free(yyvsp[0].sval); } break; case 74: #line 564 "testpatterny.y" { - fprintf(stderr, (yyvsp[-4].sval), (yyvsp[-3].sval), (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval)); - free((yyvsp[-4].sval)); - free((yyvsp[-3].sval)); - free((yyvsp[-2].sval)); - free((yyvsp[-1].sval)); - free((yyvsp[0].sval)); + fprintf(stderr, yyvsp[-4].sval, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval); + free(yyvsp[-4].sval); + free(yyvsp[-3].sval); + free(yyvsp[-2].sval); + free(yyvsp[-1].sval); + free(yyvsp[0].sval); } break; @@ -1865,11 +1744,10 @@ yyreduce: break; - default: break; } -/* Line 1126 of yacc.c. */ -#line 1873 "testpatterny.c" +/* Line 991 of yacc.c. */ +#line 1750 "testpatterny.c" yyvsp -= yylen; yyssp -= yylen; @@ -1908,153 +1786,104 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { + YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - char *yymsg = 0; -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -#if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -#endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; + char *yymsg; + 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 = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - 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) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("syntax error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yymsg; - int yyi = 0; - while ((*yyp = *yyf)) + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - { - yyerror (YY_("syntax error")); - goto yyexhaustedlab; - } + yyerror ("syntax error; also virtual memory exhausted"); } else #endif /* YYERROR_VERBOSE */ - yyerror (YY_("syntax error")); + yyerror ("syntax error"); } if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* 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) { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; + /* 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 - { - yydestruct ("Error: discarding", yytoken, &yylval); - yychar = YYEMPTY; - } + + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + } - /* Else will try to reuse look-ahead token after shifting the error + /* 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: - /* Pacify compilers like 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 (;;) @@ -2075,21 +1904,21 @@ yyerrlab1: if (yyssp == yyss) YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + yyvsp--; + yystate = *--yyssp; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; - yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) YYACCEPT; - *++yyvsp = yylval; + YYDPRINTF ((stderr, "Shifting error token, ")); + *++yyvsp = yylval; - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -2110,25 +1939,16 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK; - } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h index 3b0a9f4..2567b82 100644 --- a/src/testpattern/testpatterny.h +++ b/src/testpattern/testpatterny.h @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* 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, 2005 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 @@ -15,8 +15,8 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -75,7 +75,6 @@ END = 301 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tSTRING 260 diff --git a/test/Makefile.in b/test/Makefile.in index 7648c96..31a2f89 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -314,10 +314,13 @@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ gutenprint_cflags = @gutenprint_cflags@ +gutenprint_libdeps = @gutenprint_libdeps@ gutenprint_libs = @gutenprint_libs@ gutenprintui2_cflags = @gutenprintui2_cflags@ +gutenprintui2_libdeps = @gutenprintui2_libdeps@ gutenprintui2_libs = @gutenprintui2_libs@ gutenprintui_cflags = @gutenprintui_cflags@ +gutenprintui_libdeps = @gutenprintui_libdeps@ gutenprintui_libs = @gutenprintui_libs@ host = @host@ host_alias = @host_alias@ -- cgit v1.2.3