summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2006-01-10 21:58:08 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:22 +0000
commita1871913efc67d71e7b355a8a03655cbf12ab07f (patch)
treecfe538674b55d1d0325e83bbbe1a2703bd2262b9 /doc
parentab2ece358cc58b7a7d1671a72d62c2cafe8811bb (diff)
parent7fad909266d49203537a28e6acc5d96b14bf4e7f (diff)
Imported Debian patch 0.99-1debian/0.99-1
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.in32
-rw-r--r--doc/sane-xsane-advanced-doc.html17
-rw-r--r--doc/sane-xsane-batch-scan-doc.html17
-rw-r--r--doc/sane-xsane-color-correction-doc.html19
-rw-r--r--doc/sane-xsane-copy-doc.html51
-rw-r--r--doc/sane-xsane-doc.html52
-rw-r--r--doc/sane-xsane-email-doc.html (renamed from doc/sane-xsane-mail-doc.html)84
-rw-r--r--doc/sane-xsane-empty-doc.html11
-rw-r--r--doc/sane-xsane-fax-doc.html70
-rw-r--r--doc/sane-xsane-gimp-doc.html55
-rw-r--r--doc/sane-xsane-guide-doc.html157
-rw-r--r--doc/sane-xsane-histogram-doc.html11
-rw-r--r--doc/sane-xsane-medium-definition-doc.html17
-rw-r--r--doc/sane-xsane-multipage-doc.html190
-rw-r--r--doc/sane-xsane-preview-doc.html17
-rw-r--r--doc/sane-xsane-save-doc.html77
-rw-r--r--doc/sane-xsane-scan-options-doc.html200
-rw-r--r--doc/sane-xsane-setup-copy-doc.html31
-rw-r--r--doc/sane-xsane-setup-display-doc.html29
-rw-r--r--doc/sane-xsane-setup-email-doc.html (renamed from doc/sane-xsane-setup-mail-doc.html)72
-rw-r--r--doc/sane-xsane-setup-enhancement-doc.html30
-rw-r--r--doc/sane-xsane-setup-fax-doc.html31
-rw-r--r--doc/sane-xsane-setup-filetype-doc.html (renamed from doc/sane-xsane-setup-image-doc.html)65
-rw-r--r--doc/sane-xsane-setup-save-doc.html37
-rw-r--r--doc/sane-xsane-standard-doc.html17
-rw-r--r--doc/sane-xsane-viewer-doc.html63
-rw-r--r--doc/xsane-adf-pages.jpgbin0 -> 1146 bytes
-rw-r--r--doc/xsane-color-correction.jpgbin0 -> 50687 bytes
-rw-r--r--doc/xsane-copy-number.jpgbin0 -> 947 bytes
-rw-r--r--doc/xsane-copy.jpgbin31627 -> 32105 bytes
-rw-r--r--doc/xsane-email-project.jpgbin0 -> 32280 bytes
-rw-r--r--doc/xsane-email.jpgbin0 -> 29906 bytes
-rw-r--r--doc/xsane-fax-project.jpgbin21489 -> 23336 bytes
-rw-r--r--doc/xsane-fax.jpgbin27505 -> 28055 bytes
-rw-r--r--doc/xsane-gimp.jpgbin44794 -> 43028 bytes
-rw-r--r--doc/xsane-guide-1-decoration.jpgbin0 -> 3193 bytes
-rw-r--r--doc/xsane-guide-10-scan.jpgbin0 -> 6009 bytes
-rw-r--r--doc/xsane-guide-2-menu.jpgbin0 -> 2558 bytes
-rw-r--r--doc/xsane-guide-3-options.jpgbin0 -> 1392 bytes
-rw-r--r--doc/xsane-guide-4.jpgbin0 -> 2329 bytes
-rw-r--r--doc/xsane-guide-4a-adf-pages.jpgbin0 -> 1188 bytes
-rw-r--r--doc/xsane-guide-4b-xsane-mode.jpgbin0 -> 1491 bytes
-rw-r--r--doc/xsane-guide-5-saving-options.jpgbin0 -> 4334 bytes
-rw-r--r--doc/xsane-guide-6-scan-options.jpgbin0 -> 3085 bytes
-rw-r--r--doc/xsane-guide-7-medium-selection.jpgbin0 -> 2190 bytes
-rw-r--r--doc/xsane-guide-8-resolution.jpgbin0 -> 2292 bytes
-rw-r--r--doc/xsane-guide-9-color-correction.jpgbin0 -> 9367 bytes
-rw-r--r--doc/xsane-mail-project.jpgbin33308 -> 0 bytes
-rw-r--r--doc/xsane-mail.jpgbin29070 -> 0 bytes
-rw-r--r--doc/xsane-multipage-project.jpgbin0 -> 21451 bytes
-rw-r--r--doc/xsane-multipage.jpgbin0 -> 30051 bytes
-rw-r--r--doc/xsane-save.jpgbin49624 -> 33879 bytes
-rw-r--r--doc/xsane-setup-copy.jpgbin42914 -> 47557 bytes
-rw-r--r--doc/xsane-setup-display.jpgbin36119 -> 36430 bytes
-rw-r--r--doc/xsane-setup-email.jpgbin0 -> 34748 bytes
-rw-r--r--doc/xsane-setup-enhancement.jpgbin39750 -> 36740 bytes
-rw-r--r--doc/xsane-setup-fax.jpgbin36986 -> 40439 bytes
-rw-r--r--doc/xsane-setup-filetype.jpgbin0 -> 44064 bytes
-rw-r--r--doc/xsane-setup-image.jpgbin37103 -> 0 bytes
-rw-r--r--doc/xsane-setup-mail.jpgbin35723 -> 0 bytes
-rw-r--r--doc/xsane-setup-ocr.jpgbin28786 -> 28882 bytes
-rw-r--r--doc/xsane-setup-save.jpgbin34550 -> 34461 bytes
-rw-r--r--doc/xsane-step.jpgbin0 -> 1037 bytes
-rw-r--r--doc/xsane-target.jpgbin0 -> 685 bytes
-rw-r--r--doc/xsane-viewer.jpgbin29127 -> 33953 bytes
65 files changed, 975 insertions, 477 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6913cd2..59b022b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -23,7 +23,7 @@ configdir = ${sysconfdir}/sane.d
sanedatadir = ${datadir}/sane
xsanedocdir = ${datadir}/sane/xsane/doc
-MKDIR = $(top_srcdir)/mkinstalldirs
+MKINSTALLDIRS = @MKINSTALLDIRS@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -49,38 +49,38 @@ all: $(MANPAGES)
-e 's|@SBINDIR@|$(sbindir)|g' $^ >$@
install: $(MANPAGES)
- $(MKDIR) $(mandir)/man1
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@for page in $(SECT1); do \
- echo installing $${page} in $(mandir)/man1/$${page}...; \
- $(INSTALL_DATA) $${page} $(mandir)/man1/$${page} || exit 1; \
+ echo installing $${page} in $(DESTDIR)$(mandir)/man1/$${page}...; \
+ $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
done
- $(MKDIR) $(datadir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir)
- $(MKDIR) $(xsanedocdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(xsanedocdir)
@for page in *.html; do\
- echo installing $${page} in $(xsanedocdir)/$${page}...; \
- $(INSTALL_DATA) $${page} $(xsanedocdir)/$${page} || exit 1; \
+ echo installing $${page} in $(DESTDIR)$(xsanedocdir)/$${page}...; \
+ $(INSTALL_DATA) $${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
done
@for image in *.jpg; do\
- echo installing $${image} in $(xsanedocdir)/$${image}...; \
- $(INSTALL_DATA) $${image} $(xsanedocdir)/$${image} || exit 1; \
+ echo installing $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
+ $(INSTALL_DATA) $${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
done
uninstall:
@for page in $(SECT1); do \
- echo uninstalling $(mandir)/man1/$${page}...; \
- rm -f $(mandir)/man1/$${page} || exit 1; \
+ echo uninstalling $(DESTDIR)$(mandir)/man1/$${page}...; \
+ rm -f $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
done
@for page in *.html; do\
- echo uninstalling $(xsanedocdir)/$${page}...; \
- rm -f $(xsanedocdir)/$${page} || exit 1; \
+ echo uninstalling $(DESTDIR)$(xsanedocdir)/$${page}...; \
+ rm -f $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
done
@for image in *.jpg; do\
- echo uninstalling $${image} in $(xsanedocdir)/$${image}...; \
- rm -f $(xsanedocdir)/$${image} || exit 1; \
+ echo uninstalling $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
+ rm -f $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
done
docs: ps html
diff --git a/doc/sane-xsane-advanced-doc.html b/doc/sane-xsane-advanced-doc.html
index abaa7e2..3d5d56e 100644
--- a/doc/sane-xsane-advanced-doc.html
+++ b/doc/sane-xsane-advanced-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-batch-scan-doc.html b/doc/sane-xsane-batch-scan-doc.html
index 3c671c5..eedd528 100644
--- a/doc/sane-xsane-batch-scan-doc.html
+++ b/doc/sane-xsane-batch-scan-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-color-correction-doc.html b/doc/sane-xsane-color-correction-doc.html
index 4f340f9..dca9144 100644
--- a/doc/sane-xsane-color-correction-doc.html
+++ b/doc/sane-xsane-color-correction-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -121,7 +122,7 @@
<td VALIGN=TOP BGCOLOR="#FFFFFF">
<br>
-<center><img SRC="xsane-save.jpg" alt="XSane-main-window"></center>
+<center><img SRC="xsane-color-correction.jpg" alt="XSane-main-window"></center>
<br>
<br>
<blockquote>
diff --git a/doc/sane-xsane-copy-doc.html b/doc/sane-xsane-copy-doc.html
index c2d97b6..97b98e9 100644
--- a/doc/sane-xsane-copy-doc.html
+++ b/doc/sane-xsane-copy-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window in copy mode</font></h1>
+<h1><font color="#009900">Copy mode</font></h1>
</blockquote>
</td>
</tr>
@@ -33,20 +33,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -129,37 +130,27 @@ In Copy mode, the scanned image is sent directly to the selected printer.
<center><img SRC="xsane-copy.jpg" alt="XSane-main-window"></center>
<br>
<br>
-<img SRC="xsane-colormode.jpg" alt="colormode">
-&nbsp;&nbsp;
-<b>Scanmode:</b>
-<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
-</blockquote>
-
-<img SRC="xsane-scansource.jpg" alt="scansource">
+<img SRC="xsane-adf-pages.jpg" alt="adf-pages">
&nbsp;&nbsp;
-<b>Scansource:</b>
+<b>ADF-Pages:</b>
<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
+Select the number of pages that shall be scanned.
+You can use this with an automatic document feeder (ADF)
+or by changing the papers by hand while the scanhead moves back.
</blockquote>
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
-
-
<img SRC="xsane-printer.jpg" alt="printer">
&nbsp;&nbsp;
<b>Printer:</b>
<blockquote>
-Select the printer on which the scanned image shall be printed. In the box
-with the number you can select the number of copies that shall be created.
+Select the printer on which the scanned image shall be printed.
+<p>
+In the box next to the printer icon
+<img SRC="xsane-copy-number.jpg" alt="copy-number">
+you can select the number of copies that shall be created of
+each scanned image.
<p>
<b>Paper orientation and image position:</b>
<p>
diff --git a/doc/sane-xsane-doc.html b/doc/sane-xsane-doc.html
index 874e065..dd9f481 100644
--- a/doc/sane-xsane-doc.html
+++ b/doc/sane-xsane-doc.html
@@ -33,20 +33,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetpye-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -128,14 +129,26 @@ XSane is a graphical scanning frontend for
<a href="http://www.sane-project.org">SANE</a> (Scanner Access Now Easy).
It uses the SANE-library to talk to
scanners. This means that XSane does not support any scanners itself.
-Here you can find out
+Take a look at the
<a href="http://www.sane-project.org/sane-backends.html">
-which scanners are supported by the SANE-library</a>.
+SANE-backends homepage</a> to find out which scanners are supported by SANE.
<p>
XSane is designed for acquiring images with scanners (there are other
-devices like cameras and videodevices supported by SANE, but XSane is
-not designed for that purpose). You can scan to file, do a photocopy,
-create a fax and start XSane from the GIMP as gimp plugin.
+devices like cameras and videodevices supported by SANE and you will
+see that xsane may support some basic functions of those devices, but XSane is
+not designed for that purpose).
+<p>
+XSane can do different things with the acquired images:
+<ul>
+<li><a href="sane-xsane-viewer-doc.html">display image in a viewer</a></li>
+<li><a href="sane-xsane-save-doc.html">save image to a file</a></li>
+<li><a href="sane-xsane-copy-doc.html">do a photocopy</a></li>
+<li><a href="sane-xsane-multipage-doc.html">create a multipage document</a></li>
+<li><a href="sane-xsane-fax-doc.html">create a fax</a></li>
+<li><a href="sane-xsane-email-doc.html">create an e-mail</a></li>
+</ul>
+XSane can also be started from the GIMP as
+<a href="sane-xsane-gimp-doc.html">Gimp plugin</a>.
</blockquote>
<p>
<h3><font color="#009900"><u>Setup:</u></font></h3>
@@ -173,6 +186,19 @@ I do not create any unix binaries in the moment, but there are
</li>
</ul>
+<h3><font color="#009900"><u>A personal plea:</u></font></h3>
+<blockquote>
+Most problems that occur while working with xsane are problems with the configuration of
+the backend (scanner driver) or the operating system. I do not have the knowledge and I do not have the
+time to answer all these questions.
+When you have problems with your scanner (e.g. the scanner is not recogniced,
+the scanner does not do what you expect, etc.) then please contact the
+<a href="http://www.sane-project.org/mailing-lists.html">
+SANE-devel mailing list</a> or the author of the backend that supports your scanner
+unless you have a good reason to expect that it is a problem of the graphical frontend (XSane)
+and not a problem of the sane-backend.
+</blockquote>
+
<h3><font color="#009900"><u>Author of XSane:</u></font></h3>
<blockquote>
<a href="mailto:Oliver.Rauch@xsane.org">Oliver Rauch</a>
diff --git a/doc/sane-xsane-mail-doc.html b/doc/sane-xsane-email-doc.html
index 9166da7..2441548 100644
--- a/doc/sane-xsane-mail-doc.html
+++ b/doc/sane-xsane-email-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window in mail mode</font></h1>
+<h1><font color="#009900">E-mail mode</font></h1>
</blockquote>
</td>
</tr>
@@ -33,20 +33,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -122,70 +123,31 @@
<td VALIGN=TOP BGCOLOR="#FFFFFF">
<blockquote>
<br>
-In the mail mode images are scanned and sent by email.
+In the e-mail mode images are scanned and sent by e-mail.
<br>
<br>
<br>
-<center><img SRC="xsane-mail.jpg" alt="XSane-main-window"></center>
+<center><img SRC="xsane-email.jpg" alt="XSane-main-window"></center>
<br>
<br>
-
-<img SRC="xsane-colormode.jpg" alt="colormode">
-&nbsp;&nbsp;
-<b>Scanmode:</b>
-<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
-</blockquote>
-
-<img SRC="xsane-scansource.jpg" alt="scansource">
-&nbsp;&nbsp;
-<b>Scansource:</b>
-<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
-</blockquote>
-
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
-
-<img SRC="xsane-resolution.jpg" alt="resolution">
-&nbsp;&nbsp;
-<b>Scan resolution:</b>
-<blockquote>
-Select resolution that is used for scanning. If the backends makes available a
-range of resolutions (e.g. 100-600 dpi) XSane can display a slider or a
-list of resolutions. You select this via <i>Preferences/Show resolution list</i>.
-<br>
-The backend can define a list of resolutions insted of a range, in this
-case it is not possible to enable the slider.
-<p>
-To select exact resolutions with the slider click the slider with the mouse pointer
-and use the cursor keys to change the value in steps of 1, if you press <i>ctrl</i>
-and a cursor key the step is 10.
-</blockquote>
-
-
+
<br>
<br>
-<center><img SRC="xsane-mail-project.jpg" alt="XSane-mail-project-window"></center>
+<center><img SRC="xsane-email-project.jpg" alt="XSane-email-project-window"></center>
<br>
-<h4>HTML mail:</h4>
+<h4>HTML e-mail:</h4>
<blockquote>
-Select if the mail is sent as html mail or as text mail. In text mail the images
-are appended to the mailfile. In html mail you can place the image at any position
-by adding the tag &lt IMAGE &gt at the place of the email text where the image shall
+Select if the e-mail is sent as html e-mail or as text e-mail. In text e-mail the images
+are appended to the e-mailfile. In html e-mail you can place the image at any position
+by adding the tag &lt IMAGE &gt at the place of the e-mail text where the image shall
be displayed. The images are displayed in the same order as they are listed in the
attachments.
</blockquote>
-<h4>Mail image filetype:</h4>
+<h4>E-mail image filetype:</h4>
<blockquote>
-You can select the type of the image files that are attached to the mail.
+You can select the type of the image files that are attached to the e-mail.
Select <i>PNG</i>, <i>JPEG</i> or <i>TIFF</i>. Pay attention that the size
of the images depends on the content of the pictures and on the filetype.
</blockquote>
@@ -202,17 +164,17 @@ Rename the selected image.
<h4>Delete image:</h4>
<blockquote>
-Remove the selected image from the mail project.
+Remove the selected image from the e-mail project.
</blockquote>
<h4>Send project:</h4>
<blockquote>
-Send mail, all images are attached to the mail.
+Send e-mail, all images are attached to the e-mail.
</blockquote>
<h4>Delete project:</h4>
<blockquote>
-Delete the complete project. The email text and the image files are erased.
+Delete the complete project. The e-mail text and the image files are erased.
</blockquote>
diff --git a/doc/sane-xsane-empty-doc.html b/doc/sane-xsane-empty-doc.html
index 099832e..f651ba2 100644
--- a/doc/sane-xsane-empty-doc.html
+++ b/doc/sane-xsane-empty-doc.html
@@ -28,14 +28,15 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
@@ -106,8 +107,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-fax-doc.html b/doc/sane-xsane-fax-doc.html
index 4f72e9f..b91b85f 100644
--- a/doc/sane-xsane-fax-doc.html
+++ b/doc/sane-xsane-fax-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window in fax mode</font></h1>
+<h1><font color="#009900">Fax mode</font></h1>
</blockquote>
</td>
</tr>
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -133,50 +134,51 @@ installed. The faxcommand and the options must be specified in the menu
<center><img SRC="xsane-fax.jpg" alt="XSane-main-window"></center>
<br>
<br>
-<img SRC="xsane-colormode.jpg" alt="colormode">
-&nbsp;&nbsp;
-<b>Scanmode:</b>
-<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
-</blockquote>
-
-<img SRC="xsane-scansource.jpg" alt="scansource">
-&nbsp;&nbsp;
-<b>Scansource:</b>
-<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
-</blockquote>
-
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
<br>
<br>
-<center><img SRC="xsane-fax-project.jpg" alt="XSane-fax-project-indow"></center>
+<center><img SRC="xsane-fax-project.jpg" alt="XSane-fax-project-window"></center>
<br>
-<h4>FINE MODE:</h4>
+<h4>Fine mode:</h4>
<blockquote>
The faxpages are always scanned in fine mode (204 dpi * 196 lpi). If
<i>Fine mode</i> is enabled when the project is sent all pages are sent with
196lpi (fine mode), otherwise all pages are sent with 98lpi (normal mode).
</blockquote>
-<h4>INSERT FILE:</h4>
+<h4>Insert file:</h4>
<blockquote>
You can add an external created postscript file to the fax project. The file is copied
to the fax project directory.
</blockquote>
-<h4>SHOW PAGE:</h4>
+<h4>Show page:</h4>
<blockquote>
A postscrip viewer is called to display the selected page.
</blockquote>
+
+<h4>Rename page:</h4>
+<blockquote>
+Rename the selected page.
+</blockquote>
+
+<h4>Delete page:</h4>
+<blockquote>
+Delete the selected page.
+</blockquote>
+
+<h4>Send project:</h4>
+<blockquote>
+Send all pages that are part of the fax project.
+Note that you need a working fax program!
+</blockquote>
+
+<h4>Delete project:</h4>
+<blockquote>
+Delete the fax project .
+</blockquote>
+
<br>
</blockquote>
</td>
diff --git a/doc/sane-xsane-gimp-doc.html b/doc/sane-xsane-gimp-doc.html
index fbc23a9..babc3ac 100644
--- a/doc/sane-xsane-gimp-doc.html
+++ b/doc/sane-xsane-gimp-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window of gimp plugin</font></h1>
+<h1><font color="#009900">Gimp plugin</font></h1>
</blockquote>
</td>
</tr>
@@ -33,20 +33,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -129,43 +130,7 @@ If XSane is started as Gimp plugin, the scanned image automatically is transfere
<center><img SRC="xsane-gimp.jpg" alt="XSane-main-window"></center>
<br>
<br>
-<img SRC="xsane-colormode.jpg" alt="colormode">
-&nbsp;&nbsp;
-<b>Scanmode:</b>
-<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
-</blockquote>
-<img SRC="xsane-scansource.jpg" alt="scansource">
-&nbsp;&nbsp;
-<b>Scansource:</b>
-<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
-</blockquote>
-
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
-
-<img SRC="xsane-resolution.jpg" alt="resolution">
-&nbsp;&nbsp;
-<b>Scan resolution:</b>
-<blockquote>
-Select resolution that is used for scanning. If the backends makes available a
-range of resolutions (e.g. 100-600 dpi) XSane can display a slider or a
-list of resolutions. You select this via <i>Preferences/Show resolution list</i>.
-<br>
-The backend can define a list of resolutions insted of a range, in this
-case it is not possible to enable the slider.
-<p>
-To select exact resolutions with the slider click the slider with the mouse pointer
-and use the cursor keys to change the value in steps of 1, if you press <i>ctrl</i>
-and a cursor key the step is 10.
-</blockquote>
<br>
<br>
To start xsane as a GIMP plugin, you have to set a symbolic link from
diff --git a/doc/sane-xsane-guide-doc.html b/doc/sane-xsane-guide-doc.html
new file mode 100644
index 0000000..3f20c1c
--- /dev/null
+++ b/doc/sane-xsane-guide-doc.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.74 [en] (X11; U; Linux 2.2.18 i686) [Netscape]">
+ <meta name="Author" content="Oliver Rauch">
+ <meta name="Description" content="scan, photocopy and fax frontend for SANE">
+ <title>XSane - Scan mode</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+
+
+<table>
+<tr>
+<td width=200>
+<img SRC="xsane-logo.jpg" alt="XSane-logo" hspace=30 align=TOP>
+</td>
+<td>
+<blockquote>
+<h1><font color="#009900">Guide</font></h1>
+</blockquote>
+</td>
+</tr>
+</table>
+
+
+<hr WIDTH="100%">
+
+<table>
+<tr>
+<td valign=TOP width="200" bgcolor="#E0E0BA">
+<br>
+<a href="sane-xsane-doc.html">Index</a>
+<br>
+<br>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
+<ul>
+<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
+<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
+<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
+<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
+<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
+</ul>
+<br>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
+<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
+<br>
+<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
+<ul>
+<li><a href="sane-xsane-color-correction-doc.html#GAMMA">Gamma correction</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#BRIGHTNESS">Brightness</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#CONTRAST">Contrast</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#THRESHOLD">Threshold</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RGB_DEFAULT">RGB default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#NEGATIVE">Negative</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#AUTOENHANCEMENT">Autoenhancement</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#ENHANCEMENT_DEFAULT">Default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RESTORE_ENHANCEMENT">Restore</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#STORE_ENHANCEMENT">Store</a></li>
+<li><a href="sane-xsane-histogram-doc.html">Histogram window</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette functions</a></li>
+</ul>
+<br>
+<a href="sane-xsane-standard-doc.html">Standard options window</a>
+<br>
+<br>
+<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
+<br>
+<br>
+<a href="sane-xsane-preview-doc.html">Preview:</a>
+<ul>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_GRAY">Pipette gray</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_BLACK">Pipette black</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNZOOM">Unzoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_OUT">Zoom out</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_IN">Zoom in</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNDO_ZOOM">Undo zoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTOSELECT">Autoselect scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTORAISE">Autoraise scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_VISIBLE_AREA">Select visible area</a></li>
+<li><a href="sane-xsane-preview-doc.html#DELETE_PREVIEW_CACHE">Delete preview cache</a></li>
+<li><a href="sane-xsane-preview-doc.html#PRESET_AREA">Preset area</a></li>
+<li><a href="sane-xsane-preview-doc.html#ROTATION">Rotation</a></li>
+<li><a href="sane-xsane-preview-doc.html#ASPECT_RATIO">Aspect ratio</a></li>
+<li><a href="sane-xsane-preview-doc.html#RGB_VALUES">RGB values</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_SCAN_AREA">Select scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#MOVE_SCAN_AREA">Move scanarea</a></li>
+</ul>
+<br>
+<a href="sane-xsane-batch-scan-doc.html">Batch scan:</a>
+<ul>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_EMPTY">Empty batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_OPEN">Open batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_SAVE">Save batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ADD">Add area to list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_DELETE">Remove selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_RENAME">Rename selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ROTATE">Rotate image</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_MIRROR">Mirror image</a></li>
+</ul>
+<br>
+<font color="#000000">Setup:</font>
+<ul>
+<li><a href="sane-xsane-setup-copy-doc.html">Copy setup</a></li>
+<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
+<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
+<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
+<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
+</ul>
+</td>
+
+
+
+<td VALIGN=TOP BGCOLOR="#FFFFFF">
+<blockquote>
+<br>
+You can click into the following image and you will be directed to the
+description of the selected widget.
+<br>
+<br>
+<br>
+
+ <img SRC="xsane-guide-1-decoration.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-menu-doc.html"> <img SRC="xsane-guide-2-menu.jpg" alt="disk" border="0"></a><br>
+ <img SRC="xsane-guide-3-options.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-scan-options-doc.html#ADF_PAGES"> <img SRC="xsane-guide-4a-adf-pages.jpg" alt="disk" border="0"></a><a href="sane-xsane-doc.html"> <img SRC="xsane-guide-4b-xsane-mode.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-save-doc.html#DISK"> <img SRC="xsane-guide-5-saving-options.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-scan-options-doc.html#SCANSOURCE"><img SRC="xsane-guide-6-scan-options.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-medium-definition-doc.html"> <img SRC="xsane-guide-7-medium-selection.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-scan-options-doc.html#RESOLUTION"><img SRC="xsane-guide-8-resolution.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-color-correction-doc.html"> <img SRC="xsane-guide-9-color-correction.jpg" alt="disk" border="0"></a><br>
+<a href="sane-xsane-scan-doc.html"> <img SRC="xsane-guide-10-scan.jpg" alt="disk" border="0"></a><br>
+
+</blockquote>
+</blockquote>
+</td>
+</tr>
+</table>
+
+<hr WIDTH="100%">
+
+<blockquote>
+Author: <a href="mailto:Oliver.Rauch@xsane.org">Oliver Rauch</a>
+</blockquote>
+
+</body>
+</html>
+
diff --git a/doc/sane-xsane-histogram-doc.html b/doc/sane-xsane-histogram-doc.html
index 2c52454..de0a333 100644
--- a/doc/sane-xsane-histogram-doc.html
+++ b/doc/sane-xsane-histogram-doc.html
@@ -28,14 +28,15 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
@@ -106,8 +107,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-medium-definition-doc.html b/doc/sane-xsane-medium-definition-doc.html
index e8c879b..2938169 100644
--- a/doc/sane-xsane-medium-definition-doc.html
+++ b/doc/sane-xsane-medium-definition-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-multipage-doc.html b/doc/sane-xsane-multipage-doc.html
new file mode 100644
index 0000000..7cca205
--- /dev/null
+++ b/doc/sane-xsane-multipage-doc.html
@@ -0,0 +1,190 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.74 [en] (X11; U; Linux 2.2.18 i686) [Netscape]">
+ <meta name="Author" content="Oliver Rauch">
+ <meta name="Description" content="scan, photocopy and fax frontend for SANE">
+ <title>XSane - Multipage mode</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+
+
+<table>
+<tr>
+<td width=200>
+<img SRC="xsane-logo.jpg" alt="XSane-logo" hspace=30 align=TOP>
+</td>
+<td>
+<blockquote>
+<h1><font color="#009900">Multipage mode</font></h1>
+</blockquote>
+</td>
+</tr>
+</table>
+
+
+<hr WIDTH="100%">
+
+<table>
+<tr>
+<td valign=TOP width="200" bgcolor="#E0E0BA">
+<br>
+<a href="sane-xsane-doc.html">Index</a>
+<br>
+<br>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
+<ul>
+<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
+<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
+<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
+<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
+<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
+</ul>
+<br>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
+<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
+<br>
+<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
+<ul>
+<li><a href="sane-xsane-color-correction-doc.html#GAMMA">Gamma correction</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#BRIGHTNESS">Brightness</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#CONTRAST">Contrast</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#THRESHOLD">Threshold</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RGB_DEFAULT">RGB default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#NEGATIVE">Negative</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#AUTOENHANCEMENT">Autoenhancement</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#ENHANCEMENT_DEFAULT">Default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RESTORE_ENHANCEMENT">Restore</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#STORE_ENHANCEMENT">Store</a></li>
+<li><a href="sane-xsane-histogram-doc.html">Histogram window</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette functions</a></li>
+</ul>
+<br>
+<a href="sane-xsane-standard-doc.html">Standard options window</a>
+<br>
+<br>
+<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
+<br>
+<br>
+<a href="sane-xsane-preview-doc.html">Preview:</a>
+<ul>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_GRAY">Pipette gray</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_BLACK">Pipette black</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNZOOM">Unzoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_OUT">Zoom out</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_IN">Zoom in</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNDO_ZOOM">Undo zoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTOSELECT">Autoselect scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTORAISE">Autoraise scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_VISIBLE_AREA">Select visible area</a></li>
+<li><a href="sane-xsane-preview-doc.html#DELETE_PREVIEW_CACHE">Delete preview cache</a></li>
+<li><a href="sane-xsane-preview-doc.html#PRESET_AREA">Preset area</a></li>
+<li><a href="sane-xsane-preview-doc.html#ROTATION">Rotation</a></li>
+<li><a href="sane-xsane-preview-doc.html#ASPECT_RATIO">Aspect ratio</a></li>
+<li><a href="sane-xsane-preview-doc.html#RGB_VALUES">RGB values</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_SCAN_AREA">Select scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#MOVE_SCAN_AREA">Move scanarea</a></li>
+</ul>
+<br>
+<a href="sane-xsane-batch-scan-doc.html">Batch scan:</a>
+<ul>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_EMPTY">Empty batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_OPEN">Open batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_SAVE">Save batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ADD">Add area to list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_DELETE">Remove selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_RENAME">Rename selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ROTATE">Rotate image</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_MIRROR">Mirror image</a></li>
+</ul>
+<br>
+<font color="#000000">Setup:</font>
+<ul>
+<li><a href="sane-xsane-setup-copy-doc.html">Copy setup</a></li>
+<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
+<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
+<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
+<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
+</ul>
+</td>
+
+
+
+<td VALIGN=TOP BGCOLOR="#FFFFFF">
+<blockquote>
+<br>
+In the multipage mode you can collect several images and create a multipage file.
+<br>
+Available multipage formats are <i>postscript</i>, <i>PDF</i> and <i>tiff</i>.
+<br>
+<br>
+<br>
+<center><img SRC="xsane-multipage.jpg" alt="XSane-main-window"></center>
+<br>
+<br>
+
+
+<br>
+<br>
+<center><img SRC="xsane-multipage-project.jpg" alt="XSane-multipage-project-window"></center>
+<br>
+
+<h4>Show image:</h4>
+<blockquote>
+The internal viewer is opened to display the selected image.
+</blockquote>
+<br>
+
+<h4>Edit image:</h4>
+<blockquote>
+The internal viewer is opened to edit the selected image.
+</blockquote>
+<br>
+
+<h4>Delete image:</h4>
+<blockquote>
+Delete the selected image.
+</blockquote>
+<br>
+
+<h4>Save multipage file:</h4>
+<blockquote>
+All images that are part of the multipage project are saved into the file
+with the name of the multipage project and with the selected filetype as extension.
+<br>
+After creating the multipage file you should delete the multipage project!
+</blockquote>
+<br>
+
+<h4>Delete project:</h4>
+<blockquote>
+Delete the multipage project.
+Note that you should delete the project after creation of the multipage file
+to reduce disk usage!
+</blockquote>
+<br>
+
+</blockquote>
+</td>
+</tr>
+</table>
+
+<hr WIDTH="100%">
+
+<blockquote>
+Author: <a href="mailto:Oliver.Rauch@xsane.org">Oliver Rauch</a>
+</blockquote>
+
+</body>
+</html>
+
diff --git a/doc/sane-xsane-preview-doc.html b/doc/sane-xsane-preview-doc.html
index 1718062..17dea20 100644
--- a/doc/sane-xsane-preview-doc.html
+++ b/doc/sane-xsane-preview-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-save-doc.html b/doc/sane-xsane-save-doc.html
index dafb123..6673e25 100644
--- a/doc/sane-xsane-save-doc.html
+++ b/doc/sane-xsane-save-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window in save mode</font></h1>
+<h1><font color="#009900">Save mode</font></h1>
</blockquote>
</td>
</tr>
@@ -33,20 +33,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -130,45 +131,7 @@ In the save mode an image is scanned and saved to a file.
<br>
<br>
-<img SRC="xsane-colormode.jpg" alt="colormode">
-&nbsp;&nbsp;
-<b>Scanmode:</b>
-<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
-</blockquote>
-
-<img SRC="xsane-scansource.jpg" alt="scansource">
-&nbsp;&nbsp;
-<b>Scansource:</b>
-<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
-</blockquote>
-
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
-
-<img SRC="xsane-resolution.jpg" alt="resolution">
-&nbsp;&nbsp;
-<b>Scan resolution:</b>
-<blockquote>
-Select resolution that is used for scanning. If the backends makes available a
-range of resolutions (e.g. 100-600 dpi) XSane can display a slider or a
-list of resolutions. You select this via <i>Preferences/Show resolution list</i>.
-<br>
-The backend can define a list of resolutions insted of a range, in this
-case it is not possible to enable the slider.
-<p>
-To select exact resolutions with the slider click the slider with the mouse pointer
-and use the cursor keys to change the value in steps of 1, if you press <i>ctrl</i>
-and a cursor key the step is 10.
-</blockquote>
-
-
+<a NAME="DISK"></a>
<img SRC="xsane-disk.jpg" alt="disk">
&nbsp;&nbsp;
<b>Select filename:</b>
@@ -178,18 +141,23 @@ of the image file that is created when the next scan is done.
You also can enter the filename directly to the text box right to the disk icon.
If no path is entered XSane saves the file into the directory selected in
<i>Preferences/Change directory</i>.
-<p>
-<b>Step:</b>
+</blockquote>
+
+
+<img SRC="xsane-step.jpg" alt="step">
+&nbsp;&nbsp;
+<b>Filename counter step width:</b>
<blockquote>
-If there is a counter in the filename (image-0001.jpg) the counter is increased by
-the number selected in this box.
+When the filename contains a counter at the end then the counter is updated
+by the selected step width when the scan has been completed.
</blockquote>
+
<b>Type:</b>
<blockquote>
<i>by ext</i> means that the filetype is selected by the extension of the filename.
-When you select a filetype in this box XSane automatically appends the correct
-extension to the filename, you should not append a file extension in this case.
+When you select a filetype in this box XSane automatically updates the
+extension of the filename.
</blockquote>
@@ -246,7 +214,6 @@ support is compiled in. For <i>png</i> you need libpng and libz, for
<font color="#000099">rgba (raw) and png with alpha channel</font>
</blockquote>
-</blockquote>
</blockquote>
</blockquote>
diff --git a/doc/sane-xsane-scan-options-doc.html b/doc/sane-xsane-scan-options-doc.html
new file mode 100644
index 0000000..5858870
--- /dev/null
+++ b/doc/sane-xsane-scan-options-doc.html
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.74 [en] (X11; U; Linux 2.2.18 i686) [Netscape]">
+ <meta name="Author" content="Oliver Rauch">
+ <meta name="Description" content="scan, photocopy and fax frontend for SANE">
+ <title>XSane - Scan mode</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+
+
+<table>
+<tr>
+<td width=200>
+<img SRC="xsane-logo.jpg" alt="XSane-logo" hspace=30 align=TOP>
+</td>
+<td>
+<blockquote>
+<h1><font color="#009900">Scan options</font></h1>
+</blockquote>
+</td>
+</tr>
+</table>
+
+
+<hr WIDTH="100%">
+
+<table>
+<tr>
+<td valign=TOP width="200" bgcolor="#E0E0BA">
+<br>
+<a href="sane-xsane-doc.html">Index</a>
+<br>
+<br>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
+<ul>
+<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
+<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
+<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
+<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
+<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
+</ul>
+<br>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
+<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
+<br>
+<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
+<ul>
+<li><a href="sane-xsane-color-correction-doc.html#GAMMA">Gamma correction</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#BRIGHTNESS">Brightness</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#CONTRAST">Contrast</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#THRESHOLD">Threshold</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RGB_DEFAULT">RGB default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#NEGATIVE">Negative</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#AUTOENHANCEMENT">Autoenhancement</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#ENHANCEMENT_DEFAULT">Default</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#RESTORE_ENHANCEMENT">Restore</a></li>
+<li><a href="sane-xsane-color-correction-doc.html#STORE_ENHANCEMENT">Store</a></li>
+<li><a href="sane-xsane-histogram-doc.html">Histogram window</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette functions</a></li>
+</ul>
+<br>
+<a href="sane-xsane-standard-doc.html">Standard options window</a>
+<br>
+<br>
+<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
+<br>
+<br>
+<a href="sane-xsane-preview-doc.html">Preview:</a>
+<ul>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_GRAY">Pipette gray</a></li>
+<li><a href="sane-xsane-preview-doc.html#PIPETTE_BLACK">Pipette black</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNZOOM">Unzoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_OUT">Zoom out</a></li>
+<li><a href="sane-xsane-preview-doc.html#ZOOM_IN">Zoom in</a></li>
+<li><a href="sane-xsane-preview-doc.html#UNDO_ZOOM">Undo zoom</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTOSELECT">Autoselect scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#AUTORAISE">Autoraise scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_VISIBLE_AREA">Select visible area</a></li>
+<li><a href="sane-xsane-preview-doc.html#DELETE_PREVIEW_CACHE">Delete preview cache</a></li>
+<li><a href="sane-xsane-preview-doc.html#PRESET_AREA">Preset area</a></li>
+<li><a href="sane-xsane-preview-doc.html#ROTATION">Rotation</a></li>
+<li><a href="sane-xsane-preview-doc.html#ASPECT_RATIO">Aspect ratio</a></li>
+<li><a href="sane-xsane-preview-doc.html#RGB_VALUES">RGB values</a></li>
+<li><a href="sane-xsane-preview-doc.html#SELECT_SCAN_AREA">Select scanarea</a></li>
+<li><a href="sane-xsane-preview-doc.html#MOVE_SCAN_AREA">Move scanarea</a></li>
+</ul>
+<br>
+<a href="sane-xsane-batch-scan-doc.html">Batch scan:</a>
+<ul>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_EMPTY">Empty batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_OPEN">Open batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_SAVE">Save batch list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ADD">Add area to list</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_DELETE">Remove selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_RENAME">Rename selection</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_ROTATE">Rotate image</a></li>
+<li><a href="sane-xsane-batch-scan-doc.html#BATCH_SCAN_MIRROR">Mirror image</a></li>
+</ul>
+<br>
+<font color="#000000">Setup:</font>
+<ul>
+<li><a href="sane-xsane-setup-copy-doc.html">Copy setup</a></li>
+<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
+<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
+<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
+<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
+</ul>
+</td>
+
+
+
+<td VALIGN=TOP BGCOLOR="#FFFFFF">
+<blockquote>
+<br>
+Here you find a description of the available scan options in the XSane main window.
+If an option is available depends on the scanner model, available hardware extensions,
+the scanmode and the xsane mode.
+<br>
+<br>
+<br>
+<center><img SRC="xsane-viewer.jpg" alt="XSane-main-window"></center>
+<br>
+<br>
+
+<a NAME="ADF_PAGES"></a>
+<img SRC="xsane-adf-pages.jpg" alt="adf-pages">
+&nbsp;&nbsp;
+<b>ADF-Pages:</b>
+<blockquote>
+Select the number of pages that shall be scanned.
+You can use this with an automatic document feeder (ADF)
+or by changing the papers by hand while the scanhead moves back.
+</blockquote>
+
+<a NAME="SCANSOURCE"></a>
+<img SRC="xsane-scansource.jpg" alt="scansource">
+&nbsp;&nbsp;
+<b>Scansource:</b>
+<blockquote>
+Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
+</blockquote>
+
+<img SRC="xsane-colormode.jpg" alt="colormode">
+&nbsp;&nbsp;
+<b>Scanmode:</b>
+<blockquote>
+Select scanmode, e.g.: color, grayscale, halftone, lineart.
+</blockquote>
+
+<img SRC="xsane-medium.jpg" alt="medium">
+&nbsp;&nbsp;
+<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
+<blockquote>
+Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
+<i>Agfa negative</i>, ... or <i>Full range</i>.
+</blockquote>
+
+<a NAME="RESOLUTION"></a>
+<img SRC="xsane-resolution.jpg" alt="resolution">
+&nbsp;&nbsp;
+<b>Scan resolution:</b>
+<blockquote>
+Select resolution that is used for scanning. If the backends makes available a
+range of resolutions (e.g. 100-600 dpi) XSane can display a slider or a
+list of resolutions. You select this via <i>Preferences/Show resolution list</i>.
+<br>
+The backend can define a list of resolutions insted of a range, in this
+case it is not possible to enable the slider.
+<p>
+To select exact resolutions with the slider click the slider with the mouse pointer
+and use the cursor keys to change the value in small steps, if you press <i>ctrl</i>
+and a cursor key the resolution is changed in larger steps.
+</blockquote>
+
+</blockquote>
+</blockquote>
+</td>
+</tr>
+</table>
+
+<hr WIDTH="100%">
+
+<blockquote>
+Author: <a href="mailto:Oliver.Rauch@xsane.org">Oliver Rauch</a>
+</blockquote>
+
+</body>
+</html>
+
diff --git a/doc/sane-xsane-setup-copy-doc.html b/doc/sane-xsane-setup-copy-doc.html
index 83c92b1..2371a6f 100644
--- a/doc/sane-xsane-setup-copy-doc.html
+++ b/doc/sane-xsane-setup-copy-doc.html
@@ -32,19 +32,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -130,12 +131,12 @@ main window of xsane.
<br>
<br>
<br>
-<h4>NAME:</h4>
+<h4>Name:</h4>
<blockquote>
Define the name for the following printer definition.
</blockquote>
-<h4>COMMAND:</h4>
+<h4>Command:</h4>
<blockquote>
Enter the command with which you print files. The command has
to read the file from the standard input. If you use the bsd printing system
@@ -143,7 +144,7 @@ this is "lpr", if you use the old printing system this should be "lp". When you
use KDE then you should try "kprinter --stdin".
</blockquote>
-<h4>COPY NUMBER OPTION:</h4>
+<h4>Copy number option:</h4>
<blockquote>
Enter the option of the printer command with wich the number
of copies are specified. If you use the bsd printing system (lpr) or kprinter
@@ -152,23 +153,23 @@ This option is the last option passed to the printerrcommand
so if you specify a ";#" then the option is ignored.
</blockquote>
-<h4>RESOLUTION:</h4>
+<h4>Resolution:</h4>
<blockquote>
With <i>resolution</i> you specify the resolution that shall
be used for printing. It is not always necessary to set this value to the
-resolution of the printer. Especally in grayscale and color mode it normally
+resolution of the printer. Especially in grayscale and color mode it normally
is good to set this value to the half or the quarter of the printer resolution
because the printer needs a greater resolution to do the dithering. This
value does not effect a change of the image size, the image size only depends
on the given zoom factor.
</blockquote>
-<h4>PRINT AREA (WIDTH, HEIGHT, LEFT OFFSET, BOTTOM OFFSET):</h4>
+<h4>Print area (width, height, left offset, bottom offset):</h4>
<blockquote>
Each printer has it's own area size and position where it is able to print.
</blockquote>
-<h4>PRINTER GAMMA VALUES:</h4>
+<h4>Printer gamma values:</h4>
<blockquote>
Addidtional gamma value for printing. The <i>Printer gamma value</i>
is used for grayscale and as common value for color mode. The
diff --git a/doc/sane-xsane-setup-display-doc.html b/doc/sane-xsane-setup-display-doc.html
index 68a79de..2d07e40 100644
--- a/doc/sane-xsane-setup-display-doc.html
+++ b/doc/sane-xsane-setup-display-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -131,7 +132,7 @@ main window of xsane.
<br>
<br>
<br>
-<h4>MAIN WINDOW SIZE FIXED:</h4>
+<h4>Main window size fixed:</h4>
<blockquote>
Select if the main window size shall be fixed (the window size
is defined by xsane) or it shall be a resizable with scrollbars if necessary.
@@ -140,14 +141,14 @@ The option can be overwritten by the command line options --Fixed/-F or
--Resizeable/-R.
</blockquote>
-<h4>USE PRIVATE COLORMAP:</h4>
+<h4>Use private colormap:</h4>
<blockquote>
If enabled and if the X server runs in 8 bit mode (256 colors)
then the preview uses an own color map.
<br>I suggest you do <b>not</b> run the X server in 8 bit mode!
</blockquote>
-<h4>PREVIEW OVERSAMPLING:</h4>
+<h4>Preview oversampling:</h4>
<blockquote>
Defines a multiplier for the preview scan resolution. A value
@@ -160,18 +161,18 @@ slower if you enter large values. So I suggest a value of 1.0 on slow computers
and a value up to 2.0 on fast computers.
</blockquote>
-<h4>PREVIEW GAMMA:</h4>
+<h4>Preview gamma:</h4>
<blockquote>
Set the gamma correction value for the preview image. This is to get correct
colors on your monitor.
</blockquote>
-<h4>DISABLE&nbsp;GIMP PREVIEW GAMMA:</h4>
+<h4>Disable Gimp preview gamma:</h4>
<blockquote>
When xsane is started as gimp plugin do not use preview gamma.
</blockquote>
-<h4>HELPFILE VIEWER:</h4>
+<h4>Helpfile viewer:</h4>
<blockquote>
Enter a program to show the helpfiles. It must be a html-viewer.
If you enter the keywrod "netscape-remote", xsane uses a already running
diff --git a/doc/sane-xsane-setup-mail-doc.html b/doc/sane-xsane-setup-email-doc.html
index ddd94a3..e74cfc5 100644
--- a/doc/sane-xsane-setup-mail-doc.html
+++ b/doc/sane-xsane-setup-email-doc.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Author" content="Oliver Rauch">
<meta name="Description" content="scan, photocopy and fax frontend for SANE">
- <title>XSane - Mail setup</title>
+ <title>XSane - E-mail setup</title>
</head>
<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
@@ -16,7 +16,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Mail setup</font></h1>
+<h1><font color="#009900">E-mail setup</font></h1>
</blockquote>
</td>
</tr>
@@ -32,19 +32,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -126,61 +127,50 @@ main window of xsane.
<br>
<br>
<br>
-<center><img SRC="xsane-setup-mail.jpg" alt="Xsane-setup-mail-window"></center>
+<center><img SRC="xsane-setup-email.jpg" alt="Xsane-setup-e-mail-window"></center>
<br>
<br>
<br>
-<h4>FROM:</h4>
+<h4>From:</h4>
<blockquote>
Enter your email address.
</blockquote>
-<h4>REPLY TO:</h4>
+<h4>Reply to:</h4>
<blockquote>
Enter the email address to which the receiver shall answer.
If this is the same as the <i>from</i> address enter the same
address again.
</blockquote>
-<h4>SMTP SERVER:</h4>
+<h4>SMTP server:</h4>
<blockquote>
This is the address of the smtp server.
</blockquote>
-<h4>SMPT PORT:</h4>
+<h4>SMPT port:</h4>
<blockquote>
Here you have to enter the port number on which the smtp server
expects smtp connections. The standard port number is 25.
</blockquote>
-<h4>POP3 authentification:</h4>
+<h4>E-mail authentication:</h4>
<blockquote>
-Some smtp servers expect authentification before accepting
-any mail. The smtp protocol does not define any authentification
-routines. A lot of smtp servers expect that you authentificate
-yourself via the pop3 authentification routines.
+Since some years all SMTP servers expect authentication before accepting
+any mail. There are different ways of authentication. Select the one your
+ISP supports.
</blockquote>
-<h4>POP3 server:</h4>
+<h4>User:</h4>
<blockquote>
-This is the address of the pop3 server.
+Enter your username for the email authentication.
</blockquote>
-<h4>POP3 port:</h4>
+<h4>Password:</h4>
<blockquote>
-Here you have to enter the port number on which the pop3 server
-expects pop3 connections. The standard port number is 110.
-</blockquote>
-
-<h4>POP3 user:</h4>
-<blockquote>
-Enter your username for the pop3 server.
-</blockquote>
-
-<h4>POP3 password:</h4>
-<blockquote>
-Enter the password for the pop3 server. Pay attention, this can
+Enter the password for the email authentication.
+Pay attention, this can
be a security hole. The user and password is stored in the
xsane.rc file in ~/.sane/xsane/xsane.rc. The password is
not stored in plain text but it is simple to reconstruct
@@ -189,11 +179,15 @@ your pop3 password here make sure no one gets access
to your xsane.rc file.
</blockquote>
-<h4>Viewer(png):</h4>
+<h4>POP3 server:</h4>
<blockquote>
-Enter the program that shall be used to display a scanned
-image when the <i>show image</i> button is pressed in the mail dialog.
-The program has to be able to display png images.
+This is the address of the pop3 server when you selected <i>POP3 before SMTP</i>.
+</blockquote>
+
+<h4>POP3 port:</h4>
+<blockquote>
+Here you have to enter the port number on which the pop3 server
+expects pop3 connections. The standard port number is 110.
</blockquote>
</blockquote>
diff --git a/doc/sane-xsane-setup-enhancement-doc.html b/doc/sane-xsane-setup-enhancement-doc.html
index 2546b35..c363dab 100644
--- a/doc/sane-xsane-setup-enhancement-doc.html
+++ b/doc/sane-xsane-setup-enhancement-doc.html
@@ -32,20 +32,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -129,7 +130,7 @@ main window of xsane.
<center><img SRC="xsane-setup-enhancement.jpg" alt="XSane-setup-enhancement-window"></center>
<br>
<br>
-<h4>THRESHOLD OPTION:</h4>
+<h4>Threshold option:</h4>
<blockquote>
There are three options available:
<ul>
@@ -164,9 +165,8 @@ scan. The value range of the threshold option is normalized (see
<i>THRESHOLD MINIMUM, MAXIMUM, MULTIPLIER, OFFSET</i>).
</blockquote>
</blockquote>
-</blockquote>
-<h4>THRESHOLD MINIMUM, MAXIMUM, MULTIPLIER, OFFSET:</h4>
+<h4>Threshold minimum, maximum, multiplier, offset:</h4>
<blockquote>
These values are used to make the threshold function of the
backends work the same way XSane does handle it. This is:
@@ -188,7 +188,7 @@ you can shift the range linear.
<b>where the user can select xsane_threshold in the range from MINIMUM to MAXIMUM.</b>
</blockquote>
-<h4>NAME OF GRAYSCALE SCANMODE:</h4>
+<h4>Name of grayscale scanmode:</h4>
<blockquote>
If you want to do a grayscale previewscan when lineart scanmode
is selected, you have to tell xsane the name of the grayscale mode. This
@@ -197,10 +197,7 @@ may use different names. You have to enter the original name (not translated)
case sensitive (take a look at the scanmode selection menu in the xsane
main window).
<br>
-The name should be something like
-<blockquote>
-<b><i>Gray</i></b>
-</blockquote>
+The name should be something like <b><i>Gray</i></b>.
</blockquote>
</td>
@@ -212,6 +209,7 @@ The name should be something like
<blockquote>
Author: <a href="mailto:Oliver.Rauch@xsane.org">Oliver Rauch</a>
</blockquote>
+</blockquote>
</body>
</html>
diff --git a/doc/sane-xsane-setup-fax-doc.html b/doc/sane-xsane-setup-fax-doc.html
index 57a5983..bd2bb00 100644
--- a/doc/sane-xsane-setup-fax-doc.html
+++ b/doc/sane-xsane-setup-fax-doc.html
@@ -32,19 +32,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -131,21 +132,21 @@ main window of xsane.
<br>
<br>
-<h4>COMMAND:</h4>
+<h4>Command:</h4>
<blockquote>
Enter command to send/spool faxfiles.
<b>hylafax: "sendfax"</b>
<b>mgetty+sendfax: "faxspool"</b>
</blockquote>
-<h4>RECEIVER OPTION:</h4>
+<h4>Receiver option:</h4>
<blockquote>
Option to set receiver phone number or address.
<b>hylafax: "-d"</b>
<b>mgetty+sendfax: leave free</b>
</blockquote>
-<h4>POSTSCRIPTFILE OPTION:</h4>
+<h4>Postscriptfile option:</h4>
<blockquote>
If there is an option that must be set before the filenames
of the faxfile or if it is necessary to specify an option for files in
@@ -154,14 +155,14 @@ postscript format, enter this option - otherwise let this field free.
<b>mgetty+sendfax: leave free</b>
</blockquote>
-<h4>NORMAL MODE OPTION:</h4>
+<h4>Normal mode option:</h4>
<blockquote>If there is an option to set normal mode (98lpi) then enter
this option - otherwise let this field free.
<b>hylafax: "-l"</b>
<b>mgetty+sendfax: "-n"</b>
</blockquote>
-<h4>FINE MODE OPTION:</h4>
+<h4>Fine mode option:</h4>
<blockquote>
If there is an option to set fine mode (196lpi) then enter
this option - otherwise let this field free.
@@ -169,14 +170,14 @@ this option - otherwise let this field free.
<b>mgetty+sendfax: leave free</b>
</blockquote>
-<h4>VIEWER:</h4>
+<h4>Viewer:</h4>
<blockquote>
Enter a program to show the postscript fax files on the screen.
<br>
E.g. this can be "ghostscript" or "xv".
</blockquote>
-<h4>PRINT AREA (WIDTH, HEIGHT, LEFT OFFSET, BOTTOM OFFSET):</h4>
+<h4>Print area (width, height, left offset, bottom offset):</h4>
<blockquote>
Define size and position of printable area on faxpage.
</blockquote>
diff --git a/doc/sane-xsane-setup-image-doc.html b/doc/sane-xsane-setup-filetype-doc.html
index d5dae03..76bc981 100644
--- a/doc/sane-xsane-setup-image-doc.html
+++ b/doc/sane-xsane-setup-filetype-doc.html
@@ -16,7 +16,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Image setup</font></h1>
+<h1><font color="#009900">Filetype setup</font></h1>
</blockquote>
</td>
</tr>
@@ -32,19 +32,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -126,24 +127,48 @@ main window of xsane.
<br>
<br>
<br>
-<center><p><br><img SRC="xsane-setup-image.jpg" alt="XSane-setup-image-window"></center>
+<center><p><br><img SRC="xsane-setup-filetype.jpg" alt="XSane-setup-filetype-window"></center>
<br>
<br>
<br>
-<h4>REDUCE 16 BIT IMAGE TO 8 BIT:</h4>
+
+<h4>Reduce 16 bit image to 8 bit:</h4>
<blockquote>
When the image is scanned with 16 bit/color then xsane does reduce the
color depth to 8 bit/color before saving the image.
</blockquote>
-<h4>JPEG IMAGE QUALITY:</h4>
+<h4>Save 16 bit pnm in ascii format:</h4>
+<blockquote>
+In general 16 bit pnm images are stored in binary format.
+When you want to create 16 bit ascii pnm images then enable this option.
+But keep in mind that you get huge files!
+</blockquote>
+
+<h4>Save posctscript zlib compressed (ps level 3):</h4>
+<blockquote>
+Poscsript level 2 does not know about zlib compressed images.
+For postscript level 2 the images are stored in A85 compression.
+When you want to create zlib compressed (deflate) postscript files
+then enable this option. But keep in mind that you will not be able
+to print such files on postscript level 2 printers!
+</blockquote>
+
+<h4>Save PDF zlib compressed:</h4>
+<blockquote>
+PDF images can be stored in A85 compression or in zlib compression.
+When you want to create zlib compressed (deflate) PDF files
+then enable this option.
+</blockquote>
+
+<h4>JPEG image quality:</h4>
<blockquote>
If the image is saved in <i>jpeg</i> format this value defines
the quality of the image. Low values mean low quality and low file size,
high values mean high quality and high file size.
</blockquote>
-<h4>PNG IMAGE COMPRESSION:</h4>
+<h4>PNG image compression:</h4>
<blockquote>
If the image is saved in <i>png</i> format this value defines
the compression level. The quality of the image keeps the same, low values
@@ -151,20 +176,28 @@ mean low compression, large files and low compression time. High values
mean high compression, smaller files and high compression time.
</blockquote>
-<h4>TIFF 16 BIT IMAGE COMPRESSION:</h4>
+<h4>TIFF zip compression rate:</h4>
+<blockquote>
+If the image is saved in zlib compressed (deflate) <i>tiff</i> format this value defines
+the compression level. The quality of the image keeps the same, low values
+mean low compression, large files and low compression time. High values
+mean high compression, smaller files and high compression time.
+</blockquote>
+
+<h4>TIFF 16 bit image compression:</h4>
<blockquote>
If the image is saved in 16 bit/color <i>tiff</i> format this selection defines
if xsane does <i>pack bits</i> or <i>no compression</i> is used.
</blockquote>
-<h4>TIFF 8 BIT IMAGE COMPRESSION:</h4>
+<h4>TIFF 8 bit image compression:</h4>
<blockquote>
If the image is saved in 8 bit/color <i>tiff</i> format this selection defines
if xsane does <i>pack bits</i>, use <i>JPEG DCT compression</i> or <i>no compression</i>
is used.
</blockquote>
-<h4>TIFF lineart IMAGE COMPRESSION:</h4>
+<h4>TIFF lineart image compression:</h4>
<blockquote>
If the image is saved in lineart <i>tiff</i> format this selection defines
if xsane does <i>pack bits</i>, use <i>CCIT Group 4 Fax compression</i>,
diff --git a/doc/sane-xsane-setup-save-doc.html b/doc/sane-xsane-setup-save-doc.html
index a954ffb..20b7a36 100644
--- a/doc/sane-xsane-setup-save-doc.html
+++ b/doc/sane-xsane-setup-save-doc.html
@@ -32,20 +32,23 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
<ul>
@@ -66,11 +69,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -110,8 +111,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -130,25 +131,28 @@ main window of xsane.
<br>
<br>
<br>
-<h4> PERMISSIONS:</h4>
+<h4>Permissions:</h4>
<blockquote>
You can set permissions with which a file or directory is created.
The user permissions are not changeable because xsane needs the predefined user
permissions for correct function.
</blockquote>
+<br>
-<h4>OVERWRITE WARNING:</h4>
+<h4>Overwrite warning:</h4>
<blockquote>
If enabled, a warning comes up before an existing file is overwritten.
</blockquote>
+<br>
-<h4>SKIP EXISTING NUMBERS:</h4>
+<h4>Skip exisiting numbers:</h4>
<blockquote>
If filename counter is automatically increased, the filenames that
already exist are skipped!
</blockquote>
+<br>
-<h4>FILENAME COUNTER LENGTH:</h4>
+<h4>Filename counter length:</h4>
<blockquote>
If the filename includes a counter (image-0003.pnm), the length
of the counter can be defined. This can be interesting eg. if you want
@@ -156,6 +160,15 @@ to scan 500 images and want that the ordering the images by their filenames
creates the same order like the counter does. If you select <i>inactive</i>
the counter is not changed by xsane.
</blockquote>
+<br>
+
+<h4>Save device preferences at exit:</h4>
+<blockquote>
+When you enable this option then the devices preferences
+are automatically saved when XSane exits.
+</blockquote>
+
+
</blockquote>
</td>
</tr>
diff --git a/doc/sane-xsane-standard-doc.html b/doc/sane-xsane-standard-doc.html
index 78bb7c2..fa66c9c 100644
--- a/doc/sane-xsane-standard-doc.html
+++ b/doc/sane-xsane-standard-doc.html
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
diff --git a/doc/sane-xsane-viewer-doc.html b/doc/sane-xsane-viewer-doc.html
index 83409a3..1b222cf 100644
--- a/doc/sane-xsane-viewer-doc.html
+++ b/doc/sane-xsane-viewer-doc.html
@@ -17,7 +17,7 @@
</td>
<td>
<blockquote>
-<h1><font color="#009900">Main window in viewer mode</font></h1>
+<h1><font color="#009900">Viewer mode</font></h1>
</blockquote>
</td>
</tr>
@@ -33,19 +33,22 @@
<a href="sane-xsane-doc.html">Index</a>
<br>
<br>
-<br>
-<font color="#000000">Main window:</font>
+<font color="#000000">XSane mode:</font>
+<img SRC="xsane-target.jpg" alt="xsane-target">
<ul>
<li><a href="sane-xsane-viewer-doc.html">Viewer mode</a></li>
<li><a href="sane-xsane-save-doc.html">Save mode</a></li>
<li><a href="sane-xsane-copy-doc.html">Copy mode</a></li>
+<li><a href="sane-xsane-multipage-doc.html">Multipage mode</a></li>
<li><a href="sane-xsane-fax-doc.html">Fax mode</a></li>
-<li><a href="sane-xsane-mail-doc.html">Mail mode</a></li>
+<li><a href="sane-xsane-email-doc.html">E-mail mode</a></li>
<li><a href="sane-xsane-gimp-doc.html">Gimp plugin</a></li>
</ul>
<br>
-<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
+<a href="sane-xsane-scan-options-doc.html">Scan options</a>
+<br>
<br>
+<a href="sane-xsane-medium-definition-doc.html">Medium selection</a>
<br>
<br>
<a href="sane-xsane-color-correction-doc.html">Color correction:</a>
@@ -67,11 +70,9 @@
<a href="sane-xsane-standard-doc.html">Standard options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-advanced-doc.html">Advanced options window</a>
<br>
<br>
-<br>
<a href="sane-xsane-preview-doc.html">Preview:</a>
<ul>
<li><a href="sane-xsane-preview-doc.html#PIPETTE_WHITE">Pipette white</a></li>
@@ -111,8 +112,8 @@
<li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
<li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
<li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
+<li><a href="sane-xsane-setup-filetype-doc.html">Filetype setup</a></li>
+<li><a href="sane-xsane-setup-email-doc.html">E-mail setup</a></li>
<li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
</ul>
</td>
@@ -130,43 +131,31 @@ In the viewer mode an image is scanned and displayed in the viewer.
<br>
<br>
-<img SRC="xsane-colormode.jpg" alt="colormode">
+<img SRC="xsane-disk.jpg" alt="disk">
&nbsp;&nbsp;
-<b>Scanmode:</b>
+<b>Select filename:</b>
<blockquote>
-Select scanmode, e.g.: color, grayscale, halftone, lineart.
+If you press the disk icon a browse dialog is opened where you can select the name
+of the image file that is suggested for the viewer.
+You also can enter the filename directly to the text box right to the disk icon.
</blockquote>
-<img SRC="xsane-scansource.jpg" alt="scansource">
+
+<img SRC="xsane-step.jpg" alt="step">
&nbsp;&nbsp;
-<b>Scansource:</b>
+<b>Filename counter step width:</b>
<blockquote>
-Select scansource, e.g.: Flatbed, Transparency, Automatic Document Feeder.
+When the filename contains a counter at the end then the counter is increased (or decreased)
+by the selected step width when the scan has been completed.
</blockquote>
-
-<img SRC="xsane-medium.jpg" alt="medium">
-&nbsp;&nbsp;
-<b><a href="sane-xsane-medium-definition-doc.html">Medium selection:</a></b>
-<blockquote>
-Select scanmedium, e.g.: <i>slide</i>, <i>standard negative</i>,
-<i>Agfa negative</i>, ... or <i>Full range</i>.
-</blockquote>
-
-<img SRC="xsane-resolution.jpg" alt="resolution">
-&nbsp;&nbsp;
-<b>Scan resolution:</b>
+
+
+<b>Type:</b>
<blockquote>
-Select resolution that is used for scanning. If the backends makes available a
-range of resolutions (e.g. 100-600 dpi) XSane can display a slider or a
-list of resolutions. You select this via <i>Preferences/Show resolution list</i>.
-<br>
-The backend can define a list of resolutions insted of a range, in this
-case it is not possible to enable the slider.
-<p>
-To select exact resolutions with the slider click the slider with the mouse pointer
-and use the cursor keys to change the value in steps of 1, if you press <i>ctrl</i>
-and a cursor key the step is 10.
+Filetype and fileextension that are suggested for the viewer.
</blockquote>
+
+
<br>
<br>
<b>The viewer window:</b>
diff --git a/doc/xsane-adf-pages.jpg b/doc/xsane-adf-pages.jpg
new file mode 100644
index 0000000..ac37574
--- /dev/null
+++ b/doc/xsane-adf-pages.jpg
Binary files differ
diff --git a/doc/xsane-color-correction.jpg b/doc/xsane-color-correction.jpg
new file mode 100644
index 0000000..cc36b49
--- /dev/null
+++ b/doc/xsane-color-correction.jpg
Binary files differ
diff --git a/doc/xsane-copy-number.jpg b/doc/xsane-copy-number.jpg
new file mode 100644
index 0000000..f0efe08
--- /dev/null
+++ b/doc/xsane-copy-number.jpg
Binary files differ
diff --git a/doc/xsane-copy.jpg b/doc/xsane-copy.jpg
index 1c0686d..de7d3a9 100644
--- a/doc/xsane-copy.jpg
+++ b/doc/xsane-copy.jpg
Binary files differ
diff --git a/doc/xsane-email-project.jpg b/doc/xsane-email-project.jpg
new file mode 100644
index 0000000..95dc81d
--- /dev/null
+++ b/doc/xsane-email-project.jpg
Binary files differ
diff --git a/doc/xsane-email.jpg b/doc/xsane-email.jpg
new file mode 100644
index 0000000..6b49349
--- /dev/null
+++ b/doc/xsane-email.jpg
Binary files differ
diff --git a/doc/xsane-fax-project.jpg b/doc/xsane-fax-project.jpg
index e89f398..53a30fa 100644
--- a/doc/xsane-fax-project.jpg
+++ b/doc/xsane-fax-project.jpg
Binary files differ
diff --git a/doc/xsane-fax.jpg b/doc/xsane-fax.jpg
index ae77294..0fc3f5f 100644
--- a/doc/xsane-fax.jpg
+++ b/doc/xsane-fax.jpg
Binary files differ
diff --git a/doc/xsane-gimp.jpg b/doc/xsane-gimp.jpg
index a0babb2..1e27f12 100644
--- a/doc/xsane-gimp.jpg
+++ b/doc/xsane-gimp.jpg
Binary files differ
diff --git a/doc/xsane-guide-1-decoration.jpg b/doc/xsane-guide-1-decoration.jpg
new file mode 100644
index 0000000..38596da
--- /dev/null
+++ b/doc/xsane-guide-1-decoration.jpg
Binary files differ
diff --git a/doc/xsane-guide-10-scan.jpg b/doc/xsane-guide-10-scan.jpg
new file mode 100644
index 0000000..4795695
--- /dev/null
+++ b/doc/xsane-guide-10-scan.jpg
Binary files differ
diff --git a/doc/xsane-guide-2-menu.jpg b/doc/xsane-guide-2-menu.jpg
new file mode 100644
index 0000000..b97abe0
--- /dev/null
+++ b/doc/xsane-guide-2-menu.jpg
Binary files differ
diff --git a/doc/xsane-guide-3-options.jpg b/doc/xsane-guide-3-options.jpg
new file mode 100644
index 0000000..d7fa764
--- /dev/null
+++ b/doc/xsane-guide-3-options.jpg
Binary files differ
diff --git a/doc/xsane-guide-4.jpg b/doc/xsane-guide-4.jpg
new file mode 100644
index 0000000..b9f3a0a
--- /dev/null
+++ b/doc/xsane-guide-4.jpg
Binary files differ
diff --git a/doc/xsane-guide-4a-adf-pages.jpg b/doc/xsane-guide-4a-adf-pages.jpg
new file mode 100644
index 0000000..d4a2e91
--- /dev/null
+++ b/doc/xsane-guide-4a-adf-pages.jpg
Binary files differ
diff --git a/doc/xsane-guide-4b-xsane-mode.jpg b/doc/xsane-guide-4b-xsane-mode.jpg
new file mode 100644
index 0000000..e4c6697
--- /dev/null
+++ b/doc/xsane-guide-4b-xsane-mode.jpg
Binary files differ
diff --git a/doc/xsane-guide-5-saving-options.jpg b/doc/xsane-guide-5-saving-options.jpg
new file mode 100644
index 0000000..3f2bee9
--- /dev/null
+++ b/doc/xsane-guide-5-saving-options.jpg
Binary files differ
diff --git a/doc/xsane-guide-6-scan-options.jpg b/doc/xsane-guide-6-scan-options.jpg
new file mode 100644
index 0000000..3de4839
--- /dev/null
+++ b/doc/xsane-guide-6-scan-options.jpg
Binary files differ
diff --git a/doc/xsane-guide-7-medium-selection.jpg b/doc/xsane-guide-7-medium-selection.jpg
new file mode 100644
index 0000000..5d6fe2a
--- /dev/null
+++ b/doc/xsane-guide-7-medium-selection.jpg
Binary files differ
diff --git a/doc/xsane-guide-8-resolution.jpg b/doc/xsane-guide-8-resolution.jpg
new file mode 100644
index 0000000..f6523d1
--- /dev/null
+++ b/doc/xsane-guide-8-resolution.jpg
Binary files differ
diff --git a/doc/xsane-guide-9-color-correction.jpg b/doc/xsane-guide-9-color-correction.jpg
new file mode 100644
index 0000000..71888ef
--- /dev/null
+++ b/doc/xsane-guide-9-color-correction.jpg
Binary files differ
diff --git a/doc/xsane-mail-project.jpg b/doc/xsane-mail-project.jpg
deleted file mode 100644
index ff8cd0a..0000000
--- a/doc/xsane-mail-project.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/xsane-mail.jpg b/doc/xsane-mail.jpg
deleted file mode 100644
index 93163d8..0000000
--- a/doc/xsane-mail.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/xsane-multipage-project.jpg b/doc/xsane-multipage-project.jpg
new file mode 100644
index 0000000..c5a65f3
--- /dev/null
+++ b/doc/xsane-multipage-project.jpg
Binary files differ
diff --git a/doc/xsane-multipage.jpg b/doc/xsane-multipage.jpg
new file mode 100644
index 0000000..bd8cd7b
--- /dev/null
+++ b/doc/xsane-multipage.jpg
Binary files differ
diff --git a/doc/xsane-save.jpg b/doc/xsane-save.jpg
index 994f633..ff22036 100644
--- a/doc/xsane-save.jpg
+++ b/doc/xsane-save.jpg
Binary files differ
diff --git a/doc/xsane-setup-copy.jpg b/doc/xsane-setup-copy.jpg
index 7f5cbca..c097868 100644
--- a/doc/xsane-setup-copy.jpg
+++ b/doc/xsane-setup-copy.jpg
Binary files differ
diff --git a/doc/xsane-setup-display.jpg b/doc/xsane-setup-display.jpg
index 6997540..ae372f6 100644
--- a/doc/xsane-setup-display.jpg
+++ b/doc/xsane-setup-display.jpg
Binary files differ
diff --git a/doc/xsane-setup-email.jpg b/doc/xsane-setup-email.jpg
new file mode 100644
index 0000000..dbc876f
--- /dev/null
+++ b/doc/xsane-setup-email.jpg
Binary files differ
diff --git a/doc/xsane-setup-enhancement.jpg b/doc/xsane-setup-enhancement.jpg
index 2a2e67d..ade9c2f 100644
--- a/doc/xsane-setup-enhancement.jpg
+++ b/doc/xsane-setup-enhancement.jpg
Binary files differ
diff --git a/doc/xsane-setup-fax.jpg b/doc/xsane-setup-fax.jpg
index 113e950..984f629 100644
--- a/doc/xsane-setup-fax.jpg
+++ b/doc/xsane-setup-fax.jpg
Binary files differ
diff --git a/doc/xsane-setup-filetype.jpg b/doc/xsane-setup-filetype.jpg
new file mode 100644
index 0000000..c5bf70e
--- /dev/null
+++ b/doc/xsane-setup-filetype.jpg
Binary files differ
diff --git a/doc/xsane-setup-image.jpg b/doc/xsane-setup-image.jpg
deleted file mode 100644
index 2476862..0000000
--- a/doc/xsane-setup-image.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/xsane-setup-mail.jpg b/doc/xsane-setup-mail.jpg
deleted file mode 100644
index 7c6f176..0000000
--- a/doc/xsane-setup-mail.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/xsane-setup-ocr.jpg b/doc/xsane-setup-ocr.jpg
index 051ad42..df64bcc 100644
--- a/doc/xsane-setup-ocr.jpg
+++ b/doc/xsane-setup-ocr.jpg
Binary files differ
diff --git a/doc/xsane-setup-save.jpg b/doc/xsane-setup-save.jpg
index 556a025..a9dcf4b 100644
--- a/doc/xsane-setup-save.jpg
+++ b/doc/xsane-setup-save.jpg
Binary files differ
diff --git a/doc/xsane-step.jpg b/doc/xsane-step.jpg
new file mode 100644
index 0000000..3dc7e5c
--- /dev/null
+++ b/doc/xsane-step.jpg
Binary files differ
diff --git a/doc/xsane-target.jpg b/doc/xsane-target.jpg
new file mode 100644
index 0000000..ca74b5e
--- /dev/null
+++ b/doc/xsane-target.jpg
Binary files differ
diff --git a/doc/xsane-viewer.jpg b/doc/xsane-viewer.jpg
index 680a8f8..edf6cc1 100644
--- a/doc/xsane-viewer.jpg
+++ b/doc/xsane-viewer.jpg
Binary files differ