Prechádzať zdrojové kódy

doc/manual: Rework image handling.

* doc/manual/Makefile.am: Do not convert PNGs to PDFs first for the
PDF manual, do not scale the EPS pictures down.
* doc/manual/scute.texi: Scale and center images for the LaTeX-based
formats.

Signed-off-by: Justus Winter <justus@g10code.com>
Justus Winter 9 rokov pred
rodič
commit
1ecff306ed
3 zmenil súbory, kde vykonal 8 pridanie a 13 odobranie
  1. 0 1
      TODO
  2. 3 7
      doc/manual/Makefile.am
  3. 5 5
      doc/manual/scute.texi

+ 0 - 1
TODO

@@ -2,7 +2,6 @@
 
 
 * Manual:
 * Manual:
 ** Some FIXME's which need attention.
 ** Some FIXME's which need attention.
-** The pictures in PDF output are blurry.
 ** The pictures in info output do not exist.
 ** The pictures in info output do not exist.
 
 
 * Bugs or misfeatures:
 * Bugs or misfeatures:

+ 3 - 7
doc/manual/Makefile.am

@@ -36,11 +36,10 @@ images = firefox-cm.png firefox-cm-view-detail.png firefox-cm-view.png \
 	firefox-dm-load.png firefox-dm-token-present.png firefox-pref.png \
 	firefox-dm-load.png firefox-dm-token-present.png firefox-pref.png \
 	firefox-pref-view.png
 	firefox-pref-view.png
 
 
-images_pdf = $(images:.png=.pdf)
 images_eps = $(images:.png=.eps)
 images_eps = $(images:.png=.eps)
 
 
 EXTRA_DIST = $(images)
 EXTRA_DIST = $(images)
-CLEANFILES = $(images_pdf) $(images_eps)
+CLEANFILES = $(images_eps)
 
 
 info_TEXINFOS = scute.texi
 info_TEXINFOS = scute.texi
 scute_TEXINFOS = gpl.texi
 scute_TEXINFOS = gpl.texi
@@ -52,10 +51,7 @@ scute.html/%.png: %.png
 	cp -v "$<" "$@"
 	cp -v "$<" "$@"
 
 
 scute.dvi: $(images_eps)
 scute.dvi: $(images_eps)
-scute.pdf: $(images_pdf)
+scute.pdf: $(images)
 
 
 %.eps : %.png
 %.eps : %.png
-	$(CONVERT) -resize 50% `test -f '$<' || echo '$(srcdir)/'`$< $@
-
-%.pdf : %.eps
-	$(EPSTOPDF) `test -f '$<' || echo '$(srcdir)/'`$< --outfile=$@
+	$(CONVERT) `test -f '$<' || echo '$(srcdir)/'`$< $@

+ 5 - 5
doc/manual/scute.texi

@@ -481,12 +481,12 @@ the preferences configuration dialog, you should select the
 @code{Advanced} configuration section, then the @code{Security} tab, and
 @code{Advanced} configuration section, then the @code{Security} tab, and
 then select @code{Security Devices} in the category @code{Certificates}.
 then select @code{Security Devices} in the category @code{Certificates}.
 
 
-@image{firefox-pref}
+@center @image{firefox-pref,13cm}
 
 
 In the devices manager dialog, you can select @code{Load} to load a new
 In the devices manager dialog, you can select @code{Load} to load a new
 PKCS #11 device.
 PKCS #11 device.
 
 
-@image{firefox-dm-load-before}
+@center @image{firefox-dm-load-before,13cm}
 
 
 In the pop-up dialog that follows, you can give a module name
 In the pop-up dialog that follows, you can give a module name
 (e.g. ``@code{Scute}'') and a module filename.  The latter should
 (e.g. ``@code{Scute}'') and a module filename.  The latter should
@@ -497,14 +497,14 @@ file name @file{/usr/local/lib/scute.so}.  If you or your system
 administrator installed Scute in a different location, you have to
 administrator installed Scute in a different location, you have to
 adjust the file name correspondingly.
 adjust the file name correspondingly.
 
 
-@image{firefox-dm-load}
+@center @image{firefox-dm-load,8cm}
 
 
 After confirming installation of the security device, a pop-up window
 After confirming installation of the security device, a pop-up window
 should confirm that the module was successfully loaded, and an entry for
 should confirm that the module was successfully loaded, and an entry for
 the security device should appear in the device manager list of
 the security device should appear in the device manager list of
 @code{Security Modules and Devices}.
 @code{Security Modules and Devices}.
 
 
-@image{firefox-dm-load-after}
+@center @image{firefox-dm-load-after,15cm}
 
 
 When you insert the OpenPGP card for which you generated and imported a
 When you insert the OpenPGP card for which you generated and imported a
 certificate earlier (see @ref{Certificate Preparation}), the device
 certificate earlier (see @ref{Certificate Preparation}), the device
@@ -512,7 +512,7 @@ manager should detect this security token and display some information
 about it in the @code{Details} list when you select it from the module
 about it in the @code{Details} list when you select it from the module
 list.
 list.
 
 
-@image{firefox-dm-token-present}
+@center @image{firefox-dm-token-present,15cm}
 
 
 FIXME: Add some documentation and screenshots for the certificate
 FIXME: Add some documentation and screenshots for the certificate
 manager.
 manager.