Enblend

Bugs item #3040388, was opened at 2010-08-06 07:36
Message generated for change (Settings changed) made by iainlea
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=696409&aid=3040388&group_id=123407

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: Internal error
Group: v4.0
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Iain Lea (iainlea)
Assigned to: Nobody/Anonymous (nobody)
>Summary: Enblend 4.0 + OpenMP + Fedora 13 64bit  = crash

Initial Comment:
Recompiled the enblend-4.0 SRPM package from Fedora 13 on x86_64 to use --enable-openmp.

Images are a 9 bracketed set of jpeg's converted from 9 Nikon D300 nef raw files.

Repeatable crash on   $ enfuse --compression=100 in*jpg -o out.jpg

Hardware is i7-920 / 12GB RAM / 300GB raptor / Nvidia GTS250

$ uname -a

Linux studio.bricbrac.de 2.6.33.6-147.fc13.x86_64 #1 SMP Tue Jul 6 22:32:17 UTC 2010 x86_64 x86_64 x86_64 GNU/Linux


$ rpm -qa | egrep glibc

glibc-2.12-3.i686
glibc-2.12-3.x86_64
glibc-common-2.12-3.x86_64
glibc-devel-2.12-3.i686
glibc-devel-2.12-3.x86_64
glibc-headers-2.12-3.x86_64


$ rpm -qa | egrep gomp

libgomp-4.4.4-10.fc13.x86_64


$ rpm -qa | egrep gcc

gcc-4.4.4-10.fc13.x86_64
gcc-c++-4.4.4-10.fc13.x86_64
gcc-gfortran-4.4.4-10.fc13.x86_64
gcc-java-4.4.4-10.fc13.x86_64
libgcc-4.4.4-10.fc13.i686
libgcc-4.4.4-10.fc13.x86_64


$ enfuse --compression=100 20100804_01*jpg -o out.jpg

enfuse: info: input image "20100804_011_EV0.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_012_EV-4.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_013_EV-3.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_014_EV-2.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_015_EV-1.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_016_EV+1.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_017_EV+2.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_018_EV+3.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_019_EV+4.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: warning: no usable resolution found in first image "20100804_011_EV0.jpg";
enfuse: warning:   will use 300 dpi
enfuse: info: loading next image: 20100804_011_EV0.jpg 1/1
*** glibc detected *** enfuse: double free or corruption (fasttop): 0x00000000020f1580 ***
======= Backtrace: =========
/lib64/libc.so.6[0x3791c75676]
enfuse[0x4604af]
enfuse[0x47d43a]
enfuse[0x43c257]
/usr/lib64/libgomp.so.1[0x37a3808022]
/lib64/libpthread.so.0[0x3792007761]
/lib64/libc.so.6(clone+0x6d)[0x3791ce14ed]
======= Memory map: ========
00400000-007c9000 r-xp 00000000 08:03 1294938                            /usr/bin/enfuse
009c9000-009cb000 rw-p 003c9000 08:03 1294938                            /usr/bin/enfuse
009cb000-00a0d000 rw-p 00000000 00:00 0
020d4000-02115000 rw-p 00000000 00:00 0                                  [heap]
3791800000-379181e000 r-xp 00000000 08:03 16638075                       /lib64/ld-2.12.so
3791a1e000-3791a1f000 r--p 0001e000 08:03 16638075                       /lib64/ld-2.12.so
3791a1f000-3791a20000 rw-p 0001f000 08:03 16638075                       /lib64/ld-2.12.so
3791a20000-3791a21000 rw-p 00000000 00:00 0
3791c00000-3791d75000 r-xp 00000000 08:03 16638084                       /lib64/libc-2.12.so
3791d75000-3791f75000 ---p 00175000 08:03 16638084                       /lib64/libc-2.12.so
3791f75000-3791f79000 r--p 00175000 08:03 16638084                       /lib64/libc-2.12.so
3791f79000-3791f7a000 rw-p 00179000 08:03 16638084                       /lib64/libc-2.12.so
3791f7a000-3791f7f000 rw-p 00000000 00:00 0
3792000000-3792017000 r-xp 00000000 08:03 16638137                       /lib64/libpthread-2.12.so
3792017000-3792216000 ---p 00017000 08:03 16638137                       /lib64/libpthread-2.12.so
3792216000-3792217000 r--p 00016000 08:03 16638137                       /lib64/libpthread-2.12.so
3792217000-3792218000 rw-p 00017000 08:03 16638137                       /lib64/libpthread-2.12.so
3792218000-379221c000 rw-p 00000000 00:00 0
3792400000-3792483000 r-xp 00000000 08:03 16638155                       /lib64/libm-2.12.so
3792483000-3792682000 ---p 00083000 08:03 16638155                       /lib64/libm-2.12.so
3792682000-3792683000 r--p 00082000 08:03 16638155                       /lib64/libm-2.12.so
3792683000-3792684000 rw-p 00083000 08:03 16638155                       /lib64/libm-2.12.so
3792c00000-3792c15000 r-xp 00000000 08:03 16638157                       /lib64/libz.so.1.2.3
3792c15000-3792e14000 ---p 00015000 08:03 16638157                       /lib64/libz.so.1.2.3
3792e14000-3792e15000 rw-p 00014000 08:03 16638157                       /lib64/libz.so.1.2.3
3793000000-3793007000 r-xp 00000000 08:03 16638138                       /lib64/librt-2.12.so
3793007000-3793206000 ---p 00007000 08:03 16638138                       /lib64/librt-2.12.so
3793206000-3793207000 r--p 00006000 08:03 16638138                       /lib64/librt-2.12.so
3793207000-3793208000 rw-p 00007000 08:03 16638138                       /lib64/librt-2.12.so
3793800000-379381b000 r-xp 00000000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
379381b000-3793a1b000 ---p 0001b000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
3793a1b000-3793a1c000 rw-p 0001b000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
3796000000-3796026000 r-xp 00000000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796026000-3796225000 ---p 00026000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796225000-3796226000 rw-p 00025000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796400000-3796416000 r-xp 00000000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3796416000-3796615000 ---p 00016000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3796615000-3796616000 rw-p 00015000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3798400000-37984e9000 r-xp 00000000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37984e9000-37986e9000 ---p 000e9000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986e9000-37986f0000 r--p 000e9000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986f0000-37986f2000 rw-p 000f0000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986f2000-3798707000 rw-p 00000000 00:00 0
3799400000-3799404000 r-xp 00000000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
3799404000-3799604000 ---p 00004000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
3799604000-3799605000 rw-p 00004000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
379a000000-379a042000 r-xp 00000000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a042000-379a241000 ---p 00042000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a241000-379a242000 rw-p 00041000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a400000-379a41a000 r-xp 00000000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a41a000-379a619000 ---p 0001a000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a619000-379a61d000 rw-p 00019000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a800000-379a8c3000 r-xp 00000000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379a8c3000-379aac3000 ---p 000c3000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379aac3000-379aac7000 rw-p 000c3000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379ac00000-379ac06000 r-xp 00000000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
379ac06000-379ae05000 ---p 00006000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
379ae05000-379ae06000 rw-p 00005000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
37a2e00000-37a2e24000 r-xp 00000000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a2e24000-37a3023000 ---p 00024000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a3023000-37a3024000 rw-p 00023000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a3800000-37a380d000 r-xp 00000000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a380d000-37a3a0c000 ---p 0000d000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a3a0c000-37a3a0d000 rw-p 0000c000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a6a00000-37a6a35000 r-xp 00000000 08:03 12964250                       /usr/lib64/liblcms.so.1.
Abort (core dumped)



----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=696409&aid=3040388&group_id=123407

changeset a4bad9c152a5 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=a4bad9c152a5
description:
	Extend the documentation such that DocBook XML can be generated.
	Install Makefile rules that allow for producing this new format.

diffstat:

 README                            |    20 +-
 VERSION                           |     2 +-
 doc/Makefile.am                   |    42 +-
 doc/auxmac.texi                   |    99 +-
 doc/bug-reports.texi              |    20 +-
 doc/default.css                   |     5 +
 doc/enblend.info                  |     0 
 doc/enblend.texi                  |   559 +++++++---
 doc/enfuse.info                   |     0 
 doc/enfuse.texi                   |  1758 +++++++++++++++++++++++++++++-------
 doc/filespec.texi                 |     3 +
 doc/html2xhtml                    |    29 +-
 doc/makeinfo-4.13-docbook.sed     |    68 +
 doc/mask-template-characters.texi |     9 +-
 doc/tuning-memory-usage.texi      |    41 +
 doc/versenblend.texi              |     6 +-
 doc/versenfuse.texi               |     6 +-
 doc/workflow.texi                 |    14 +-
 src/enfuse.cc                     |     2 +-
 19 files changed, 2102 insertions(+), 581 deletions(-)

diffs (truncated from 4063 to 1000 lines):

diff -r a343c9a5b48f -r a4bad9c152a5 README
--- a/README	Wed Aug 18 11:11:07 2010 +0200
+++ b/README	Fri Aug 20 17:12:02 2010 +0200
@@ -352,14 +352,28 @@
         src/enfuse.1
 
 After the configuration you can build documentation in PostScript,
-PDF, and XHTML format.
+PDF, XHTML, and DocBook-XML format.
         make ps
         make pdf
         make xhtml
+        make xml
 
-The make process automatically ensures the validity of the XHTML
-documentation.  Additionally, it can be checked with
+The make process automatically ensures the validity of the XHTML and
+DocBook-XML documentation.  Additionally, it can be checked with
         make validate-xhtml
+        make validate-xml
+
+The DocBook-XML format can be processed with, e.g. dblatex(1), like
+        dblatex --type=ps enblend.xml
+        dblatex --type=ps enfuse.xml
+selecting a format with "--type=FORMAT", where FORMAT is "tex", "dvi",
+"ps", or "pdf" (default).  Another possibility is to use xmlto(1):
+        xmlto xhtml-nochunks enblend.xml    # or just "html"
+        xmlto ps enblend.xml
+        xmlto pdf enblend.xml
+
+The number of available output formats vary.  (See, e.g.
+/usr/share/xmlto/format/docbook)
 
 Note that some additional packages are required to build these
 formats:
diff -r a343c9a5b48f -r a4bad9c152a5 VERSION
--- a/VERSION	Wed Aug 18 11:11:07 2010 +0200
+++ b/VERSION	Fri Aug 20 17:12:02 2010 +0200
@@ -1,1 +1,1 @@
-4.1-619f95bd56d5
+4.1-a343c9a5b48f
diff -r a343c9a5b48f -r a4bad9c152a5 doc/Makefile.am
--- a/doc/Makefile.am	Wed Aug 18 11:11:07 2010 +0200
+++ b/doc/Makefile.am	Fri Aug 20 17:12:02 2010 +0200
@@ -45,7 +45,7 @@
 
 TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
 
-EXTRA_DIST = docstrings seam-line-visualization.tif
+EXTRA_DIST = docstrings seam-line-visualization.tif makeinfo-4.13-docbook.sed
 
 RASTER_DIR = @RASTER_DIR@
 
@@ -64,6 +64,7 @@
              sharp-edge.{txt,eps,svg,pdf} \
              smooth-edge.{txt,eps,svg,pdf} \
              seam-line-visualization.{eps,png} \
+             *.xml \
              *.fig.bak \
              *.msg
 
@@ -144,6 +145,16 @@
 	done
 
 
+.PHONY: xml
+xml: $(info_TEXINFOS:.texi=.xml)
+
+.PHONY: validate-xml
+validate-xml: $(info_TEXINFOS:.texi=.xml)
+	for x in $(info_TEXINFOS); do \
+	  $(XMLLINT) $(XMLLINT_FLAGS) `basename $$x .texi`.xml; \
+	done
+
+
 # Implicit Rules
 
 %.txt: %.gp
@@ -221,6 +232,17 @@
 	    $<
 
 
+%.xml: %.texi
+	- $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook --output=- $< > $(basename $@)-orig.xml
+	$(SED) \
+	    -e '1,100s#<book id="\([^"]*\)"#<book id="$@"#' \
+	    -f $(srcdir)/../doc/makeinfo-4.13-docbook.sed \
+	    < $(basename $@)-orig.xml > $(basename $@)-clean.xml
+	$(XMLLINT) \
+	    --valid --noblanks --noent --nsclean --format --encode iso-8859-1 $(basename $@)-clean.xml \
+	    > $@ || { rm $@; false; }
+
+
 # Explicit Rules
 
 varsenblend.texi: $(srcdir)/../src/enblend.cc \
@@ -249,6 +271,11 @@
 
 enblend.xhtml: enblend.html
 
+enblend.xml: $(enblend_TEXINFOS) \
+             $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
+             photographic-workflow.svg \
+             seam-line-visualization.png
+
 
 varsenfuse.texi: $(srcdir)/../src/enfuse.cc \
                  $(srcdir)/../src/bounds.h \
@@ -309,3 +336,16 @@
             smooth-edge.pdf
 
 enfuse.xhtml: enfuse.html
+
+enfuse.xml: $(enfuse_TEXINFOS) \
+            $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
+            photographic-workflow.svg \
+            focus-stack-decision-tree.svg \
+            entropy.svg \
+            entropy-cutoff.svg \
+            exposure-cutoff.svg \
+            gaussian.svg \
+            laplacian-of-gaussian.svg \
+            local-analysis-window.svg \
+            sharp-edge.svg \
+            smooth-edge.svg
diff -r a343c9a5b48f -r a4bad9c152a5 doc/auxmac.texi
--- a/doc/auxmac.texi	Wed Aug 18 11:11:07 2010 +0200
+++ b/doc/auxmac.texi	Fri Aug 20 17:12:02 2010 +0200
@@ -2,13 +2,53 @@
 @c Macro Definitions
 @c
 
+@c redefined commands
+
+@c Get the spacing of dimensions right.
+@ifnottex
+@macro dmn{unit}
+@tie{}\unit\
+@end macro
+@end ifnottex
+
+
 @c extended commands
 
-@... Include an image in a variety of ways: 1/ The Info format includes
-@... unchanged.  2/ XHTML first tries SVG then PNG in the ``raster''
-@... subdirectory; if both fail, we leave a textual tombstone.  Here,
-@... the CSS must take care of centering of the graphic.  3/ TeX and
-@... PDFTeX center the graphic.
+@c Add a title to a DocBook element.
+@macro dbtitle{title}
+@docbook
+\title\
+@end docbook
+@end macro
+
+
+@c Include a raster image.
+@macro rimage{filename, width}
+@ifinfo
+@image{\filename\, \width\}
+@end ifinfo
+@ifhtml
+@image{\filename\, \width\}
+@end ifhtml
+@iftex
+@center@...\, \width\}
+@end iftex
+@ifdocbook
+@image{\filename\, \width\}
+@end ifdocbook
+@docbook
+@c Yikes!  The DocBook output of makeinfo 4.13a is so broken that we
+@c must supply the closing tag here.
+</figure>
+@end docbook
+@end macro
+
+
+@c Include a vector image in a variety of ways: 1/ The Info format
+@c includes unchanged.  2/ XHTML first tries SVG then PNG in the
+@c ``raster'' subdirectory; if both fail, we leave a textual
+@c tombstone.  Here, the CSS must take care of centering of the
+@c graphic.  3/ TeX and PDFTeX center the graphic.  4/ DocBook?
 @macro vimage{filename}
 @ifinfo
 @image{\filename\}
@@ -27,11 +67,36 @@
 @iftex
 @center@...\}
 @end iftex
+@ifdocbook
+@image{\filename\}
+@end ifdocbook
+@docbook
+@c Yikes!  The DocBook output of makeinfo 4.13a is so broken that we
+@c must supply the closing tag here.
+</figure>
+@end docbook
 @end macro
 
 
 @c Operators
 
+@c Generate a nice representation of base^exponent.
+@macro power{base, exponent}
+@ifinfo
+\base\^\exponent\
+@end ifinfo
+@html
+\base\<sup>\exponent\</sup>
+@end html
+@tex
+$\base\^{\exponent\}$%
+@end tex
+@docbook
+\base\<superscript>\exponent\</superscript>
+@end docbook
+@end macro
+
+
 @macro classictimes
 @ifinfo
 x@... gobble following newline  -- The Tricks of a Texinfo Wizard.
@@ -42,6 +107,9 @@
 @tex
 \\ifmmode\\times\\else$\\times$\\fi% gobble following newline  -- The Tricks of a TeX Wizard.
 @end tex
+@docbook
+&times;
+@end docbook
 @end macro
 
 
@@ -55,6 +123,9 @@
 @html
 &ge;
 @end html
+@docbook
+&ge;
+@end docbook
 @end macro
 @end ifnottex
 
@@ -69,6 +140,9 @@
 @html
 &le;
 @end html
+@docbook
+&le;
+@end docbook
 @end macro
 @end ifnottex
 
@@ -83,6 +157,9 @@
 @tex
 \\ifmmode\\pm\\else$\\pm$\\fi%
 @end tex
+@docbook
+&plusmn;
+@end docbook
 @end macro
 
 
@@ -100,6 +177,9 @@
 @tex
 $\\omega$%
 @end tex
+@docbook
+&omega;
+@end docbook
 @end macro
 
 
@@ -115,6 +195,9 @@
 @tex
 $\\sigma$%
 @end tex
+@docbook
+&sigma;
+@end docbook
 @end macro
 
 
@@ -130,6 +213,9 @@
 @tex
 $\\xi$%
 @end tex
+@docbook
+&xi;
+@end docbook
 @end macro
 
 
@@ -169,4 +255,7 @@
 @tex
 \\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
 @end tex
+@docbook
+\significant\&times;10<superscript>\exponent\</superscript>
+@end docbook
 @end macro
diff -r a343c9a5b48f -r a4bad9c152a5 doc/bug-reports.texi
--- a/doc/bug-reports.texi	Wed Aug 18 11:11:07 2010 +0200
+++ b/doc/bug-reports.texi	Fri Aug 20 17:12:02 2010 +0200
@@ -100,22 +100,22 @@
 Examples:
 
 @example
-    ~/local/bin/enblend -v \
-        --fine-mask \
-        --optimizer-weights=3:2 --mask-vectorize=12.5% \
-        image-1.png image-2.png
+~/local/bin/enblend -v \
+    --fine-mask \
+    --optimizer-weights=3:2 --mask-vectorize=12.5% \
+    image-1.png image-2.png
 @end example
 
 @noindent
 or:
 
 @example
-    /local/bin/enfuse \
-        --verbose \
-        --exposure-weight=0 --saturation-weight=0 --entropy-weight=1 \
-        --gray-projector=l-star \
-        --entropy-cutoff=1.667% \
-        layer-01.ppm layer-02.ppm layer-03.ppm
+/local/bin/enfuse \
+    --verbose \
+    --exposure-weight=0 --saturation-weight=0 --entropy-weight=1 \
+    --gray-projector=l-star \
+    --entropy-cutoff=1.667% \
+    layer-01.ppm layer-02.ppm layer-03.ppm
 @end example
 
 @cindex Hugin
diff -r a343c9a5b48f -r a4bad9c152a5 doc/default.css
--- a/doc/default.css	Wed Aug 18 11:11:07 2010 +0200
+++ b/doc/default.css	Fri Aug 20 17:12:02 2010 +0200
@@ -56,6 +56,11 @@
 
 math {display: block}
 math[display=inline] {display: inline}
+math[display=separate] {
+    margin-left: auto;
+    margin-right: auto;
+    width: 88%;
+}
 
 pre.example {}
 pre.display {font-family: sans-serif}
diff -r a343c9a5b48f -r a4bad9c152a5 doc/enblend.info
Binary file doc/enblend.info has changed
diff -r a343c9a5b48f -r a4bad9c152a5 doc/enblend.texi
--- a/doc/enblend.texi	Wed Aug 18 11:11:07 2010 +0200
+++ b/doc/enblend.texi	Fri Aug 20 17:12:02 2010 +0200
@@ -8,9 +8,9 @@
 
 @c %**start of header
 @setfilename enblend.info
+@include versenblend.texi
 @settitle Combining Multiple Images with Enblend @value{VERSION}
 @include auxmac.texi
-@... versenblend.texi
 @include varsenblend.texi
 @include config-h.texi
 
@@ -74,6 +74,7 @@
 @end titlepage
 
 
+@c Enblend's TOC is so small that we do not need a Summary-TOC yet.
 @c @ifnothtml
 @c @summarycontents
 @c @end ifnothtml
@@ -123,12 +124,14 @@
 * Tuning Memory Usage::         Balancing @acronym{RAM} and swap
 * Helpful Programs::            Useful other programs
 * Bug Reports::                 How to write bug reports
-* Authors::                     Major Contributors
+* Authors::                     Major contributors
 * FDL::                         @acronym{GNU} Free Documentation License
+@ifnotdocbook
 * Program Index::               Names of programs referenced
 * Syntactic-Comment Index::     Keys of syntactic comments
 * Option Index::                Index of all options
 * General Index::               Topic index
+@end ifnotdocbook
 @end menu
 
 
@@ -148,21 +151,21 @@
 @cindex overview
 
 @cindex Burt-Adelson multiresolution spline
-Enblend overlays multiple @acronym{TIFF} images using the
-@...} multiresolution spline
-algorithm.@... J. Burt} and @sc{Edward H. Adelson}, ``A
-Multiresolution Spline With Application to Image Mosaics'',
-@...} Transactions on Graphics, @abbr{Vol@.} 2, @abbr{No@.} 4,
-October 1983, pages 217--236.}  This technique tries to make the seams
-between the input images invisible.  The basic idea is that image
-features should be blended across a transition zone proportional in
-size to the spatial frequency of the features.  For example, objects
-like trees and windowpanes have rapid changes in color.  By blending
-these features in a narrow zone, you will not be able to see the seam
-because the eye already expects to see color changes at the edge of
-these features.  Clouds and sky are the opposite.  These features have
-to be blended across a wide transition zone because any sudden change
-in color will be immediately noticeable.
+Enblend overlays multiple images using the @sc{Burt}-@...}
+multiresolution spline algorithm.@... J. Burt} and
+@sc{Edward H. Adelson}, ``A Multiresolution Spline With Application to
+Image Mosaics'', @acronym{ACM} Transactions on Graphics, @abbr{Vol@.}
+2, @abbr{No@.} 4, October 1983, pages 217--236.}  This technique tries
+to make the seams between the input images invisible.  The basic idea
+is that image features should be blended across a transition zone
+proportional in size to the spatial frequency of the features.  For
+example, objects like trees and windowpanes have rapid changes in
+color.  By blending these features in a narrow zone, you will not be
+able to see the seam because the eye already expects to see color
+changes at the edge of these features.  Clouds and sky are the
+opposite.  These features have to be blended across a wide transition
+zone because any sudden change in color will be immediately
+noticeable.
 
 @cindex alpha channel
 @cindex channel, alpha
@@ -280,7 +283,7 @@
 @cindex compression
 Write a compressed output file.
 
-Depending on the output file format Enblend accepts different values
+Depending on the output file format, Enblend accepts different values
 for @var{COMPRESSION}.
 
 @table @asis
@@ -314,8 +317,8 @@
 @item packbits
 @cindex packbits compression
 @cindex compression, packbits
-Use @sc{PackBits} compression scheme.  @sc{PackBits} is particular
-variant of run-length compression.  It is lossless.
+Use @sc{PackBits} compression scheme.  @sc{PackBits} is a particular
+variant of run-length compression; it is lossless.
 @end table
 
 @item Any other format
@@ -356,9 +359,9 @@
 twice as large as the previous one.  So, the zeroth layer, the
 original image, obviously defines the image at single-pixel scale, the
 first level works at two-pixel scale, and generally, the @math{n}-th
-level contains image data at @math{2^n}-pixel scale.  This is the
+level contains image data at @power{2, n}-pixel scale.  This is the
 reason why an image of
-@... cannot be
+@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
 deconstructed into a pyramid of more than
 @ifinfo
 @display
@@ -366,35 +369,57 @@
 @end display
 @end ifinfo
 @html
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-    <mrow>
+<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+    <mrowinline>
         <mo>&LeftFloor;</mo>
-        <mrow>
-            <msub>
+        <mrowinline>
+            <msubinline>
                 <mo>log</mo>
                 <mn>2</mo>
-            </msub>
+            </msubinline>
             <mo>&ApplyFunction;</mo>
             <mo>(</mo>
-            <mrow>
+            <mrowinline>
                 <mo>min</mo>
                 <mo>&ApplyFunction;</mo>
-                <mfenced>
+                <mfencedinline>
                     <mi mathvariant="italic">width</mi>
                     <mi mathvariant="italic">height</mi>
-                </mfenced>
-            </mrow>
+                </mfencedinline>
+            </mrowinline>
             <mo>)</mo>
-        </mrow>
+        </mrowinline>
         <mo>&RightFloor;</mo>
-    </mrow>
-</math>
+    </mrowinline>
+</mathinline>
 @end html
 @tex
-$$
-    \lfloor \log_2(\min(\mathit{width}, \mathit{height})) \rfloor
-$$
+$\lfloor \log_2(\min(\mathit{width}, \mathit{height})) \rfloor$
 @end tex
+@docbook
+<inlineequation>
+    <mml:math>
+        <mml:apply>
+            <mml:floor/>
+            <mml:apply>
+                <mml:log/>
+                <mml:logbase>
+                    <mml:cn>2</mml:cn>
+                </mml:logbase>
+                <mml:apply>
+                    <mml:min/>
+                    <mml:csymbol>
+                        <mml:mi mathvariant="italic">width</mml:mi>
+                    </mml:csymbol>
+                    <mml:csymbol>
+                        <mml:mi mathvariant="italic">height</mml:mi>
+                    </mml:csymbol>
+                </mml:apply>
+            </mml:apply>
+        </mml:apply>
+    </mml:math>
+</inlineequation>&nbsp;
+@end docbook
 levels.
 
 If too few levels are used, ``halos'' around regions of strong local
@@ -474,9 +499,8 @@
 @opindex --version
 Output information on the Enblend version.
 
-Team this option with @option{--verbose} to inquire about
-configuration details, like the extra features that have been compiled
-in.
+Team this option with @option{--verbose} to show configuration
+details, like the extra features that have been compiled in.
 
 @item -w
 @itemx --wrap=@var{MODE}
@@ -508,8 +532,44 @@
 With this option Enblend treats the panorama of width@...}
 and height@...} as an infinite data structure, where each
 pixel@..., y)} of the input images represents the set of
-pixels@..., y)}@footnote{Solid-state physicists will be
-reminded of the
+pixels
+@ifinfo
+@math{S_P(x, y)}
+@end ifinfo
+@html
+<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+    <mrowinline>
+        <msubinline>
+            <mi>S</mi>
+            <mi>P</mi>
+        </msubinline>
+        <mfencedinline>
+            <mi>x</mi>
+            <mi>y</mi>
+        </mfencedinline>
+    </mrowinline>
+</mathinline>
+@end html
+@tex
+$S_P(x, y)$
+@end tex
+@docbook
+<inlineequation>
+    <mml:math>
+        <mml:apply>
+            <mml:csymbol>
+                <mml:msub>
+                    <mml:mi>S</mml:mi>
+                    <mml:mi>P</mml:mi>
+                </mml:msub>
+            </mml:csymbol>
+            <mml:ci>x</mml:ci>
+            <mml:ci>y</mml:ci>
+        </mml:apply>
+    </mml:math>
+</inlineequation>
+@end docbook
+@footnote{Solid-state physicists will be reminded of the
 @uref{http://@/en.wikipedia.org/@/wiki/@/Born-@...>,
 @sc{Born}-@...} boundary condition}.}.
 
@@ -530,7 +590,7 @@
 @end display
 @end ifinfo
 @html
-<math xmlns="http://www.w3.org/1998/Math/MathML">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="separate">
     <mrow>
         <msub>
             <mi>S</mi>
@@ -573,6 +633,50 @@
     S_P(x, y) = \{P(x + m w, y): m \in Z\}.
 $$
 @end tex
+@docbook
+<informalequation>
+    <mml:math>
+        <mml:apply>
+            <mml:eq/>
+            <mml:apply>
+                <mml:csymbol>
+                    <mml:msub>
+                        <mml:mi>S</mml:mi>
+                        <mml:mi>P</mml:mi>
+                    </mml:msub>
+                </mml:csymbol>
+                <mml:ci>x</mml:ci>
+                <mml:ci>y</mml:ci>
+            </mml:apply>
+            <mml:set>
+                <mml:bvar>
+                    <mml:apply>
+                        <mml:ci>P</mml:ci>
+                        <mml:apply>
+                            <mml:plus/>
+                            <mml:ci>x</mml:ci>
+                            <mml:apply>
+                                <mml:times/>
+                                <mml:ci>m</mml:ci>
+                                <mml:ci>w</mml:ci>
+                            </mml:apply>
+                        </mml:apply>
+                        <mml:ci>y</mml:ci>
+                    </mml:apply>
+                </mml:bvar>
+                <mml:condition>
+                    <mml:apply>
+                        <mml:in/>
+                        <mml:ci>m</mml:ci>
+                        <mml:ci>Z</mml:ci>
+                    </mml:apply>
+                </mml:condition>
+            </mml:set>
+        </mml:apply>
+    </mml:math>
+</informalequation>
+@end docbook
+
 This is useful for 360@...{} horizontal panoramas as it
 eliminates the left and right borders.
 
@@ -584,7 +688,7 @@
 @end display
 @end ifinfo
 @html
-<math xmlns="http://www.w3.org/1998/Math/MathML">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="separate">
     <mrow>
         <msub>
             <mi>S</mi>
@@ -627,6 +731,49 @@
     S_P(x, y) = \{P(x, y + n h): n \in Z\}.
 $$
 @end tex
+@docbook
+<informalequation>
+    <mml:math>
+        <mml:apply>
+            <mml:eq/>
+            <mml:apply>
+                <mml:csymbol>
+                    <mml:msub>
+                        <mml:mi>S</mml:mi>
+                        <mml:mi>P</mml:mi>
+                    </mml:msub>
+                </mml:csymbol>
+                <mml:ci>x</mml:ci>
+                <mml:ci>y</mml:ci>
+            </mml:apply>
+            <mml:set>
+                <mml:bvar>
+                    <mml:apply>
+                        <mml:ci>P</mml:ci>
+                        <mml:ci>x</mml:ci>
+                        <mml:apply>
+                            <mml:plus/>
+                            <mml:ci>y</mml:ci>
+                            <mml:apply>
+                                <mml:times/>
+                                <mml:ci>n</mml:ci>
+                                <mml:ci>h</mml:ci>
+                            </mml:apply>
+                        </mml:apply>
+                    </mml:apply>
+                </mml:bvar>
+                <mml:condition>
+                    <mml:apply>
+                        <mml:in/>
+                        <mml:ci>n</mml:ci>
+                        <mml:ci>Z</mml:ci>
+                    </mml:apply>
+                </mml:condition>
+            </mml:set>
+        </mml:apply>
+    </mml:math>
+</informalequation>
+@end docbook
 This is useful for 360@...{} vertical panoramas as it
 eliminates the top and bottom borders.
 
@@ -640,7 +787,7 @@
 @end display
 @end ifinfo
 @html
-<math xmlns="http://www.w3.org/1998/Math/MathML">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="separate">
     <mrow>
         <msub>
             <mi>S</mi>
@@ -693,6 +840,66 @@
     S_P(x, y) = \{P(x + m w, y + n h): m, n \in Z\}.
 $$
 @end tex
+@docbook
+<informalequation>
+    <mml:math>
+        <mml:apply>
+            <mml:eq/>
+            <mml:apply>
+                <mml:csymbol>
+                    <mml:msub>
+                        <mml:mi>S</mml:mi>
+                        <mml:mi>P</mml:mi>
+                    </mml:msub>
+                </mml:csymbol>
+                <mml:ci>x</mml:ci>
+                <mml:ci>y</mml:ci>
+            </mml:apply>
+            <mml:set>
+                <mml:bvar>
+                    <mml:apply>
+                        <mml:ci>P</mml:ci>
+                        <mml:apply>
+                            <mml:plus/>
+                            <mml:ci>x</mml:ci>
+                            <mml:apply>
+                                <mml:times/>
+                                <mml:ci>m</mml:ci>
+                                <mml:ci>w</mml:ci>
+                            </mml:apply>
+                        </mml:apply>
+                        <mml:apply>
+                            <mml:plus/>
+                            <mml:ci>y</mml:ci>
+                            <mml:apply>
+                                <mml:times/>
+                                <mml:ci>n</mml:ci>
+                                <mml:ci>h</mml:ci>
+                            </mml:apply>
+                        </mml:apply>
+                    </mml:apply>
+                </mml:bvar>
+                <mml:condition>
+                    <mml:apply>
+                        <mml:and/>
+                        <mml:apply>
+                            <mml:in/>
+                            <mml:ci>n</mml:ci>
+                            <mml:ci>Z</mml:ci>
+                        </mml:apply>
+                        <mml:apply>
+                            <mml:in/>
+                            <mml:ci>m</mml:ci>
+                            <mml:ci>Z</mml:ci>
+                        </mml:apply>
+                    </mml:apply>
+                </mml:condition>
+            </mml:set>
+        </mml:apply>
+    </mml:math>
+</informalequation>
+@end docbook
+
 In this mode, both left and right borders, as well as top and bottom
 borders, are eliminated.
 @end table
@@ -702,6 +909,8 @@
 
 @item -x
 @opindex -x
+@cindex checkpoint results
+@cindex results, checkpoint
 Checkpoint partial results to the output file after each blending
 step.
 @end table
@@ -907,11 +1116,11 @@
 
 @pindex gimp
 @pindex cinepaint
-Gimp (before version@...) and Cinepaint (@pxref{Helpful
+Gimp (before version@...) and CinePaint (@pxref{Helpful
 Programs}) exhibit unusual behavior when loading images with
 unassociated alpha channels.  Use option @option{-g} to work around
-this problem.  With this flag Enblend creates the output image with
-the associated alpha tag set, even though the image is really
+this problem.  With this flag Enblend will create the output image
+with the associated alpha tag set, even though the image is really
 unassociated alpha.
 
 @item --gpu
@@ -937,7 +1146,7 @@
 
 This is the amount of memory Enblend will use for storing image data
 before swapping to disk.  The default is
-@...} which is good for systems with
+@value{default-image-cache-cachesize}, which is good for systems with
 3--4@...} (@acronym{GB}) of @acronym{RAM}.  See @ref{Tuning
 Memory Usage} for details.
 
@@ -982,27 +1191,8 @@
 
 Append a percent sign (@samp{%}) to specify @var{TAU} as a percentage.
 
-Valid range:
-@...
-@...} < @var{TAU} <
+Valid range: @value{src::minimum-anneal-tau} < @var{TAU} <
 @value{src::maximum-anneal-tau}.
-@... ifinfo
-@...
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-    <mrow>
-        <mn>@value{src::minimum-anneal-tau}</mn>
-        <mo>&lt;</mo>
-        <mi mathvariant="italic">TAU</mi>
-        <mo>&lt;</mo>
-        <mn>@value{src::maximum-anneal-tau}</mn>
-        <mtext>.</mtext>
-    </mrow>
-</math>
-@... html
-@...
-$@value{src::minimum-anneal-tau} < \mathit{TAU} <
-@...}$.
-@... tex
 
 The default is @value{src::default-anneal-tau}; values around 0.95 are
 reasonable.  Usually, slower cooling results in more converged points.
@@ -1012,26 +1202,8 @@
 @var{DELTA-E-MAX} and @var{DELTA-E-MIN} are the maximum and minimum
 cost change possible by any single annealing move.
 
-Valid range:
-@...
-@...} < DELTA-E-MIN < DELTA-E-MAX.
-@... ifinfo
-@...
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-    <mrow>
-        <mn>@value{src::minimum-anneal-deltae-min}</mn>
-        <mo>&lt;</mo>
-        <mi mathvariant="italic">DELTA-E-MIN</mi>
-        <mo>&lt;</mo>
-        <mi mathvariant="italic">DELTA-E-MAX</mi>
-        <mtext>.</mtext>
-    </mrow>
-</math>
-@... html
-@...
-$@value{src::minimum-anneal-deltae-min} < \mathit{DELTA-E-MIN} <
-\mathit{DELTA-E-MAX}$.
-@... tex
+Valid range: @value{src::minimum-anneal-deltae-min} <
+@var{DELTA-E-MIN} < @var{DELTA-E-MAX}.
 
 In particular they determine the initial and final annealing
 temperatures according to:
@@ -1047,14 +1219,14 @@
 @end display
 @end ifinfo
 @html
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="separate">
     <mtable>
         <mtr>
             <mtd>
                 <mrow>
                     <msub>
                         <mi mathvariant="italic">T</mi>
-                        <mi mathvariant="roman">initial</mi>
+                        <mi mathvariant="normal">initial</mi>
                     </msub>
                     <mo>=</mo>
                     <mfrac>
@@ -1086,7 +1258,7 @@
                 <mrow>
                     <msub>
                         <mi mathvariant="italic">T</mi>
-                        <mi mathvariant="roman">final</mi>
+                        <mi mathvariant="normal">final</mi>
                     </msub>
                     <mo>=</mo>
                     <mfrac>
@@ -1122,6 +1294,82 @@
     {\mathit{DELTA-E-MIN} \over {\log(\mathit{K-MAX\/}^2 - \mathit{K-MAX} - 1)}} \cr
 }$$
 @end tex
+@docbook
+<informalequation>
+    <mml:math>
+        <mml:apply>
+            <mml:eq/>
+            <mml:csymbol>
+                <mml:msub>
+                    <mml:mi mathvariant="italic">T</mml:mi>
+                    <mml:mi mathvariant="normal">initial</mml:mi>
+                </mml:msub>
+            </mml:csymbol>
+            <mml:apply>
+                <mml:divide/>
+                    <mml:csymbol>
+                        <mml:mi mathvariant="italic">DELTA-E-MAX</mml:mi>
+                    </mml:csymbol>
+                    <mml:apply>
+                        <mml:log/>
+                        <mml:apply other='display="scriptstyle"'>
+                            <mml:divide/>
+                            <mml:csymbol>
+                                <mml:mi mathvariant="italic">K-MAX</mml:mi>
+                            </mml:csymbol>
+                            <mml:apply>
+                                <mml:minus/>
+                                <mml:csymbol>
+                                    <mml:mi mathvariant="italic">K-MAX</mml:mi>
+                                </mml:csymbol>
+                                <mml:cn>2</mml:cn>
+                            </mml:apply>
+                        </mml:apply>
+                    </mml:apply>
+            </mml:apply>
+        </mml:apply>
+    </mml:math>
+</informalequation>
+<informalequation>
+    <mml:math>
+        <mml:apply>
+            <mml:eq/>
+            <mml:csymbol>
+                <mml:msub>
+                    <mml:mi mathvariant="italic">T</mml:mi>
+                    <mml:mi mathvariant="normal">final</mml:mi>
+                </mml:msub>
+            </mml:csymbol>
+            <mml:apply>
+                <mml:divide/>
+                    <mml:csymbol>
+                        <mml:mi mathvariant="italic">DELTA-E-MIN</mml:mi>
+                    </mml:csymbol>
+                    <mml:apply>
+                        <mml:log/>
+                        <mml:apply>
+                            <mml:minus/>
+                        <mml:apply>
+                            <mml:minus/>
+                                <mml:apply>
+                                    <mml:power/>
+                                    <mml:csymbol>
+                                        <mml:mi mathvariant="italic">K-MAX</mml:mi>
+                                    </mml:csymbol>
+                                    <mml:cn>2</mml:cn>
+                                </mml:apply>
+                                <mml:csymbol>
+                                    <mml:mi mathvariant="italic">K-MAX</mml:mi>
+                                </mml:csymbol>
+                            </mml:apply>
+                            <mml:cn>1</mml:cn>
+                        </mml:apply>
+                    </mml:apply>
+            </mml:apply>
+        </mml:apply>
+    </mml:math>
+</informalequation>
+@end docbook
 
 The defaults are: @var{DELTA-E-MAX}:
 @value{src::default-anneal-deltae-max} and @var{DELTA-E-MIN}:
@@ -1132,23 +1380,7 @@
 for each line segment.  Higher values more accurately sample the state
 space, at the expense of a higher computation cost.
 
-Valid range:
-@...
-@...} @geq{} @value{src::minimum-anneal-kmax}.
-@... ifinfo
-@...
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-    <mrow>

changeset a343c9a5b48f in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=a343c9a5b48f
description:
	Make cmake compile documantation again

diffstat:

 CMakeLists.txt     |  22 +++++++++++++---------
 VERSION            |   2 +-
 doc/CMakeLists.txt |  33 ++++++++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 13 deletions(-)

diffs (123 lines):

diff -r 619f95bd56d5 -r a343c9a5b48f CMakeLists.txt
--- a/CMakeLists.txt	Sun Aug 15 10:25:19 2010 +0200
+++ b/CMakeLists.txt	Wed Aug 18 11:11:07 2010 +0200
@@ -167,6 +167,8 @@
 FIND_PACKAGE(LibXMI REQUIRED)
 FIND_PACKAGE(TIFF REQUIRED)
 FIND_PACKAGE(Perl REQUIRED)
+# this one is needed in doc. (Especially the program "convert")
+FIND_PACKAGE(ImageMagick REQUIRED)
 LIST(APPEND common_libs ${LCMS_LIBRARIES} ${LIBXMI_LIBRARIES} ${TIFF_LIBRARIES})
 include_directories(${TIFF_INCLUDE_DIR} ${LIBXMI_INCLUDE_DIR} ${LCMS_INCLUDE_DIR})
 
@@ -283,14 +285,16 @@
   ENDIF(WIN32)
   FIND_PACKAGE(GLUT REQUIRED)
   FIND_PACKAGE(GLEW REQUIRED)
-  IF(APPLE)
-    FIND_PACKAGE(OpenGL)
-	IF(OPENGL_FOUND)
-	  ADD_DEFINITIONS(-DHAVE_APPLE_OPENGL_FRAMEWORK)
-	  include_directories(${OPENGL_INCLUDE_DIR}})
-	  LIST(APPEND common_libs ${OPENGL_LIBRARIES})
-	ENDIF(OPENGL_FOUND)
-  ENDIF(APPLE)
+
+  FIND_PACKAGE(OpenGL)
+  IF(OPENGL_FOUND)
+    if(APPLE)
+            ADD_DEFINITIONS(-DHAVE_APPLE_OPENGL_FRAMEWORK)
+            include_directories(${OPENGL_INCLUDE_DIR}})
+    endif(APPLE)
+    LIST(APPEND common_libs ${OPENGL_LIBRARIES})
+  ENDIF(OPENGL_FOUND)
+
 
   ADD_DEFINITIONS(-DHAVE_LIBGLEW)
   include_directories(${GLEW_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
@@ -368,7 +372,7 @@
 add_subdirectory(src)
 
 # you really should have perl installed, when creating doc's
-if (PERL_FOUND AND DOC)
+if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC)
   # this should be set from comman line
   # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex
   # @letterpaper is default
diff -r 619f95bd56d5 -r a343c9a5b48f VERSION
--- a/VERSION	Sun Aug 15 10:25:19 2010 +0200
+++ b/VERSION	Wed Aug 18 11:11:07 2010 +0200
@@ -1,1 +1,1 @@
-4.1-467759d01f07
+4.1-619f95bd56d5
diff -r 619f95bd56d5 -r a343c9a5b48f doc/CMakeLists.txt
--- a/doc/CMakeLists.txt	Sun Aug 15 10:25:19 2010 +0200
+++ b/doc/CMakeLists.txt	Wed Aug 18 11:11:07 2010 +0200
@@ -11,14 +11,16 @@
 set(DocumentsDirectory "doc/enblend")
 ENDIF(WIN32)
 
+# this is needed to convert some .gp.in-files
+set(RASTER_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(_docs)
 set(_enblend_Bases auxmac.texi auxmac.tex fdl.texi mask-template-characters.texi helpful-programs.texi
     tuning-memory-usage.texi understanding-masks.texi workflow.texi authors.texi color-profiles.texi
-    photographic-workflow.fig default.css)
+    photographic-workflow.fig seam-line-visualization.tif default.css)
 
 set(_enfuse_Bases auxmac.texi auxmac.tex fdl.texi mask-template-characters.texi helpful-programs.texi
     tuning-memory-usage.texi understanding-masks.texi workflow.texi authors.texi color-profiles.texi
-    config-edge.gp config.gp entropy-cutoff.gp.in entropy.gp.in gaussian.gp.in
+    config-edge.gp config.gp entropy-cutoff.gp.in entropy.gp.in exposure-cutoff.gp.in gaussian.gp.in
     laplacian-of-gaussian.gp.in sharp-edge.gp.in sharp-edge.data
     smooth-edge.gp.in smooth-edge.data local-analysis-window.fig
     photographic-workflow.fig focus-stack-decision-tree.fig default.css)
@@ -62,15 +64,20 @@
 endmacro(create_selection)
 
 set(_enblendenfuse_fig_images)
+set(_enblendenfuse_tif_images)
 set(_enblendenfuse_gp_images)
 
 foreach(_cmd "enblend" "enfuse")
   create_selection(_${_cmd}_Bases "fig" _${_cmd}_fig_images)
+  create_selection(_${_cmd}_Bases "tif" _${_cmd}_tif_images)
   create_selection(_${_cmd}_Bases "gp\\\\.in" _${_cmd}_gp_images)
-  set(_${_cmd}_images ${_${_cmd}_fig_images} ${_${_cmd}_gp_images})
+  set(_${_cmd}_images ${_${_cmd}_fig_images} ${_${_cmd}_tif_images} ${_${_cmd}_gp_images})
   foreach(_i ${_${_cmd}_fig_images})
     gp_append_unique(_enblendenfuse_fig_images ${_i})
   endforeach(_i)
+  foreach(_i ${_${_cmd}_tif_images})
+    gp_append_unique(_enblendenfuse_tif_images ${_i})
+  endforeach(_i)
   foreach(_i ${_${_cmd}_gp_images})
     gp_append_unique(_enblendenfuse_gp_images ${_i})
   endforeach(_i)
@@ -128,6 +135,26 @@
   SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_fig}.txt" GENERATED)
   list(APPEND _helpfiles "${CMAKE_CURRENT_BINARY_DIR}/${_fig}.txt")
 endforeach(_fig)
+
+foreach(_tif ${_enblendenfuse_tif_images})
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.gif"
+    COMMAND ${IMAGEMAGICK_CONVERT_EXECUTABLE} "${TOP_SRC_DIR}/doc/${_tif}.tif" "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.gif"
+    DEPENDS "${TOP_SRC_DIR}/doc/${_tif}.tif"
+    COMMENT "convert: creating ${CMAKE_CURRENT_BINARY_DIR}/${_tif}.gif"
+    )
+  SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_tif}.gif" GENERATED)
+  list(APPEND _helpfiles "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.gif")
+  
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.png"
+    COMMAND ${IMAGEMAGICK_CONVERT_EXECUTABLE} "${TOP_SRC_DIR}/doc/${_tif}.tif" "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.png"
+    DEPENDS "${TOP_SRC_DIR}/doc/${_tif}.tif"
+    COMMENT "convert: creating ${CMAKE_CURRENT_BINARY_DIR}/${_tif}.png"
+    )
+  SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_tif}.png" GENERATED)
+  list(APPEND _helpfiles "${CMAKE_CURRENT_BINARY_DIR}/${_tif}.png")
+endforeach(_tif)
 add_custom_target(doc0 ALL DEPENDS ${_helpfiles})
 
 project(doc1)

changeset 619f95bd56d5 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=619f95bd56d5
description:
	Install fallbacks for XHTML objects.

diffstat:

 README                          |   11 +++-
 VERSION                         |    2 +-
 configure.in                    |   26 ++--------
 doc/Makefile.am                 |   95 +++++++++++++++++++++++++--------------
 doc/auxmac.texi                 |   14 +++++-
 doc/config.gp                   |    7 ++-
 doc/enblend.info                |    0 
 doc/enfuse.info                 |    0 
 doc/entropy-cutoff.gp.in        |    4 +
 doc/entropy.gp.in               |    4 +
 doc/exposure-cutoff.gp.in       |    4 +
 doc/gaussian.gp.in              |    4 +
 doc/laplacian-of-gaussian.gp.in |    4 +
 doc/sharp-edge.gp.in            |    4 +
 doc/smooth-edge.gp.in           |    4 +
 doc/versenblend.texi            |    4 +-
 doc/versenfuse.texi             |    4 +-
 17 files changed, 126 insertions(+), 65 deletions(-)

diffs (406 lines):

diff -r 467759d01f07 -r 619f95bd56d5 README
--- a/README	Sat Aug 14 19:53:23 2010 +0200
+++ b/README	Sun Aug 15 10:25:19 2010 +0200
@@ -47,6 +47,10 @@
 
 * Installation
 
+GNU Make is required to build the project, because some of the
+Makefiles contain pattern rules.
+
+
 ** Tarball
 
         ./configure YOUR-OPTIONS-IF-ANY-GO-HERE
@@ -200,10 +204,11 @@
 http://www.openexr.com/ for the required libraries.
 
 
-** --with-ttf-path=<PATH>
+** --with-raster-dir=<DIR>
 
-Set PATH to TrueType fonts.  This is only required for building the
-documentation.
+Set the name of the raster-graphics directory, which always is a
+subdirectory of the XHTML documentation's root directory.  Default:
+"raster".
 
 
 * CMake Specifics
diff -r 467759d01f07 -r 619f95bd56d5 VERSION
--- a/VERSION	Sat Aug 14 19:53:23 2010 +0200
+++ b/VERSION	Sun Aug 15 10:25:19 2010 +0200
@@ -1,1 +1,1 @@
-4.1-5300cb0e24df
+4.1-467759d01f07
diff -r 467759d01f07 -r 619f95bd56d5 configure.in
--- a/configure.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/configure.in	Sun Aug 15 10:25:19 2010 +0200
@@ -321,25 +321,12 @@
     missing_for_doc="$missing_for_doc gnuplot"
 fi
 
-AC_ARG_WITH([ttf-path],
-            AC_HELP_STRING([--with-ttf-path=<PATH>],
-                           [set path to TrueType fonts]),
-            [GDFONTPATH="$withval"],
-            [GDFONTPATH="/opt/local/share/fonts/freefont-ttf:/sw/share/fonts/freefont-ttf:/usr/X11/lib/X11/fonts/TTF:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype/freefont"])
-AC_ARG_VAR(GDFONTPATH, [path to TrueType fonts])
-have_freesans_font=no
-orig_ifs="$IFS"
-IFS=':'
-for dir in $GDFONTPATH; do \
-    if test -f "$dir/FreeSans.ttf"; then \
-        have_freesans_font=yes; \
-        break; \
-    fi; \
-done
-IFS="$orig_ifs"
-if test "$have_freesans_font" != yes; then
-    AC_MSG_WARN(cannot find font "FreeSans.ttf" anywhere in GDFONTPATH; text in the documentation's figures could look strange)
-fi
+AC_ARG_WITH([raster-dir],
+            AC_HELP_STRING([--with-raster-dir=<DIR>],
+                           [set raster image subdirectory @<:@default=raster@:>@]),
+            [RASTER_DIR="$withval"],
+            [RASTER_DIR=raster])
+AC_SUBST(RASTER_DIR)
 
 AC_CHECK_PROG(FIG2DEV,
               fig2dev,
@@ -519,6 +506,7 @@
    OPENGL_LIBS:                    ${OPENGL_LIBS:-<none required>}
    EXTRA_LIBS (optional):          ${EXTRA_LIBS:-<none selected>}
 
+ raster subdirectory:              ${RASTER_DIR}
  can build all documentation:      ${can_build_doc}${no_doc_reason}
 
  feature selection:
diff -r 467759d01f07 -r 619f95bd56d5 doc/Makefile.am
--- a/doc/Makefile.am	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/Makefile.am	Sun Aug 15 10:25:19 2010 +0200
@@ -47,6 +47,8 @@
 
 EXTRA_DIST = docstrings seam-line-visualization.tif
 
+RASTER_DIR = @RASTER_DIR@
+
 # created by make(1), user probably wants to rebuild (often?)
 MOSTLYCLEANFILES = varsenblend.texi varsenfuse.texi
 
@@ -89,7 +91,7 @@
 
 .PHONY: clean-local
 clean-local:
-	-rm -rf enblend.xhtml enfuse.xhtml
+	-rm -rf enblend.xhtml enfuse.xhtml raster
 
 
 XMLLINT_FLAGS = --noout --valid
@@ -123,7 +125,7 @@
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	    $(INSTALL_DATA) $$xhtml/* "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
-	    $(INSTALL_DATA) *.xhtml *.svg "$(DESTDIR)$(htmldir)"; \
+	    $(INSTALL_DATA) *.xhtml *.svg $(RASTER_DIR) "$(DESTDIR)$(htmldir)"; \
 	  fi; \
 	done
 
@@ -135,65 +137,88 @@
 	  if test -d $$x; then \
 	    rm -rf "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
-	    rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" "$(DESTDIR)$(htmldir)/*.svg"; \
+	    rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" \
+                   "$(DESTDIR)$(htmldir)/*.svg" \
+                   "$(DESTDIR)$(htmldir)/$(RASTER_DIR)"; \
 	  fi; \
 	done
 
 
 # Implicit Rules
 
-.gp.txt:
+%.txt: %.gp
+	$(MKDIR_P) $(RASTER_DIR)
 	$(GNUPLOT) $<
 
-.gp.pdf:
+%.pdf: %.gp
+	$(MKDIR_P) $(RASTER_DIR)
 	$(GNUPLOT) $<
 
-.gp.eps:
+%.eps: %.gp
+	$(MKDIR_P) $(RASTER_DIR)
 	$(GNUPLOT) $<
 
-.gp.svg:
+%.svg: %.gp
+	$(MKDIR_P) $(RASTER_DIR)
 	$(GNUPLOT) $<
 
+$(RASTER_DIR)/%.png: %.gp
+	$(MKDIR_P) $(RASTER_DIR)
+	$(GNUPLOT) $<
 
-.fig.txt:
+
+%.txt: %.fig
 	$(SED) -e '1,/---BEGIN-TEXT---/d' \
                -e '/---END-TEXT---/,$$d' \
                -e 's/^# \?//' < $< > $@
 
-.fig.eps:
+%.eps: %.fig
 	$(FIG2DEV) -L eps $< $@
 
-.fig.pdf:
+%.pdf: %.fig
 	$(FIG2DEV) -L pdf $< $@
 
-.fig.svg:
+%.png: %.fig
+	$(FIG2DEV) -L png $< $@
+
+%.svg: %.fig
 	$(FIG2DEV) -L svg $< | \
 	    $(SED) -e '/<desc>/d' -e 's/style="stroke-width:.025in/style="stroke-width:0.001px/' > $@
 
+$(RASTER_DIR)/%.png: %.fig
+	$(MKDIR_P) $(RASTER_DIR)
+	$(FIG2DEV) -L png $< $@
 
-.tif.eps:
+
+%.eps: %.tif
 	$(CONVERT) $< eps2:$@
 
-.tif.png:
+%.png: %.tif
 	$(CONVERT) $< $@
 
 
-.html.xhtml:
+%.xhtml: %.html
+	test -d "$<" && test "$<" = enblend.html && { \
+            $(MKDIR_P) "$@/$(RASTER_DIR)"; \
+            for i in $(enblend_TEXINFOS); do \
+              base="$${i%%.*}"; \
+              test -f "$$base.svg" && { cp "$$base.svg" "$@"; \
+                                        cp "$(RASTER_DIR)/$$base.png" "$@/$(RASTER_DIR)"; } ; \
+              test -f "$$base.png" && cp "$$base.png" "$@"; \
+            done; } ; true
+	test -d "$<" && test "$<" = enfuse.html && { \
+            $(MKDIR_P) "$@/$(RASTER_DIR)"; \
+            for i in $(enfuse_TEXINFOS); do \
+              base="$${i%%.*}"; \
+              test -f "$$base.svg" && { cp "$$base.svg" "$@"; \
+                                        cp "$(RASTER_DIR)/$$base.png" "$@/$(RASTER_DIR)"; } ; \
+              test -f "$$base.png" && cp "$$base.png" "$@"; \
+            done; } ; true
 	$(srcdir)/html2xhtml \
 	    --meta="enblend-version,$(VERSION)" \
 	    --tidy-flags="$(EXTRATIDYFLAGS)" \
 	    --xmllint-flags="$(EXTRAXMLLINTFLAGS)" \
 	    $<
-	test -d "$<" && test "$<" = enblend.html && \
-            for i in $(enblend_TEXINFOS); do \
-              test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
-              test -f $${i%%.*}.png && cp $${i%%.*}.png "$@"; \
-            done; true
-	test -d "$<" && test "$<" = enfuse.html && \
-            for i in $(enfuse_TEXINFOS); do \
-              test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
-              test -f $${i%%.*}.png && cp $${i%%.*}.png "$@"; \
-            done; true
 
 
 # Explicit Rules
@@ -215,7 +240,7 @@
 
 enblend.html: $(enblend_TEXINFOS) \
               $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
-              photographic-workflow.svg \
+              photographic-workflow.svg $(RASTER_DIR)/photographic-workflow.png \
               seam-line-visualization.png
 
 enblend.pdf: $(enblend_TEXINFOS) \
@@ -259,16 +284,16 @@
 
 enfuse.html: $(enfuse_TEXINFOS) \
              $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
-             photographic-workflow.svg \
-             focus-stack-decision-tree.svg \
-             entropy.svg \
-             entropy-cutoff.svg \
-             exposure-cutoff.svg \
-             gaussian.svg \
-             laplacian-of-gaussian.svg \
-             local-analysis-window.svg \
-             sharp-edge.svg \
-             smooth-edge.svg
+             photographic-workflow.svg $(RASTER_DIR)/photographic-workflow.png \
+             focus-stack-decision-tree.svg $(RASTER_DIR)/ \
+             entropy.svg $(RASTER_DIR)/entropy.png \
+             entropy-cutoff.svg $(RASTER_DIR)/entropy-cutoff.png \
+             exposure-cutoff.svg $(RASTER_DIR)/exposure-cutoff.png \
+             gaussian.svg $(RASTER_DIR)/gaussian.png \
+             laplacian-of-gaussian.svg $(RASTER_DIR)/laplacian-of-gaussian.png \
+             local-analysis-window.svg $(RASTER_DIR)/local-analysis-window.png \
+             sharp-edge.svg $(RASTER_DIR)/sharp-edge.png \
+             smooth-edge.svg $(RASTER_DIR)/smooth-edge.png
 
 enfuse.pdf: $(enfuse_TEXINFOS) \
             $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
diff -r 467759d01f07 -r 619f95bd56d5 doc/auxmac.texi
--- a/doc/auxmac.texi	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/auxmac.texi	Sun Aug 15 10:25:19 2010 +0200
@@ -4,14 +4,24 @@
 
 @c extended commands
 
+@c Include an image in a variety of ways: 1/ The Info format includes
+@c unchanged.  2/ XHTML first tries SVG then PNG in the ``raster''
+@c subdirectory; if both fail, we leave a textual tombstone.  Here,
+@c the CSS must take care of centering of the graphic.  3/ TeX and
+@c PDFTeX center the graphic.
 @macro vimage{filename}
 @ifinfo
 @image{\filename\}
 @end ifinfo
 @html
-<object data="\filename\.svg" type="image/svg+xml" width="800" height="600">
+<object data="\filename\.svg" type="image/svg+xml" width="100%" height="100%">
   <param name="src" value="\filename\.svg" />
-  <p>(Image "\filename\" not displayed because of lacking SVG support.)</p>
+  <object data="raster/\filename\.png" type="image/png">
+    <param name="src" value="raster/\filename\.png" />
+    <p>[Image "<samp><span class="file">\filename\</span></samp>" is
+not displayed, because of lacking <acronym>SVG</acronym> and
+<acronym>PNG</acronym> support.]</p>
+  </object>
 </object>
 @end html
 @iftex
diff -r 467759d01f07 -r 619f95bd56d5 doc/config.gp
--- a/doc/config.gp	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/config.gp	Sun Aug 15 10:25:19 2010 +0200
@@ -4,10 +4,15 @@
 Dumb_Width = 131
 Dumb_Height = 98
 
-# SVG size is given in pixels.
+# SVG size is given in pixels.  For SVG the size, of course, is only a
+# suggestion.
 Svg_Width = 720
 Svg_Height = 540
 
 # PDF size is given in inches.
 Pdf_Width = 5
 Pdf_Height = 3.75
+
+# PNG size is given in pixels.
+Png_Width = 720
+Png_Height = 540
diff -r 467759d01f07 -r 619f95bd56d5 doc/enblend.info
Binary file doc/enblend.info has changed
diff -r 467759d01f07 -r 619f95bd56d5 doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 467759d01f07 -r 619f95bd56d5 doc/entropy-cutoff.gp.in
--- a/doc/entropy-cutoff.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/entropy-cutoff.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -49,3 +49,7 @@
 set output "| ps2pdf -dEPSCrop - entropy-cutoff.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/entropy.gp.in
--- a/doc/entropy.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/entropy.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -37,3 +37,7 @@
 set output "| ps2pdf -dEPSCrop - entropy.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/exposure-cutoff.gp.in
--- a/doc/exposure-cutoff.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/exposure-cutoff.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -53,3 +53,7 @@
 set output "| ps2pdf -dEPSCrop - exposure-cutoff.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/gaussian.gp.in
--- a/doc/gaussian.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/gaussian.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -36,3 +36,7 @@
 set output "| ps2pdf -dEPSCrop - gaussian.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/laplacian-of-gaussian.gp.in
--- a/doc/laplacian-of-gaussian.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/laplacian-of-gaussian.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -41,3 +41,7 @@
 set output "| ps2pdf -dEPSCrop - laplacian-of-gaussian.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/sharp-edge.gp.in
--- a/doc/sharp-edge.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/sharp-edge.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -22,3 +22,7 @@
 set output "| ps2pdf -dEPSCrop - sharp-edge.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/smooth-edge.gp.in
--- a/doc/smooth-edge.gp.in	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/smooth-edge.gp.in	Sun Aug 15 10:25:19 2010 +0200
@@ -22,3 +22,7 @@
 set output "| ps2pdf -dEPSCrop - smooth-edge.pdf"
 set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
 replot
+
+set output "@RASTER_DIR@..."
+set terminal png transparent size Png_Width, Png_Height enhanced
+replot
diff -r 467759d01f07 -r 619f95bd56d5 doc/versenblend.texi
--- a/doc/versenblend.texi	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/versenblend.texi	Sun Aug 15 10:25:19 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 14 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-8167e23829bb
-@... VERSION 4.1-8167e23829bb
+@set EDITION 4.1-467759d01f07
+@set VERSION 4.1-467759d01f07
diff -r 467759d01f07 -r 619f95bd56d5 doc/versenfuse.texi
--- a/doc/versenfuse.texi	Sat Aug 14 19:53:23 2010 +0200
+++ b/doc/versenfuse.texi	Sun Aug 15 10:25:19 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 13 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-8167e23829bb
-@... VERSION 4.1-8167e23829bb
+@set EDITION 4.1-467759d01f07
+@set VERSION 4.1-467759d01f07

changeset 5300cb0e24df in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=5300cb0e24df
description:
	Put a "seam-line visualization image" into the documentation.
	Well at least into those formats that can display graphics.

diffstat:

 README                          |    3 ++
 VERSION                         |    2 +-
 configure.in                    |   10 +++++++++
 doc/Makefile.am                 |   22 +++++++++++++++++---
 doc/enblend.info                |    0 
 doc/enblend.texi                |   42 ++++++++++++++++++++++++++++++++++++++++
 doc/enfuse.info                 |    0 
 doc/seam-line-visualization.tif |    0 
 doc/versenblend.texi            |    8 +++---
 doc/versenfuse.texi             |    4 +-
 10 files changed, 80 insertions(+), 11 deletions(-)

diffs (195 lines):

diff -r 8167e23829bb -r 5300cb0e24df README
--- a/README	Fri Aug 13 15:51:16 2010 +0200
+++ b/README	Sat Aug 14 19:41:48 2010 +0200
@@ -358,6 +358,9 @@
 
 Note that some additional packages are required to build these
 formats:
+        convert        - ImageMagick's swiss army knive of graphics
+                         format conversion found at
+                         http://www.imagemagick.org/.
         makeinfo       - GNU documentation generator.
         gnuplot        - Render plots (.gp) in text, PNG, EPS, and PDF
                          formats.  Check out http://www.gnuplot.info/.
diff -r 8167e23829bb -r 5300cb0e24df VERSION
--- a/VERSION	Fri Aug 13 15:51:16 2010 +0200
+++ b/VERSION	Sat Aug 14 19:41:48 2010 +0200
@@ -1,1 +1,1 @@
-4.1-295dbf607a46
+4.1-8167e23829bb
diff -r 8167e23829bb -r 5300cb0e24df configure.in
--- a/configure.in	Fri Aug 13 15:51:16 2010 +0200
+++ b/configure.in	Sat Aug 14 19:41:48 2010 +0200
@@ -351,6 +351,16 @@
     missing_for_doc="$missing_for_doc fig2dev"
 fi
 
+AC_CHECK_PROG(CONVERT,
+              convert,
+              convert,
+              false)
+if test "$CONVERT" = false; then
+    AC_MSG_WARN(cannot find convert; will not be able to build documentation)
+    can_build_doc=no
+    missing_for_doc="$missing_for_doc convert"
+fi
+
 AC_PROG_SED
 
 # These variables are mentioned in the AutoMake documentation as being
diff -r 8167e23829bb -r 5300cb0e24df doc/Makefile.am
--- a/doc/Makefile.am	Fri Aug 13 15:51:16 2010 +0200
+++ b/doc/Makefile.am	Sat Aug 14 19:41:48 2010 +0200
@@ -11,6 +11,7 @@
                    workflow.texi filespec.texi \
                    bug-reports.texi authors.texi \
                    photographic-workflow.fig \
+                   seam-line-visualization.tif \
                    default.css
 
 enfuse_TEXINFOS = auxmac.texi auxmac.tex \
@@ -44,7 +45,7 @@
 
 TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
 
-EXTRA_DIST = docstrings
+EXTRA_DIST = docstrings seam-line-visualization.tif
 
 # created by make(1), user probably wants to rebuild (often?)
 MOSTLYCLEANFILES = varsenblend.texi varsenfuse.texi
@@ -60,6 +61,7 @@
              focus-stack-decision-tree.{txt,eps,svg,pdf} \
              sharp-edge.{txt,eps,svg,pdf} \
              smooth-edge.{txt,eps,svg,pdf} \
+             seam-line-visualization.{eps,png} \
              *.fig.bak \
              *.msg
 
@@ -169,6 +171,13 @@
 	    $(SED) -e '/<desc>/d' -e 's/style="stroke-width:.025in/style="stroke-width:0.001px/' > $@
 
 
+.tif.eps:
+	$(CONVERT) $< eps2:$@
+
+.tif.png:
+	$(CONVERT) $< $@
+
+
 .html.xhtml:
 	$(srcdir)/html2xhtml \
 	    --document-version=$(VERSION) \
@@ -178,10 +187,12 @@
 	test -d "$<" && test "$<" = enblend.html && \
             for i in $(enblend_TEXINFOS); do \
               test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
+              test -f $${i%%.*}.png && cp $${i%%.*}.png "$@"; \
             done; true
 	test -d "$<" && test "$<" = enfuse.html && \
             for i in $(enfuse_TEXINFOS); do \
               test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
+              test -f $${i%%.*}.png && cp $${i%%.*}.png "$@"; \
             done; true
 
 
@@ -199,14 +210,17 @@
 
 enblend.dvi: $(enblend_TEXINFOS) \
              $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
-             photographic-workflow.eps
+             photographic-workflow.eps \
+             seam-line-visualization.eps
 
 enblend.html: $(enblend_TEXINFOS) \
               $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
-              photographic-workflow.svg
+              photographic-workflow.svg \
+              seam-line-visualization.png
 
 enblend.pdf: $(enblend_TEXINFOS) \
-             photographic-workflow.pdf
+             photographic-workflow.pdf \
+             seam-line-visualization.png
 
 enblend.xhtml: enblend.html
 
diff -r 8167e23829bb -r 5300cb0e24df doc/enblend.info
Binary file doc/enblend.info has changed
diff -r 8167e23829bb -r 5300cb0e24df doc/enblend.texi
--- a/doc/enblend.texi	Fri Aug 13 15:51:16 2010 +0200
+++ b/doc/enblend.texi	Sat Aug 14 19:41:48 2010 +0200
@@ -1575,6 +1575,48 @@
 @cindex image colors, visualization
 @cindex colors, visualization image
 @end float
+
+@ifnotinfo
+@cindex seam-line visualization example
+@cindex visualization example
+@ref{Figure:seam-line-visualization} shows an example of a seam-line
+visualization.  It was produced with an Enblend run at all defaults,
+but @option{--fine-mask} and @option{--visualize} enabled.
+
+The large @value{src::visualize-no-overlap-value-color} border is
+``off-limits'' for Enblend, for the images do not overlap there.  The
+dark wedge inside the @value{src::visualize-no-overlap-value-color}
+frame is where the images share a common region.
+
+The initial seam-line (@value{src::visualize-initial-path-color}) is
+almost straight with the exception of a single bend on the left side
+of the image and the final seam-line
+(@value{src::visualize-short-path-value-color}) meanders around it.
+
+@ifhtml
+@float Figure,Figure:seam-line-visualization
+@image{seam-line-visualization}
+
+@caption{Seam-line visualization of a simple overlap.  The
+853@...} image is shown at a magification of
+100%.}
+
+@shortcaption{Seam-line visualization}
+@end float
+@end ifhtml
+
+@iftex
+@float Figure,Figure:seam-line-visualization
+@image{seam-line-visualization, 15cm}
+
+@caption{Seam-line visualization of a simple overlap.  The
+853@...} image has been rescaled to a width of
+approximately 15@...}.}
+
+@shortcaption{Seam-line visualization}
+@end float
+@end iftex
+@end ifnotinfo
 @end table
 
 @page
diff -r 8167e23829bb -r 5300cb0e24df doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 8167e23829bb -r 5300cb0e24df doc/seam-line-visualization.tif
Binary file doc/seam-line-visualization.tif has changed
diff -r 8167e23829bb -r 5300cb0e24df doc/versenblend.texi
--- a/doc/versenblend.texi	Fri Aug 13 15:51:16 2010 +0200
+++ b/doc/versenblend.texi	Sat Aug 14 19:41:48 2010 +0200
@@ -1,4 +1,4 @@
-@... UPDATED 31 May 2010
-@... UPDATED-MONTH May 2010
-@... EDITION 4.1-295dbf607a46
-@... VERSION 4.1-295dbf607a46
+@set UPDATED 14 August 2010
+@set UPDATED-MONTH August 2010
+@set EDITION 4.1-8167e23829bb
+@set VERSION 4.1-8167e23829bb
diff -r 8167e23829bb -r 5300cb0e24df doc/versenfuse.texi
--- a/doc/versenfuse.texi	Fri Aug 13 15:51:16 2010 +0200
+++ b/doc/versenfuse.texi	Sat Aug 14 19:41:48 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 13 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-295dbf607a46
-@... VERSION 4.1-295dbf607a46
+@set EDITION 4.1-8167e23829bb
+@set VERSION 4.1-8167e23829bb

changeset 467759d01f07 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=467759d01f07
description:
	Generalize html2xhtml: Allow for setting meta-tag key-value pairs
	instead of simply splicing in the Enblend/Enfuse version in a meta-tag.

diffstat:

 VERSION         |   2 +-
 doc/Makefile.am |   2 +-
 doc/html2xhtml  |  22 +++++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 5300cb0e24df -r 467759d01f07 VERSION
--- a/VERSION	Sat Aug 14 19:41:48 2010 +0200
+++ b/VERSION	Sat Aug 14 19:53:23 2010 +0200
@@ -1,1 +1,1 @@
-4.1-8167e23829bb
+4.1-5300cb0e24df
diff -r 5300cb0e24df -r 467759d01f07 doc/Makefile.am
--- a/doc/Makefile.am	Sat Aug 14 19:41:48 2010 +0200
+++ b/doc/Makefile.am	Sat Aug 14 19:53:23 2010 +0200
@@ -180,7 +180,7 @@
 
 .html.xhtml:
 	$(srcdir)/html2xhtml \
-	    --document-version=$(VERSION) \
+	    --meta="enblend-version,$(VERSION)" \
 	    --tidy-flags="$(EXTRATIDYFLAGS)" \
 	    --xmllint-flags="$(EXTRAXMLLINTFLAGS)" \
 	    $<
diff -r 5300cb0e24df -r 467759d01f07 doc/html2xhtml
--- a/doc/html2xhtml	Sat Aug 14 19:41:48 2010 +0200
+++ b/doc/html2xhtml	Sat Aug 14 19:53:23 2010 +0200
@@ -11,7 +11,7 @@
 
 
 readonly global__command=`basename $0`
-         global__document_version=unknown
+         global__meta_key_val=
 readonly global__sed=${SED:-sed}
 readonly global__tidy=${TIDY:-tidy}
          global__tidy_flags=""
@@ -57,10 +57,16 @@
 # inline.  These tags must be reverted.
 postprocess_tidy_output ()
 {
+    if test -z "$lazy__meta_tag" && test -n "$global__meta_key_val"; then
+        lazy__meta_tag=`echo $global__meta_key_val | \
+                          $global__sed -e 's|;|\n|g' | \
+                          $global__sed -e 's|\([^,]*\),\(.*\)|<meta name="\1" content="\2" />|'`
+    fi
+
     $global__sed \
         -e '1,9s|""|"http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"|' \
         \
-        -e "s|^<head>|<head>\n<meta content=\"$global__document_version\" name=\"enblend-version\" />|" \
+        -e "s|^<head>|<head>\n$lazy__meta_tag|" \
         \
         -e 's|<html\([^>]*\) lang="[^"]*"\([^>]*\)|<html\1\2|' \
         -e 's|<ol[^>]*>|<ol>|' \
@@ -179,8 +185,12 @@
 
     while test -n "$1"; do
         case "$1" in
-            --document-version=*)
-                global__document_version="${1#--document-version=}"
+            --meta=*)
+                if test -z "$global__meta_key_val"; then
+                    global__meta_key_val="${1#--meta=}"
+                else
+                    global__meta_key_val="$global__meta_key_val;${1#--meta=}"
+                fi
                 ;;
             -h | --help)
                 show_help
@@ -224,9 +234,7 @@
 Convert HTML files or directories to XHTML.
 
 Options:
-      --document-version=VERSION
-                             set meta tag for documentation's version
-                             [default: \"$global__document_version\"]
+      --meta=NAME,CONTENT    add meta tags with NAME and CONTENT
       --tidy-flags=FLAGS     set flags for tidy(1)
       --xmllint-flags=FLAGS  set flags for xmllint(1)
   -h, --help                 show this help screen

changeset 8167e23829bb in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=8167e23829bb
description:
	Rearrange the graphics formats of the documentation.
	    * Info (*.info) stays with graphics in text (*.txt) format.
	    * PostScript (*.ps) stays with graphics in EncapsulatedPostScript
	      (*.eps) format.
	    * PDF switches from PNG to PDF graphics.
	    * XHTML switches from PNG to SVG graphics.
	We do not produce PNG graphics anymore.

diffstat:

 README                          |    4 -
 VERSION                         |    2 +-
 configure.in                    |   20 ------
 doc/Makefile.am                 |  133 ++++++++++++++++++++++-----------------
 doc/auxmac.texi                 |   19 ++---
 doc/config.gp                   |   14 ++-
 doc/default.css                 |    4 +
 doc/enblend.info                |    0 
 doc/enfuse.info                 |    0 
 doc/enfuse.texi                 |    8 +-
 doc/entropy-cutoff.gp.in        |   13 ++-
 doc/entropy.gp.in               |   13 ++-
 doc/exposure-cutoff.gp.in       |   13 ++-
 doc/gaussian.gp.in              |   13 ++-
 doc/html2xhtml                  |   17 ++--
 doc/laplacian-of-gaussian.gp.in |   13 ++-
 doc/sharp-edge.gp.in            |   13 ++-
 doc/smooth-edge.gp.in           |   13 ++-
 doc/versenblend.texi            |    4 +-
 doc/versenfuse.texi             |    6 +-
 20 files changed, 179 insertions(+), 143 deletions(-)

diffs (626 lines):

diff -r 295dbf607a46 -r 8167e23829bb README
--- a/README	Thu Aug 12 19:32:12 2010 +0200
+++ b/README	Fri Aug 13 15:51:16 2010 +0200
@@ -364,10 +364,6 @@
         freefonts      - Fonts for Gnuplot's PNG format.
         ghostscript    - Convert EPS to PDF.
         perl           - Run Perl programs.
-        pngtopnm       - Convert Portable Network Graphics (PNG) to
-                         portable anymap (PNM).  See http://www.libpng.org/.
-        pnmtopng       - Convert portable anymap (PNM) to Portable
-                         Network Graphics (PNG).  http://www.libpng.org/
         tetex          - Typeset the Texinfo documents in PS or PDF.
         texi2html      - Convert Texinfo to HTML.  Find more information
                          at http://www.nongnu.org/texi2html/.
diff -r 295dbf607a46 -r 8167e23829bb VERSION
--- a/VERSION	Thu Aug 12 19:32:12 2010 +0200
+++ b/VERSION	Fri Aug 13 15:51:16 2010 +0200
@@ -1,1 +1,1 @@
-4.1-07af3b90fef0
+4.1-295dbf607a46
diff -r 295dbf607a46 -r 8167e23829bb configure.in
--- a/configure.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/configure.in	Fri Aug 13 15:51:16 2010 +0200
@@ -351,26 +351,6 @@
     missing_for_doc="$missing_for_doc fig2dev"
 fi
 
-AC_CHECK_PROG(PNGTOPNM,
-              pngtopnm,
-              pngtopnm,
-              false)
-if test "$PNGTOPNM" = false; then
-    AC_MSG_NOTICE(cannot find pngtopnm; will not be able to add transparency to all PNG images)
-    can_build_doc=no
-    missing_for_doc="$missing_for_doc pngtopnm"
-fi
-
-AC_CHECK_PROG(PNMTOPNG,
-              pnmtopng,
-              pnmtopng,
-              false)
-if test "$PNMTOPNG" = false; then
-    AC_MSG_NOTICE(cannot find pnmtopng; will not be able to add transparency to all PNG images)
-    can_build_doc=no
-    missing_for_doc="$missing_for_doc pnmtopng"
-fi
-
 AC_PROG_SED
 
 # These variables are mentioned in the AutoMake documentation as being
diff -r 295dbf607a46 -r 8167e23829bb doc/Makefile.am
--- a/doc/Makefile.am	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/Makefile.am	Fri Aug 13 15:51:16 2010 +0200
@@ -50,16 +50,16 @@
 MOSTLYCLEANFILES = varsenblend.texi varsenfuse.texi
 
 # created by make(1)
-CLEANFILES = entropy.{txt,png,eps} \
-             entropy-cutoff.{txt,png,eps} \
-             exposure-cutoff.{txt,png,eps} \
-             gaussian.{txt,png,eps} \
-             laplacian-of-gaussian.{txt,png,eps} \
-             local-analysis-window.{txt,png,eps} \
-             photographic-workflow.{txt,png,eps} \
-             focus-stack-decision-tree.{txt,png,eps} \
-             sharp-edge.{txt,png,eps} \
-             smooth-edge.{txt,png,eps} \
+CLEANFILES = entropy.{txt,eps,svg,pdf} \
+             entropy-cutoff.{txt,eps,svg,pdf} \
+             exposure-cutoff.{txt,eps,svg,pdf} \
+             gaussian.{txt,eps,svg,pdf} \
+             laplacian-of-gaussian.{txt,eps,svg,pdf} \
+             local-analysis-window.{txt,eps,svg,pdf} \
+             photographic-workflow.{txt,eps,svg,pdf} \
+             focus-stack-decision-tree.{txt,eps,svg,pdf} \
+             sharp-edge.{txt,eps,svg,pdf} \
+             smooth-edge.{txt,eps,svg,pdf} \
              *.fig.bak \
              *.msg
 
@@ -85,17 +85,6 @@
 	@echo '*** Use target "xhtml" instead of "html".'
 	false
 
-.PHONY: html-local
-html-local:
-	test -d enblend.html && \
-            for i in $(enblend_TEXINFOS); do \
-              test -f $${i%%.*}.png && cp $${i%%.*}.png enblend.html; \
-            done; true
-	test -d enfuse.html && \
-            for i in $(enfuse_TEXINFOS); do \
-              test -f $${i%%.*}.png && cp $${i%%.*}.png enfuse.html; \
-            done; true
-
 .PHONY: clean-local
 clean-local:
 	-rm -rf enblend.xhtml enfuse.xhtml
@@ -107,7 +96,7 @@
 export TIDY SED XMLLINT
 
 .PHONY: xhtml
-xhtml: $(HTMLS:.html=.xhtml) html-local
+xhtml: $(HTMLS:.html=.xhtml)
 
 .PHONY: validate-xhtml
 validate-xhtml: $(HTMLS:.html=.xhtml)
@@ -132,7 +121,7 @@
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	    $(INSTALL_DATA) $$xhtml/* "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
-	    $(INSTALL_DATA) *.xhtml *.png "$(DESTDIR)$(htmldir)"; \
+	    $(INSTALL_DATA) *.xhtml *.svg "$(DESTDIR)$(htmldir)"; \
 	  fi; \
 	done
 
@@ -144,7 +133,7 @@
 	  if test -d $$x; then \
 	    rm -rf "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
-	    rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" "$(DESTDIR)$(htmldir)/*.png"; \
+	    rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" "$(DESTDIR)$(htmldir)/*.svg"; \
 	  fi; \
 	done
 
@@ -152,16 +141,16 @@
 # Implicit Rules
 
 .gp.txt:
-	GDFONTPATH=$${GDFONTPATH:-@...@} $(GNUPLOT) $<
+	$(GNUPLOT) $<
 
-.gp.png:
-	GDFONTPATH=$${GDFONTPATH:-@...@} $(GNUPLOT) $<
+.gp.pdf:
+	$(GNUPLOT) $<
 
 .gp.eps:
-	GDFONTPATH=$${GDFONTPATH:-@...@} $(GNUPLOT) $<
+	$(GNUPLOT) $<
 
-.gp.pdf:
-	GDFONTPATH=$${GDFONTPATH:-@...@} $(GNUPLOT) $<
+.gp.svg:
+	$(GNUPLOT) $<
 
 
 .fig.txt:
@@ -169,20 +158,16 @@
                -e '/---END-TEXT---/,$$d' \
                -e 's/^# \?//' < $< > $@
 
-FIG2PNGFLAGS = -F -m 2
-.fig.png:
-	if test "$(PNGTOPNM)" = false || test "$(PNMTOPNG)" = false; then \
-	  $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< > $@; \
-	else \
-	  $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
-	fi
-
 .fig.eps:
 	$(FIG2DEV) -L eps $< $@
 
 .fig.pdf:
 	$(FIG2DEV) -L pdf $< $@
 
+.fig.svg:
+	$(FIG2DEV) -L svg $< | \
+	    $(SED) -e '/<desc>/d' -e 's/style="stroke-width:.025in/style="stroke-width:0.001px/' > $@
+
 
 .html.xhtml:
 	$(srcdir)/html2xhtml \
@@ -190,6 +175,14 @@
 	    --tidy-flags="$(EXTRATIDYFLAGS)" \
 	    --xmllint-flags="$(EXTRAXMLLINTFLAGS)" \
 	    $<
+	test -d "$<" && test "$<" = enblend.html && \
+            for i in $(enblend_TEXINFOS); do \
+              test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
+            done; true
+	test -d "$<" && test "$<" = enfuse.html && \
+            for i in $(enfuse_TEXINFOS); do \
+              test -f $${i%%.*}.svg && cp $${i%%.*}.svg "$@"; \
+            done; true
 
 
 # Explicit Rules
@@ -200,15 +193,22 @@
                   $(srcdir)/../src/global.h
 	$(PERL) $(srcdir)/docstrings $^ > $@
 
-enblend.info: photographic-workflow.txt
+enblend.info: $(enblend_TEXINFOS) \
+              $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
+              photographic-workflow.txt
 
-enblend.dvi: enblend.texi \
+enblend.dvi: $(enblend_TEXINFOS) \
              $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
-             $(enblend_TEXINFOS) \
              photographic-workflow.eps
 
-enblend.html \
-enblend.pdf: photographic-workflow.png
+enblend.html: $(enblend_TEXINFOS) \
+              $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
+              photographic-workflow.svg
+
+enblend.pdf: $(enblend_TEXINFOS) \
+             photographic-workflow.pdf
+
+enblend.xhtml: enblend.html
 
 
 varsenfuse.texi: $(srcdir)/../src/enfuse.cc \
@@ -217,7 +217,9 @@
                  $(srcdir)/../src/global.h
 	$(PERL) $(srcdir)/docstrings $^ > $@
 
-enfuse.info: photographic-workflow.txt \
+enfuse.info: $(enfuse_TEXINFOS) \
+             $(srcdir)/versenblend.texi $(top_builddir)/config-h.texi \
+             photographic-workflow.txt \
              focus-stack-decision-tree.txt \
              entropy.txt \
              entropy-cutoff.txt \
@@ -228,7 +230,8 @@
              sharp-edge.txt \
              smooth-edge.txt
 
-enfuse.dvi: enfuse.texi \
+enfuse.dvi: $(enfuse_TEXINFOS) \
+            $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
             photographic-workflow.eps \
             focus-stack-decision-tree.eps \
             entropy.eps \
@@ -238,18 +241,32 @@
             laplacian-of-gaussian.eps \
             local-analysis-window.eps \
             sharp-edge.eps \
-            smooth-edge.eps \
+            smooth-edge.eps
+
+enfuse.html: $(enfuse_TEXINFOS) \
+             $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
+             photographic-workflow.svg \
+             focus-stack-decision-tree.svg \
+             entropy.svg \
+             entropy-cutoff.svg \
+             exposure-cutoff.svg \
+             gaussian.svg \
+             laplacian-of-gaussian.svg \
+             local-analysis-window.svg \
+             sharp-edge.svg \
+             smooth-edge.svg
+
+enfuse.pdf: $(enfuse_TEXINFOS) \
             $(srcdir)/versenfuse.texi $(top_builddir)/config-h.texi \
-            $(enfuse_TEXINFOS)
+            photographic-workflow.pdf \
+            focus-stack-decision-tree.pdf \
+            entropy.pdf \
+            entropy-cutoff.pdf \
+            exposure-cutoff.pdf \
+            gaussian.pdf \
+            laplacian-of-gaussian.pdf \
+            local-analysis-window.pdf \
+            sharp-edge.pdf \
+            smooth-edge.pdf
 
-enfuse.html \
-enfuse.pdf: photographic-workflow.png \
-            focus-stack-decision-tree.png \
-            entropy.png \
-            entropy-cutoff.png \
-            exposure-cutoff.png \
-            gaussian.png \
-            laplacian-of-gaussian.png \
-            local-analysis-window.png \
-            sharp-edge.png \
-            smooth-edge.png
+enfuse.xhtml: enfuse.html
diff -r 295dbf607a46 -r 8167e23829bb doc/auxmac.texi
--- a/doc/auxmac.texi	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/auxmac.texi	Fri Aug 13 15:51:16 2010 +0200
@@ -8,16 +8,15 @@
 @ifinfo
 @image{\filename\}
 @end ifinfo
-@...
-@...\}
-@... ifhtml
-@...
-\\ifpdf
-  \\imagexxx \filename\,15cm,,,,\\finish
-\\else
-  \\center\\image{\filename\}
-\\fi
-@... tex
+@html
+<object data="\filename\.svg" type="image/svg+xml" width="800" height="600">
+  <param name="src" value="\filename\.svg" />
+  <p>(Image "\filename\" not displayed because of lacking SVG support.)</p>
+</object>
+@end html
+@iftex
+@center@...\}
+@end iftex
 @end macro
 
 
diff -r 295dbf607a46 -r 8167e23829bb doc/config.gp
--- a/doc/config.gp	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/config.gp	Fri Aug 13 15:51:16 2010 +0200
@@ -1,9 +1,13 @@
 # Gnuplot configuration
 
 # ASCII size is given in characters.
-Dumb_Width = 71
-Dumb_Height = 36
+Dumb_Width = 131
+Dumb_Height = 98
 
-# PNG size is given in pixels.
-Png_Width = 800
-Png_Height = 600
+# SVG size is given in pixels.
+Svg_Width = 720
+Svg_Height = 540
+
+# PDF size is given in inches.
+Pdf_Width = 5
+Pdf_Height = 3.75
diff -r 295dbf607a46 -r 8167e23829bb doc/default.css
--- a/doc/default.css	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/default.css	Fri Aug 13 15:51:16 2010 +0200
@@ -17,8 +17,12 @@
 /* Class-based and attibute-based settings */
 div.contents {}
 div.float {
+    /*background-color: #ffffcc;*/  /* for debugging */
     border-bottom: 1px solid;
     border-top: 1px solid;
+    margin-left: auto;
+    margin-right: auto;
+    width: 88%;
 }
 
 dl.compact {}
diff -r 295dbf607a46 -r 8167e23829bb doc/enblend.info
Binary file doc/enblend.info has changed
diff -r 295dbf607a46 -r 8167e23829bb doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 295dbf607a46 -r 8167e23829bb doc/enfuse.texi
--- a/doc/enfuse.texi	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/enfuse.texi	Fri Aug 13 15:51:16 2010 +0200
@@ -4287,8 +4287,8 @@
 This is in fact @uref{http://@/www.gnu.org/@/software/@/octave/,
 Octave} syntax.
 
-Images@...} and @ref{Figure:smooth-edge} show
-plots of the matrices @code{sharp_edge} and @code{smooth_edge}.
+@ref{Figure:sharp-edge} and @ref{Figure:smooth-edge} show plots of the
+matrices @code{sharp_edge} and @code{smooth_edge}.
 
 @float Figure,Figure:sharp-edge
 @vimage{sharp-edge}
@@ -4456,8 +4456,8 @@
 @cindex focus stacking decision tree
 @cindex decision tree, focus stacking
 
-Figure@...} helps the user
-to arrive at a well-fused focus stack with as few steps as possible.
+@ref{Figure:focus-stacking-decision-tree} helps the user to arrive at
+a well-fused focus stack with as few steps as possible.
 
 @float Figure,Figure:focus-stacking-decision-tree
 @vimage{focus-stack-decision-tree}
diff -r 295dbf607a46 -r 8167e23829bb doc/entropy-cutoff.gp.in
--- a/doc/entropy-cutoff.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/entropy-cutoff.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -37,10 +37,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "entropy-cutoff.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "entropy-cutoff.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "entropy-cutoff.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - entropy-cutoff.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/entropy.gp.in
--- a/doc/entropy.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/entropy.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -25,10 +25,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "entropy.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "entropy.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "entropy.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - entropy.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/exposure-cutoff.gp.in
--- a/doc/exposure-cutoff.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/exposure-cutoff.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -41,10 +41,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "exposure-cutoff.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "exposure-cutoff.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "exposure-cutoff.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - exposure-cutoff.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/gaussian.gp.in
--- a/doc/gaussian.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/gaussian.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -24,10 +24,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "gaussian.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "gaussian.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "gaussian.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - gaussian.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/html2xhtml
--- a/doc/html2xhtml	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/html2xhtml	Fri Aug 13 15:51:16 2010 +0200
@@ -16,7 +16,7 @@
 readonly global__tidy=${TIDY:-tidy}
          global__tidy_flags=""
 readonly global__xmllint=${XMLLINT:-xmllint}
-         global__xmllint_flags="-valid --noblanks --noent --nsclean --format --encode iso-8859-1"
+         global__xmllint_flags="--valid --noblanks --noent --nsclean --format --encode iso-8859-1"
 
 
 failwith_error ()
@@ -28,13 +28,14 @@
 
 convert_with_tidy ()
 {
-    # We add the system identifier
-    #     "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"
-    # with sed(1) after tidy(1).  See function postprocess_tidy_output.
+    # We add the system identifier with sed(1) after tidy(1).  See
+    # function postprocess_tidy_output.  Also see
+    #     http://www.w3.org/QA/2002/04/valid-dtd-list.html
+    # for a list of recommended doctype declarations.
 
     $global__tidy \
         --add-xml-decl yes \
-        --doctype '"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"' \
+        --doctype '"-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"' \
         --file /dev/null \
         --new-blocklevel-tags "math, mfenced, mfrac, mover, mrow, msqrt, msub, msup, mtable, mtd, mtr, munder, munderover" \
         --new-empty-tags mspace \
@@ -57,7 +58,7 @@
 postprocess_tidy_output ()
 {
     $global__sed \
-        -e '1,9s|""|"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"|' \
+        -e '1,9s|""|"http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"|' \
         \
         -e "s|^<head>|<head>\n<meta content=\"$global__document_version\" name=\"enblend-version\" />|" \
         \
@@ -96,8 +97,6 @@
 
     mkdir -p $xhtml_directory
 
-    cp *.png $xhtml_directory
-
     (
         cd $html_directory || failwith_error "cannot cd to \"$html_directory\""
         ls -1 *.html | \
@@ -129,6 +128,7 @@
 	          -e 's|<a\([^>]*\)name="[^"]*"\([^>]*\)|<a\1\2|g' \
 	          -e 's|\("[^/"]*\)\.html\([#"]\)|\1.xhtml\2|' | \
 	        $global__xmllint $global__xmllint_flags --output $xhtml_file -
+            test $? -eq 0 || { rm -f $xhtml_file; exit 1; }
         fi
     done
 }
@@ -144,6 +144,7 @@
         postprocess_tidy_output | \
         $global__sed -e 's|<a\([^>]*\)name=\([^>]*\)|<a\1id=\2|g' | \
         $global__xmllint $global__xmllint_flags --output $xhtml_file -
+    test $? -eq 0 || { rm -f $xhtml_file; exit 1; }
 }
 
 
diff -r 295dbf607a46 -r 8167e23829bb doc/laplacian-of-gaussian.gp.in
--- a/doc/laplacian-of-gaussian.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/laplacian-of-gaussian.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -29,10 +29,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "laplacian-of-gaussian.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "laplacian-of-gaussian.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "laplacian-of-gaussian.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - laplacian-of-gaussian.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/sharp-edge.gp.in
--- a/doc/sharp-edge.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/sharp-edge.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -10,10 +10,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "sharp-edge.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "sharp-edge.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "sharp-edge.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - sharp-edge.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/smooth-edge.gp.in
--- a/doc/smooth-edge.gp.in	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/smooth-edge.gp.in	Fri Aug 13 15:51:16 2010 +0200
@@ -10,10 +10,15 @@
 set terminal dumb Dumb_Width Dumb_Height enhanced
 replot
 
-set output "smooth-edge.png"
-set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
-replot
-
 set output "smooth-edge.eps"
 set terminal postscript eps enhanced
 replot
+
+set output "smooth-edge.svg"
+set terminal svg size Svg_Width, Svg_Height dynamic enhanced
+replot
+
+# Newer Gnuplots have a "pdf" terminal.
+set output "| ps2pdf -dEPSCrop - smooth-edge.pdf"
+set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
+replot
diff -r 295dbf607a46 -r 8167e23829bb doc/versenblend.texi
--- a/doc/versenblend.texi	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/versenblend.texi	Fri Aug 13 15:51:16 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 31 May 2010
 @set UPDATED-MONTH May 2010
-@... EDITION 4.1-f2c326ffb36d
-@... VERSION 4.1-f2c326ffb36d
+@set EDITION 4.1-295dbf607a46
+@set VERSION 4.1-295dbf607a46
diff -r 295dbf607a46 -r 8167e23829bb doc/versenfuse.texi
--- a/doc/versenfuse.texi	Thu Aug 12 19:32:12 2010 +0200
+++ b/doc/versenfuse.texi	Fri Aug 13 15:51:16 2010 +0200
@@ -1,4 +1,4 @@
-@... UPDATED 12 August 2010
+@set UPDATED 13 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-f2c326ffb36d
-@... VERSION 4.1-f2c326ffb36d
+@set EDITION 4.1-295dbf607a46
+@set VERSION 4.1-295dbf607a46

changeset 295dbf607a46 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=295dbf607a46
description:
	Work around the format-selection limitation of Texinfo's "@image".

diffstat:

 VERSION                         |    2 +-
 doc/Makefile.am                 |   26 +++++++++++++-------------
 doc/auxmac.texi                 |   19 +++++++++++++++++++
 doc/config.gp                   |    4 ----
 doc/enfuse.info                 |    0 
 doc/enfuse.texi                 |   18 +++++++++---------
 doc/entropy-cutoff.gp.in        |    5 -----
 doc/entropy.gp.in               |    5 -----
 doc/exposure-cutoff.gp.in       |    5 -----
 doc/gaussian.gp.in              |    5 -----
 doc/laplacian-of-gaussian.gp.in |    5 -----
 doc/photographic-workflow.fig   |   12 ++++++------
 doc/sharp-edge.gp.in            |    5 -----
 doc/smooth-edge.gp.in           |    5 -----
 doc/versenfuse.texi             |    2 +-
 doc/workflow.texi               |    2 +-
 16 files changed, 50 insertions(+), 70 deletions(-)

diffs (314 lines):

diff -r 07af3b90fef0 -r 295dbf607a46 VERSION
--- a/VERSION	Thu Aug 12 19:06:16 2010 +0200
+++ b/VERSION	Thu Aug 12 19:32:12 2010 +0200
@@ -1,1 +1,1 @@
-4.1-f2c326ffb36d
+4.1-07af3b90fef0
diff -r 07af3b90fef0 -r 295dbf607a46 doc/Makefile.am
--- a/doc/Makefile.am	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/Makefile.am	Thu Aug 12 19:32:12 2010 +0200
@@ -50,16 +50,16 @@
 MOSTLYCLEANFILES = varsenblend.texi varsenfuse.texi
 
 # created by make(1)
-CLEANFILES = entropy.{txt,png,eps,pdf} \
-             entropy-cutoff.{txt,png,eps,pdf} \
-             exposure-cutoff.{txt,png,eps,pdf} \
-             gaussian.{txt,png,eps,pdf} \
-             laplacian-of-gaussian.{txt,png,eps,pdf} \
-             local-analysis-window.{txt,png,eps,pdf} \
-             photographic-workflow.{txt,png,eps,pdf} \
-             focus-stack-decision-tree.{txt,png,eps,pdf} \
-             sharp-edge.{txt,png,eps,pdf} \
-             smooth-edge.{txt,png,eps,pdf} \
+CLEANFILES = entropy.{txt,png,eps} \
+             entropy-cutoff.{txt,png,eps} \
+             exposure-cutoff.{txt,png,eps} \
+             gaussian.{txt,png,eps} \
+             laplacian-of-gaussian.{txt,png,eps} \
+             local-analysis-window.{txt,png,eps} \
+             photographic-workflow.{txt,png,eps} \
+             focus-stack-decision-tree.{txt,png,eps} \
+             sharp-edge.{txt,png,eps} \
+             smooth-edge.{txt,png,eps} \
              *.fig.bak \
              *.msg
 
@@ -169,12 +169,12 @@
                -e '/---END-TEXT---/,$$d' \
                -e 's/^# \?//' < $< > $@
 
-FIG2PNGFLAGS = -F
+FIG2PNGFLAGS = -F -m 2
 .fig.png:
 	if test "$(PNGTOPNM)" = false || test "$(PNMTOPNG)" = false; then \
-	    $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< > $@; \
+	  $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< > $@; \
 	else \
-	    $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
+	  $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
 	fi
 
 .fig.eps:
diff -r 07af3b90fef0 -r 295dbf607a46 doc/auxmac.texi
--- a/doc/auxmac.texi	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/auxmac.texi	Thu Aug 12 19:32:12 2010 +0200
@@ -2,6 +2,25 @@
 @c Macro Definitions
 @c
 
+@c extended commands
+
+@macro vimage{filename}
+@ifinfo
+@image{\filename\}
+@end ifinfo
+@ifhtml
+@image{\filename\}
+@end ifhtml
+@tex
+\\ifpdf
+  \\imagexxx \filename\,15cm,,,,\\finish
+\\else
+  \\center\\image{\filename\}
+\\fi
+@end tex
+@end macro
+
+
 @c Operators
 
 @macro classictimes
diff -r 07af3b90fef0 -r 295dbf607a46 doc/config.gp
--- a/doc/config.gp	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/config.gp	Thu Aug 12 19:32:12 2010 +0200
@@ -7,7 +7,3 @@
 # PNG size is given in pixels.
 Png_Width = 800
 Png_Height = 600
-
-# PDF size is given in inches.
-Pdf_Width = 5
-Pdf_Height = 3.5
diff -r 07af3b90fef0 -r 295dbf607a46 doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 07af3b90fef0 -r 295dbf607a46 doc/enfuse.texi
--- a/doc/enfuse.texi	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/enfuse.texi	Thu Aug 12 19:32:12 2010 +0200
@@ -1398,7 +1398,7 @@
 @ref{Figure:entropy-cutoff} shows an example.
 
 @float Figure,Figure:entropy-cutoff
-@...}
+@vimage{entropy-cutoff}
 
 @caption{Linear lightness@...} in comparison with an
 entropy-cutoff function for @var{LOWER-CUTOFF} = 5% and
@@ -1524,7 +1524,7 @@
 respective ends.
 
 @float Figure,Figure:exposure-cutoff
-@...}
+@vimage{exposure-cutoff}
 
 @caption{Exposure weight, a Gaussian with @var{Mu} = 0.5 and
 @var{Sigma} = 0.2 submitted to an exposure-cutoff of
@@ -2622,7 +2622,7 @@
 @ref{Figure:gaussian} shows a Gaussian.
 
 @float Figure,Figure:gaussian
-@...}
+@vimage{gaussian}
 
 @caption{Gaussian function with the parameters @var{Mu} = 0.5 and
 @var{Sigma} = 0.2.}
@@ -2754,7 +2754,7 @@
 sizes.
 
 @float Figure,Figure:local-analysis-window
-@...}
+@vimage{local-analysis-window}
 
 @caption{Examples of local analysis windows for the sizes 3 and 5.
 ``C'' marks the center where the pixel gets the weight.  ``N'' are
@@ -3393,7 +3393,7 @@
 @end tex
 
 @float Figure,Figure:laplacian-of-gaussian
-@...}
+@vimage{laplacian-of-gaussian}
 
 @caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
 
@@ -3706,7 +3706,7 @@
 @ref{Figure:entropy} shows an entropy function.
 
 @float Figure,Figure:entropy
-@...}
+@vimage{entropy}
 
 @caption{Entropy function@... for an experiment with exactly two
 outcomes.}
@@ -4291,7 +4291,7 @@
 plots of the matrices @code{sharp_edge} and @code{smooth_edge}.
 
 @float Figure,Figure:sharp-edge
-@...}
+@vimage{sharp-edge}
 
 @caption{3D plot augmented by contour plot of the matrix
 @code{sharp_edge}.}
@@ -4300,7 +4300,7 @@
 @end float
 
 @float Figure,Figure:smooth-edge
-@...}
+@vimage{smooth-edge}
 
 @caption{3D plot augmented by contour plot of the matrix
 @code{smooth_edge}.}
@@ -4460,7 +4460,7 @@
 to arrive at a well-fused focus stack with as few steps as possible.
 
 @float Figure,Figure:focus-stacking-decision-tree
-@..., 5in}
+@vimage{focus-stack-decision-tree}
 
 @caption{Focus stacking decision tree.}
 
diff -r 07af3b90fef0 -r 295dbf607a46 doc/entropy-cutoff.gp.in
--- a/doc/entropy-cutoff.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/entropy-cutoff.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -44,8 +44,3 @@
 set output "entropy-cutoff.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - entropy-cutoff.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/entropy.gp.in
--- a/doc/entropy.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/entropy.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -32,8 +32,3 @@
 set output "entropy.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - entropy.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/exposure-cutoff.gp.in
--- a/doc/exposure-cutoff.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/exposure-cutoff.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -48,8 +48,3 @@
 set output "exposure-cutoff.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - exposure-cutoff.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/gaussian.gp.in
--- a/doc/gaussian.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/gaussian.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -31,8 +31,3 @@
 set output "gaussian.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - gaussian.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/laplacian-of-gaussian.gp.in
--- a/doc/laplacian-of-gaussian.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/laplacian-of-gaussian.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -36,8 +36,3 @@
 set output "laplacian-of-gaussian.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - laplacian-of-gaussian.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/photographic-workflow.fig
--- a/doc/photographic-workflow.fig	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/photographic-workflow.fig	Thu Aug 12 19:32:12 2010 +0200
@@ -111,11 +111,7 @@
 2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
 	 6075 4747 5310 4747
 2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
-	 7290 2902 6615 2902
-2 3 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 4
-	 8832 2655 8832 2816 9045 2816 8832 2655
-2 3 0 1 0 32 101 0 20 0.000 0 0 7 0 0 6
-	 7290 2655 7290 3105 9045 3105 9045 2816 8832 2655 7290 2655
+	 7065 2902 6615 2902
 2 3 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 4
 	 7617 3780 7617 3941 7830 3941 7617 3780
 2 3 0 1 0 32 101 0 20 0.000 0 0 7 0 0 6
@@ -128,9 +124,13 @@
 	 7617 5220 7617 5381 7830 5381 7617 5220
 2 3 0 1 0 32 101 0 20 0.000 0 0 7 0 0 6
 	 6075 5220 6075 5670 7830 5670 7830 5381 7617 5220 6075 5220
+2 3 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 4
+	 8607 2655 8607 2816 8820 2816 8607 2655
+2 3 0 1 0 32 101 0 20 0.000 0 0 7 0 0 6
+	 7065 2655 7065 3105 8820 3105 8820 2816 8607 2655 7065 2655
 4 2 0 50 -1 16 11 0.0000 4 180 435 2970 2565 [else]\001
 4 0 0 50 -1 16 11 0.0000 4 180 390 6030 2565 [raw]\001
 4 0 0 50 -1 16 11 0.0000 4 180 1320 6165 5512 The Gimp, et al.\001
 4 0 0 50 -1 16 11 0.0000 4 165 1380 6165 4799 Enblend, Enfuse\001
 4 0 0 50 -1 16 11 0.0000 4 180 1500 6165 4072 Hugin, PanoTools\001
-4 0 0 50 -1 16 11 0.0000 4 165 1770 7380 2947 DCRaw, UFRaw, etc.\001
+4 0 0 50 -1 16 11 0.0000 4 165 1770 7155 2947 DCRaw, UFRaw, etc.\001
diff -r 07af3b90fef0 -r 295dbf607a46 doc/sharp-edge.gp.in
--- a/doc/sharp-edge.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/sharp-edge.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -17,8 +17,3 @@
 set output "sharp-edge.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - sharp-edge.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/smooth-edge.gp.in
--- a/doc/smooth-edge.gp.in	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/smooth-edge.gp.in	Thu Aug 12 19:32:12 2010 +0200
@@ -17,8 +17,3 @@
 set output "smooth-edge.eps"
 set terminal postscript eps enhanced
 replot
-
-# Newer Gnuplots have a "pdf" terminal.
-set output "| ps2pdf -dEPSCrop - smooth-edge.pdf"
-set terminal postscript eps size Pdf_Width, Pdf_Height enhanced
-replot
diff -r 07af3b90fef0 -r 295dbf607a46 doc/versenfuse.texi
--- a/doc/versenfuse.texi	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/versenfuse.texi	Thu Aug 12 19:32:12 2010 +0200
@@ -1,4 +1,4 @@
-@... UPDATED 10 August 2010
+@set UPDATED 12 August 2010
 @set UPDATED-MONTH August 2010
 @set EDITION 4.1-f2c326ffb36d
 @set VERSION 4.1-f2c326ffb36d
diff -r 07af3b90fef0 -r 295dbf607a46 doc/workflow.texi
--- a/doc/workflow.texi	Thu Aug 12 19:06:16 2010 +0200
+++ b/doc/workflow.texi	Thu Aug 12 19:32:12 2010 +0200
@@ -25,7 +25,7 @@
 @pindex PanoTools
 @pindex gimp
 
-@..., 5in}
+@vimage{photographic-workflow}
 
 @caption{Photographic workflow with Enblend and Enfuse.}
 @end float

changeset 07af3b90fef0 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=07af3b90fef0
description:
	Make shell scripts (especially "html2xhtml") a bit more portable.

diffstat:

 VERSION              |    2 +-
 configure.in         |  121 ++++++++++++++------------------------------------
 doc/Makefile.am      |   20 ++++----
 doc/enblend.info     |    0 
 doc/enfuse.info      |    0 
 doc/html2xhtml       |   98 +++++++++++++++++++++--------------------
 doc/versenblend.texi |    4 +-
 doc/versenfuse.texi  |    4 +-
 8 files changed, 99 insertions(+), 150 deletions(-)

diffs (637 lines):

diff -r f2c326ffb36d -r 07af3b90fef0 VERSION
--- a/VERSION	Wed Aug 11 19:06:14 2010 +0200
+++ b/VERSION	Thu Aug 12 19:06:16 2010 +0200
@@ -1,1 +1,1 @@
-4.1-5a9da370be6b
+4.1-f2c326ffb36d
diff -r f2c326ffb36d -r 07af3b90fef0 configure.in
--- a/configure.in	Wed Aug 11 19:06:14 2010 +0200
+++ b/configure.in	Thu Aug 12 19:06:16 2010 +0200
@@ -45,17 +45,10 @@
                             [use OpenEXR @<:@default=check@:>@])],
             [],
             [with_openexr=check])
-AS_IF([test "x$with_openexr" = xNO \
-         -o "x$with_openexr" = xNo \
-         -o "x$with_openexr" = xno],
+AS_IF([test "$with_openexr" = no],
       [AC_MSG_NOTICE([disabling OpenEXR])
        have_exr=no],
-      [if test "x$with_openexr" = xyes \
-            -o "x$with_openexr" = "xYES" \
-            -o "x$with_openexr" = "xYes" \
-            -o "x$with_openexr" = "xcheck" \
-            -o "x$with_openexr" = "xCHECK" \
-            -o "x$with_openexr" = "xCheck"; then
+      [if test "$with_openexr" = yes || test "$with_openexr" = check; then
           AC_MSG_RESULT(yes)
           PKG_CHECK_MODULES(OPENEXR, OpenEXR >= 1.0,
                             [AC_DEFINE(HasEXR, 1, [Define if you have EXR library])
@@ -70,7 +63,7 @@
           have_exr=no
        fi])
 
-if test "x$GXX" = xyes; then
+if test "$GXX" = yes; then
     # Fixes SourceForge bug id 2121647 on some systems with newer GCCs.
     CXXFLAGS="$CXXFLAGS --param inline-unit-growth=60"
 fi
@@ -88,11 +81,9 @@
                             [force usage of Apple OpenGL framework (Mac OS X only)])])
 can_use_gpu=no
 no_gpu_reason=
-if test "x$gpu_support" = "xyes" \
-     -o "x$gpu_support" = "xYES" \
-     -o "x$gpu_support" = "xYes"; then
+if test "$gpu_support" = yes; then
     missing_for_gpu=
-    if test "X$with_apple_opengl_framework" = "Xyes"; then
+    if test "$with_apple_opengl_framework" = yes; then
       AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1],
                 [Use the Apple OpenGL framework.])
       GL_LIBS="-framework OpenGL -framework AGL"
@@ -112,13 +103,13 @@
       AX_CHECK_GLU
       AX_CHECK_GLUT
     fi
-    if test "X$no_gl" = Xyes; then
+    if test "$no_gl" = yes; then
         missing_for_gpu="$missing_for_gpu GL"
         AC_MSG_WARN([[GL not found, disabling GPU mode]])
-    elif test "X$no_glu" = Xyes; then
+    elif test "$no_glu" = yes; then
         missing_for_gpu="$missing_for_gpu GLU"
         AC_MSG_WARN([[GLU not found, disabling GPU mode]])
-    elif test "X$no_glut" = Xyes; then
+    elif test "$no_glut" = yes; then
         missing_for_gpu="$missing_for_gpu GLUT"
         AC_MSG_WARN([[GLUT not found, disabling GPU mode]])
     else
@@ -145,11 +136,11 @@
 AC_ARG_WITH(dmalloc,
             [  --with-dmalloc          use dmalloc, as in
                           http://www.dmalloc.com/dmalloc.tar.gz],
-            [if test "x$withval" = xyes; then
+            [if test "$withval" = yes; then
                 AC_MSG_RESULT(yes)
                 AC_DEFINE(WITH_DMALLOC, 1,
                     [Define if using the dmalloc debugging malloc package])
-                if test x$acx_pthread_ok = xyes; then
+                if test $acx_pthread_ok = yes; then
                     LIBS="$LIBS -ldmallocthcxx"
                     enable_dmalloc="yes (thread aware)"
                 else
@@ -206,13 +197,9 @@
              [use Boost filesystem library @<:@default=check@:>@])],
             [],
             [with_boost_filesystem=check])
-AS_IF([test "x$with_boost_filesystem" = xNO \
-         -o "x$with_boost_filesystem" = xNo \
-         -o "x$with_boost_filesystem" = xno],
+AS_IF([test "$with_boost_filesystem" = no],
       [AC_MSG_NOTICE([disabling use of Boost "filesystem" library])],
-      [AS_IF([test "x$with_boost_filesystem" = xYES \
-                -o "x$with_boost_filesystem" = xYes \
-                -o "x$with_boost_filesystem" = xyes],
+      [AS_IF([test "$with_boost_filesystem" = yes],
              [AC_MSG_NOTICE([forcing use of Boost "filesystem" library])
               AC_DEFINE(HAVE_BOOST_FILESYSTEM, 1,
                         [Define if you have boost/filesystem.hpp])
@@ -220,15 +207,13 @@
              [AC_CHECK_HEADER(boost/filesystem.hpp,
                               [],
                               AC_MSG_NOTICE([Boost "filesystem" header is missing.]))
-              if test x$ac_cv_header_boost_filesystem_hpp = xyes; then
+              if test "$ac_cv_header_boost_filesystem_hpp" = yes; then
                   found_boost_filesystem_lib=no
                   candidates="-lboost_filesystem"
-                  if test x$acx_pthread_ok = xyes; then
+                  if test "$acx_pthread_ok" = yes; then
                       candidates="-lboost_filesystem-mt $candidates"
                   fi
-                  if test "x$with_boost_filesystem" != xCHECK \
-                       -a "x$with_boost_filesystem" != xCheck \
-                       -a "x$with_boost_filesystem" != xcheck; then
+                  if test "$with_boost_filesystem" != check; then
                       candidates="$with_boost_filesystem $candidates"
                   fi
                   LIBS_ORIG=$LIBS
@@ -253,8 +238,8 @@
                   done
                   LIBS=$LIBS_ORIG
               fi
-              if test x$ac_cv_header_boost_filesystem_hpp = xyes \
-                   -a x$found_boost_filesystem_lib = xyes; then
+              if test "$ac_cv_header_boost_filesystem_hpp" = yes &&
+                 test "$found_boost_filesystem_lib" = yes; then
                   AC_DEFINE(HAVE_BOOST_FILESYSTEM, 1,
                             [Define if you have boost/filesystem.hpp])
               else
@@ -300,7 +285,7 @@
 AC_C99_FUNC_LRINTF
 
 AX_WITH_PROG(PERL, perl, false, [])
-if test "x$PERL" = xfalse; then
+if test "$PERL" = false; then
     AC_MSG_ERROR(cannot find perl)
 fi
 AX_PROG_PERL_MODULES(Sys::Hostname, [],
@@ -309,7 +294,7 @@
                      AC_MSG_WARN(missing Perl module Time::Zone))
 
 # Documentation
-if test $cross_compiling = no; then
+if test "$cross_compiling" = no; then
     AM_MISSING_PROG(HELP2MAN, help2man)
 else
     HELP2MAN=:
@@ -330,7 +315,7 @@
                       missing_for_doc="$missing_for_doc IO::Handle"])
 
 AX_WITH_PROG(GNUPLOT, gnuplot, false, [])
-if test "x$GNUPLOT" = xfalse; then
+if test "$GNUPLOT" = false; then
     AC_MSG_WARN(cannot find gnuplot; will not be able to build documentation)
     can_build_doc=no
     missing_for_doc="$missing_for_doc gnuplot"
@@ -352,7 +337,7 @@
     fi; \
 done
 IFS="$orig_ifs"
-if test $have_freesans_font != yes; then
+if test "$have_freesans_font" != yes; then
     AC_MSG_WARN(cannot find font "FreeSans.ttf" anywhere in GDFONTPATH; text in the documentation's figures could look strange)
 fi
 
@@ -360,7 +345,7 @@
               fig2dev,
               fig2dev,
               false)
-if test "x$FIG2DEV" = xfalse; then
+if test "$FIG2DEV" = false; then
     AC_MSG_WARN(cannot find fig2dev; will not be able to build documentation)
     can_build_doc=no
     missing_for_doc="$missing_for_doc fig2dev"
@@ -370,7 +355,7 @@
               pngtopnm,
               pngtopnm,
               false)
-if test "x$PNGTOPNM" = xfalse; then
+if test "$PNGTOPNM" = false; then
     AC_MSG_NOTICE(cannot find pngtopnm; will not be able to add transparency to all PNG images)
     can_build_doc=no
     missing_for_doc="$missing_for_doc pngtopnm"
@@ -380,7 +365,7 @@
               pnmtopng,
               pnmtopng,
               false)
-if test "x$PNMTOPNG" = xfalse; then
+if test "$PNMTOPNG" = false; then
     AC_MSG_NOTICE(cannot find pnmtopng; will not be able to add transparency to all PNG images)
     can_build_doc=no
     missing_for_doc="$missing_for_doc pnmtopng"
@@ -394,47 +379,17 @@
               makeinfo,
               makeinfo,
               false)
-if test "x$MAKEINFO" = xfalse; then
+if test "$MAKEINFO" = false; then
     AC_MSG_WARN(cannot find makeinfo; will not be able to build documentation)
     can_build_doc=no
     missing_for_doc="$missing_for_doc makeinfo"
 fi
 
-dnl AC_CHECK_PROG(TEXI2DVI,
-dnl               texi2dvi,
-dnl               texi2dvi,
-dnl               false)
-dnl if test "x$TEXI2DVI" = xfalse; then
-dnl   AC_MSG_WARN(cannot find texi2dvi; will not be able to build documentation)
-dnl   can_build_doc=no
-dnl   missing_for_doc="$missing_for_doc texi2dvi"
-dnl fi
-
-dnl AC_CHECK_PROG(TEXI2PDF,
-dnl               texi2pdf,
-dnl               texi2pdf,
-dnl               false)
-dnl if test "x$TEXI2PDF" = xfalse; then
-dnl   AC_MSG_WARN(cannot find texi2pdf; will not be able to build documentation)
-dnl   can_build_doc=no
-dnl   missing_for_doc="$missing_for_doc texi2pdf"
-dnl fi
-
-dnl AC_CHECK_PROG(DVIPS,
-dnl               dvips,
-dnl               dvips,
-dnl               false)
-dnl if test "x$DVIPS" = xfalse; then
-dnl   AC_MSG_WARN(cannot find dvips; will not be able to build documentation)
-dnl   can_build_doc=no
-dnl   missing_for_doc="$missing_for_doc dvips"
-dnl fi
-
 AC_CHECK_PROG(TIDY,
               tidy,
               tidy,
               false)
-if test "x$TIDY" = xfalse; then
+if test "$TIDY" = false; then
     AC_MSG_WARN(cannot find tidy; will not be able to build XHTML documentation)
     can_build_doc=no
     missing_for_doc="$missing_for_doc tidy"
@@ -444,14 +399,14 @@
               xmllint,
               xmllint,
               false)
-if test "x$XMLLINT" = xfalse; then
+if test "$XMLLINT" = false; then
     AC_MSG_WARN(cannot find xmllint; will not be able to build XHTML documentation)
     can_build_doc=no
     missing_for_doc="$missing_for_doc xmllint"
 fi
 
-AM_CONDITIONAL([BUILD_DOC], [test $can_build_doc = yes])
-if test $can_build_doc = no; then
+AM_CONDITIONAL([BUILD_DOC], [test "$can_build_doc" = yes])
+if test "$can_build_doc" = no; then
     no_doc_reason=", because of missing$missing_for_doc"
 fi
 
@@ -462,9 +417,7 @@
                              [split documentation @<:@default=yes@:>@]),
               [split_doc=$enableval],
               [split_doc=$split_doc_default])
-if test "x$split_doc" = "xyes" \
-     -o "x$split_doc" = "xYES" \
-     -o "x$split_doc" = "xYes"; then
+if test "$split_doc" = yes; then
     AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS"
     AM_MAKEINFOHTMLFLAGS="$AM_MAKEINFOHTMLFLAGS"
     AC_MSG_RESULT(yes)
@@ -488,9 +441,7 @@
                              [turn on debugging @<:@default=no@:>@]),
               [enable_debug=$enableval],
               [enable_debug=$debug_default])
-if test "x$enable_debug" = "xyes" \
-     -o "x$enable_debug" = "xYES" \
-     -o "x$enable_debug" = "xYes"; then
+if test "$enable_debug" = yes; then
     CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall"
     AC_MSG_RESULT(yes)
     enable_debug=yes
@@ -507,9 +458,7 @@
                              [allow for processing of large images @<:@default=yes@:>@]),
               [enable_image_cache=$enableval],
               [enable_image_cache=$image_cache_default])
-if test "x$enable_image_cache" = "xyes" \
-     -o "x$enable_image_cache" = "xYES" \
-     -o "x$enable_image_cache" = "xYes"; then
+if test "$enable_image_cache" = yes; then
     AC_DEFINE(CACHE_IMAGES, 1,
               [Define if you want to compile Enblend and Enfuse with image cache])
     AC_MSG_RESULT(yes)
@@ -526,9 +475,7 @@
                              [compile with OpenMP @<:@default=no@:>@]),
               [enable_openmp=$enableval],
               [enable_openmp=$openmp_default])
-if test "x$enable_openmp" = "xyes" \
-     -o "x$enable_openmp" = "xYES" \
-     -o "x$enable_openmp" = "xYes"; then
+if test "$enable_openmp" = yes; then
     AC_MSG_RESULT(yes)
     AX_OPENMP([enable_openmp=yes])
     CFLAGS="$CFLAGS $OPENMP_CFLAGS"
@@ -538,7 +485,7 @@
     AC_MSG_RESULT(no)
     enable_openmp=no
 else
-    if test $enable_image_cache = yes; then
+    if test "$enable_image_cache" = yes; then
         AC_MSG_WARN([[image cache and OpenMP support are mutually exclusive]])
         AC_MSG_WARN([[only configure like this if you want to develop a reentrant image cache]])
         warnings=`echo -e "$warnings\n WARNING: Image cache and OpenMP are both enabled!  You are a developer, aren't you?"`
diff -r f2c326ffb36d -r 07af3b90fef0 doc/Makefile.am
--- a/doc/Makefile.am	Wed Aug 11 19:06:14 2010 +0200
+++ b/doc/Makefile.am	Thu Aug 12 19:06:16 2010 +0200
@@ -112,7 +112,7 @@
 .PHONY: validate-xhtml
 validate-xhtml: $(HTMLS:.html=.xhtml)
 	for x in $(HTMLS); do \
-          xhtml=$${x/%.html/.xhtml}; \
+          xhtml=`basename $$x .html`.xhtml; \
 	  if test -d $$xhtml; then \
 	    for y in $$xhtml/*.xhtml; do \
 	      $(XMLLINT) $(XMLLINT_FLAGS) $$y; \
@@ -127,9 +127,9 @@
 	@$(NORMAL_INSTALL)
 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	for x in $(HTMLS); do \
-          xhtml=$${x/%.html/.xhtml}; \
+          xhtml=`basename $$x .html`.xhtml; \
 	  if test -d $$x; then \
-	    test -d "$(DESTDIR)$(htmldir)/$$xhtml" || mkdir "$(DESTDIR)$(htmldir)/$$xhtml"; \
+	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	    $(INSTALL_DATA) $$xhtml/* "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
 	    $(INSTALL_DATA) *.xhtml *.png "$(DESTDIR)$(htmldir)"; \
@@ -140,12 +140,11 @@
 uninstall-xhtml:
 	@$(NORMAL_UNINSTALL)
 	for x in $(HTMLS); do \
-          xhtml=$${x/%.html/.xhtml}; \
+          xhtml=`basename $$x .html`.xhtml; \
 	  if test -d $$x; then \
-	    test -d "$(DESTDIR)$(htmldir)/$$xhtml" || mkdir "$(DESTDIR)$(htmldir)/$$xhtml"; \
-	    echo rm -rf "$(DESTDIR)$(htmldir)/$$xhtml"; \
+	    rm -rf "$(DESTDIR)$(htmldir)/$$xhtml"; \
 	  else \
-	    echo rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" "$(DESTDIR)$(htmldir)/*.png"; \
+	    rm -rf "$(DESTDIR)$(htmldir)/*.xhtml" "$(DESTDIR)$(htmldir)/*.png"; \
 	  fi; \
 	done
 
@@ -170,11 +169,12 @@
                -e '/---END-TEXT---/,$$d' \
                -e 's/^# \?//' < $< > $@
 
+FIG2PNGFLAGS = -F
 .fig.png:
-	if test "x$PNGTOPNM" = xfalse -o "x$PNMTOPNG" = xfalse; then \
-	    $(FIG2DEV) -L png -F $< > $@; \
+	if test "$(PNGTOPNM)" = false || test "$(PNMTOPNG)" = false; then \
+	    $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< > $@; \
 	else \
-	    $(FIG2DEV) -L png -F $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
+	    $(FIG2DEV) -L png $(FIG2PNGFLAGS) $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
 	fi
 
 .fig.eps:
diff -r f2c326ffb36d -r 07af3b90fef0 doc/enblend.info
Binary file doc/enblend.info has changed
diff -r f2c326ffb36d -r 07af3b90fef0 doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r f2c326ffb36d -r 07af3b90fef0 doc/html2xhtml
--- a/doc/html2xhtml	Wed Aug 11 19:06:14 2010 +0200
+++ b/doc/html2xhtml	Thu Aug 12 19:06:16 2010 +0200
@@ -1,12 +1,13 @@
 #! /bin/sh
+#! /bin/dash -x
 
 # This file is part of Enblend.
 # Licence details can be found in the file COPYING.
 
-# name:         html2xhtml
-# synopsis:     Convert the HTML output of makeinfo(1) to valid XHTML
-# author:       Dr. Christoph L. Spiel
-# bash version: 3.2.39
+# name:          html2xhtml
+# synopsis:      Convert the HTML output of makeinfo(1) to valid XHTML
+# author:        Dr. Christoph L. Spiel
+# shell version: bash-3.2.39, dash-0.5.4
 
 
 readonly global__command=`basename $0`
@@ -18,7 +19,14 @@
          global__xmllint_flags="-valid --noblanks --noent --nsclean --format --encode iso-8859-1"
 
 
-function convert_with_tidy
+failwith_error ()
+{
+    echo "$global__command: $@" 1>&2
+    exit 1
+}
+
+
+convert_with_tidy ()
 {
     # We add the system identifier
     #     "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"
@@ -46,7 +54,7 @@
 # elements that make an XML parser puke and 2/ we have intentionally
 # introduced pseudo MathML tags to coerce tidy(1) into formatting them
 # inline.  These tags must be reverted.
-function postprocess_tidy_output
+postprocess_tidy_output ()
 {
     $global__sed \
         -e '1,9s|""|"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"|' \
@@ -72,31 +80,31 @@
 # Makeinfo(1) generates indirect-reference files for each float.
 # Their filenames start with "Table_" or "Figure_*", which is how we
 # distinguish them from the html files making up the body.
-function is_indirect_reference_file
+is_indirect_reference_file ()
 {
     local filename=$1
 
-    test -z "${filename%Table_*}" -o -z "${filename%Figure_*}"
+    test -z "${filename%Table_*}" || test -z "${filename%Figure_*}"
 }
 
 
 # Convert all html files iside the given directory.
-function convert_directory
+convert_directory ()
 {
     local html_directory=$1
-    local xhtml_directory=${html_directory/%.html/.xhtml}
+    local xhtml_directory=`basename $html_directory .html`.xhtml
 
-    test -d $xhtml_directory || mkdir $xhtml_directory
+    mkdir -p $xhtml_directory
 
     cp *.png $xhtml_directory
 
     (
-        cd $html_directory
+        cd $html_directory || failwith_error "cannot cd to \"$html_directory\""
         ls -1 *.html | \
             $global__sed -ne 's#\(.*\)\.html#s|\1\\.html|\1.xhtml|g#p' > ,fix-file-refs.sed
     )
 
-    echo -n '' > $html_directory/,fix-indir.sed
+    printf '' > $html_directory/,fix-indir.sed
     for html_file in $html_directory/*.html; do
         local html_base=`basename $html_file`
 
@@ -111,7 +119,7 @@
         local html_base=`basename $html_file`
 
         if ! is_indirect_reference_file $html_base; then
-            local xhtml_file=$xhtml_directory/${html_base/%.html/.xhtml}
+            local xhtml_file=$xhtml_directory/`basename $html_base .html`.xhtml
 
 	    convert_with_tidy $html_file | \
                 postprocess_tidy_output | \
@@ -127,10 +135,10 @@
 
 
 # Convert a single standalone html file.
-function convert_file
+convert_file ()
 {
     local html_file=$1
-    local xhtml_file=${html_file/%.html/.xhtml}
+    local xhtml_file=`basename $html_file .html`.xhtml
 
     convert_with_tidy $html_file | \
         postprocess_tidy_output | \
@@ -139,106 +147,99 @@
 }
 
 
-function convert_html_to_xhtml
+convert_html_to_xhtml ()
 {
     local html=$1
 
     if test -d "$html"; then
-        convert_directory "$html"
+        convert_directory $html
     else
-        convert_file "$html"
+        convert_file $html
     fi
 }
 
 
 # We prefer to check for all binaries before we get an unpleasant
 # surprise in one of the pipes.
-function check_binaries
+check_binaries ()
 {
     for v in global__sed global__tidy global__xmllint; do
         eval x=\$$v
-        test -z "$x" && {
-            echo "$global__command: utility \"${v#global__}\" is not defined" 1>&2
-            exit 1
-        }
-        $x --version > /dev/null 2>&1 || {
-            echo "$global__command: cannot execute \"$x\" for \"${v#global__}\"" 1>&2
-            exit 1
-        }
+        test -z "$x" && failwith_error "variable \"${v#global__}\" is not defined"
+        $x --version > /dev/null 2>&1 || \
+            failwith_error "cannot execute \"$x\" for \"${v#global__}\""
     done
 }
 
 
-function parse_options
+parse_options ()
 {
-    let n=0
+    : $((n=0))
 
-    while [ -n "$1" ]; do
+    while test -n "$1"; do
         case "$1" in
             --document-version=*)
-                global__document_version="${1/--document-version=/}"
+                global__document_version="${1#--document-version=}"
                 ;;
             -h | --help)
                 show_help
                 exit 0
                 ;;
             --tidy-flags=*)
-                global__tidy_flags="$global__tidy_flags ${1/--tidy-flags=/}"
+                global__tidy_flags="$global__tidy_flags ${1#--tidy-flags=}"
                 ;;
             --xmllint-flags=*)
-                global__xmllint_flags="$global__xmllint_flags ${1/--xmllint-flags=/}"
+                global__xmllint_flags="$global__xmllint_flags ${1#--xmllint-flags=}"
                 ;;
 
             --)
                 shift
-                let ++n
+                : $((n=n+1))
                 break 2
                 ;;
 
             --*)
-                echo "unknown long option \"$1\"" 1>&2
-                exit 1
+                failwith_error "unknown long option \"$1\""
                 ;;
             -*)
-                echo "unknown short option \"$1\"" 1>&2
-                exit 1
+                failwith_error "unknown short option \"$1\""
                 ;;
 
             *)
                 break 2
         esac
         shift
-        let ++n
+        : $((n=n+1))
     done
 
     return $n
 }
 
 
-function show_help
+show_help ()
 {
-    cat <<END_OF_HELP
+    printf %s "\
 Usage: $global__command_name [OPTIONS] [HTML...]
 Convert HTML files or directories to XHTML.
 
 Options:
       --document-version=VERSION
                              set meta tag for documentation's version
-                             [default: "$global__document_version"]
+                             [default: \"$global__document_version\"]
       --tidy-flags=FLAGS     set flags for tidy(1)
       --xmllint-flags=FLAGS  set flags for xmllint(1)
   -h, --help                 show this help screen
 
 Influential environment variables:
-  SED                        name of sed binary [default: "$global__sed"]
-  TIDY                       name of tidy binary [default: "$global__tidy"]
-  XMLLINT                    name of xmllint binary [default: "$global__xmllint"]
-END_OF_HELP
+  SED                        name of sed binary [default: \"$global__sed\"]
+  TIDY                       name of tidy binary [default: \"$global__tidy\"]
+  XMLLINT                    name of xmllint binary [default: \"$global__xmllint\"]
+"
 }
 
 
 
-function main
+main ()
 {
     parse_options "$@"
     shift $?                    # shift away all options
@@ -252,3 +253,4 @@
 
 
 main "$@"
+exit 0
diff -r f2c326ffb36d -r 07af3b90fef0 doc/versenblend.texi
--- a/doc/versenblend.texi	Wed Aug 11 19:06:14 2010 +0200
+++ b/doc/versenblend.texi	Thu Aug 12 19:06:16 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 31 May 2010
 @set UPDATED-MONTH May 2010
-@... EDITION 4.1-5a9da370be6b
-@... VERSION 4.1-5a9da370be6b
+@set EDITION 4.1-f2c326ffb36d
+@set VERSION 4.1-f2c326ffb36d
diff -r f2c326ffb36d -r 07af3b90fef0 doc/versenfuse.texi
--- a/doc/versenfuse.texi	Wed Aug 11 19:06:14 2010 +0200
+++ b/doc/versenfuse.texi	Thu Aug 12 19:06:16 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 10 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-5a9da370be6b
-@... VERSION 4.1-5a9da370be6b
+@set EDITION 4.1-f2c326ffb36d
+@set VERSION 4.1-f2c326ffb36d

changeset f2c326ffb36d in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=f2c326ffb36d
description:
	Validate the XHML documentation files.

diffstat:

 Makefile.am             |    4 +
 README                  |    6 +
 VERSION                 |    2 +-
 configure.in            |   14 ++-
 doc/Makefile.am         |   54 +++++-----
 doc/color-profiles.texi |    2 -
 doc/default.css         |    2 +-
 doc/enblend.info        |    0 
 doc/enfuse.info         |    0 
 doc/html2xhtml          |  254 ++++++++++++++++++++++++++++++++++++++++++++++++
 doc/tidy-post.sed       |   25 ----
 doc/tidy.cfg            |   18 ---
 doc/versenblend.texi    |    4 +-
 doc/versenfuse.texi     |    4 +-
 14 files changed, 309 insertions(+), 80 deletions(-)

diffs (525 lines):

diff -r 5a9da370be6b -r f2c326ffb36d Makefile.am
--- a/Makefile.am	Tue Aug 10 08:59:16 2010 +0200
+++ b/Makefile.am	Wed Aug 11 19:06:14 2010 +0200
@@ -24,3 +24,7 @@
 .PHONY: uninstall-xhtml
 uninstall-xhtml:
 	$(MAKE) --directory=doc $@
+
+.PHONY: validate-xhtml
+validate-xhtml:
+	$(MAKE) --directory=doc $@
diff -r 5a9da370be6b -r f2c326ffb36d README
--- a/README	Tue Aug 10 08:59:16 2010 +0200
+++ b/README	Wed Aug 11 19:06:14 2010 +0200
@@ -352,6 +352,10 @@
         make pdf
         make xhtml
 
+The make process automatically ensures the validity of the XHTML
+documentation.  Additionally, it can be checked with
+        make validate-xhtml
+
 Note that some additional packages are required to build these
 formats:
         makeinfo       - GNU documentation generator.
@@ -371,6 +375,8 @@
                          Check out http://www.xfig.org/ for Transfig.
         tidy           - Convert HTML to (almost) XHTML.  Tidy is
                          available at http://tidy.sourceforge.net/.
+        xmllint        - Validate XHTML.  Get Xmllint e.g. from
+                         http://www.xmlsoft.org/.
 
 
 * Operating System Specific Instructions and Hints
diff -r 5a9da370be6b -r f2c326ffb36d VERSION
--- a/VERSION	Tue Aug 10 08:59:16 2010 +0200
+++ b/VERSION	Wed Aug 11 19:06:14 2010 +0200
@@ -1,1 +1,1 @@
-4.1-1e941d40f121
+4.1-5a9da370be6b
diff -r 5a9da370be6b -r f2c326ffb36d configure.in
--- a/configure.in	Tue Aug 10 08:59:16 2010 +0200
+++ b/configure.in	Wed Aug 11 19:06:14 2010 +0200
@@ -371,7 +371,7 @@
               pngtopnm,
               false)
 if test "x$PNGTOPNM" = xfalse; then
-    AC_MSG_WARN(cannot find pngtopnm; will not be able to build documentation)
+    AC_MSG_NOTICE(cannot find pngtopnm; will not be able to add transparency to all PNG images)
     can_build_doc=no
     missing_for_doc="$missing_for_doc pngtopnm"
 fi
@@ -381,7 +381,7 @@
               pnmtopng,
               false)
 if test "x$PNMTOPNG" = xfalse; then
-    AC_MSG_WARN(cannot find pnmtopng; will not be able to build documentation)
+    AC_MSG_NOTICE(cannot find pnmtopng; will not be able to add transparency to all PNG images)
     can_build_doc=no
     missing_for_doc="$missing_for_doc pnmtopng"
 fi
@@ -440,6 +440,16 @@
     missing_for_doc="$missing_for_doc tidy"
 fi
 
+AC_CHECK_PROG(XMLLINT,
+              xmllint,
+              xmllint,
+              false)
+if test "x$XMLLINT" = xfalse; then
+    AC_MSG_WARN(cannot find xmllint; will not be able to build XHTML documentation)
+    can_build_doc=no
+    missing_for_doc="$missing_for_doc xmllint"
+fi
+
 AM_CONDITIONAL([BUILD_DOC], [test $can_build_doc = yes])
 if test $can_build_doc = no; then
     no_doc_reason=", because of missing$missing_for_doc"
diff -r 5a9da370be6b -r f2c326ffb36d doc/Makefile.am
--- a/doc/Makefile.am	Tue Aug 10 08:59:16 2010 +0200
+++ b/doc/Makefile.am	Wed Aug 11 19:06:14 2010 +0200
@@ -44,8 +44,7 @@
 
 TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
 
-EXTRA_DIST = docstrings \
-             tidy.cfg tidy-post.sed
+EXTRA_DIST = docstrings
 
 # created by make(1), user probably wants to rebuild (often?)
 MOSTLYCLEANFILES = varsenblend.texi varsenfuse.texi
@@ -102,35 +101,24 @@
 	-rm -rf enblend.xhtml enfuse.xhtml
 
 
-TIDY_FLAGS = -config $(srcdir)/tidy.cfg -file /dev/null
-SED_FLAGS_XHTML = -f $(srcdir)/tidy-post.sed
+XMLLINT_FLAGS = --noout --valid
+
+# The following exported variables are respected by html2xhml(1).
+export TIDY SED XMLLINT
 
 .PHONY: xhtml
-xhtml: $(HTMLS) html-local
+xhtml: $(HTMLS:.html=.xhtml) html-local
+
+.PHONY: validate-xhtml
+validate-xhtml: $(HTMLS:.html=.xhtml)
 	for x in $(HTMLS); do \
           xhtml=$${x/%.html/.xhtml}; \
-	  if test -d $$x; then \
-            test -d $$xhtml || mkdir $$xhtml; \
-            cp *.png $$xhtml; \
-	    (cd $$x; ls -1 *.html | $(SED) -ne 's#\(.*\)\.html#s|\1\\.html|\1.xhtml|g#p' > fix-refs.sed); \
-	    for y in $$x/*.html; do \
-              if test "$$x/" = "$${y%Table_*}" -o "$$x/" = "$${y%Figure_*}"; then \
-                  $(SED) -e 's|>| />|' < $$y > $${y//.html/.xhtml}; \
-              else \
-		  $(TIDY) $(TIDY_FLAGS) $$y | \
-		    $(SED) $(SED_FLAGS_XHTML) \
-                           -f $$x/fix-refs.sed \
-			   -e 's|^<head>|<head>\n<meta content="$(VERSION)" name="enblend-version" />|' \
-			   -e 's|<a\([^>]*\)name="[^"]*"\([^>]*\)|<a\1\2|g' \
-			   -e 's|\("[^/"]*\)\.html\([#"]\)|\1.xhtml\2|' \
-			   > $${y//.html/.xhtml}; \
-              fi \
-            done; \
+	  if test -d $$xhtml; then \
+	    for y in $$xhtml/*.xhtml; do \
+	      $(XMLLINT) $(XMLLINT_FLAGS) $$y; \
+	    done; \
 	  else \
-	    $(TIDY) $(TIDY_FLAGS) $$x | \
-	      $(SED) $(SED_FLAGS_XHTML) \
-	    	 -e 's|^<head>|<head>\n<meta content="$(VERSION)" name="enblend-version" />|' \
-	    	 -e 's|<a\([^>]*\)name=\([^>]*\)|<a\1id=\2|g' > $$xhtml; \
+	    $(XMLLINT) $(XMLLINT_FLAGS) $$xhtml; \
           fi; \
 	done
 
@@ -183,7 +171,11 @@
                -e 's/^# \?//' < $< > $@
 
 .fig.png:
-	$(FIG2DEV) -L png -F $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@
+	if test "x$PNGTOPNM" = xfalse -o "x$PNMTOPNG" = xfalse; then \
+	    $(FIG2DEV) -L png -F $< > $@; \
+	else \
+	    $(FIG2DEV) -L png -F $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@; \
+	fi
 
 .fig.eps:
 	$(FIG2DEV) -L eps $< $@
@@ -192,6 +184,14 @@
 	$(FIG2DEV) -L pdf $< $@
 
 
+.html.xhtml:
+	$(srcdir)/html2xhtml \
+	    --document-version=$(VERSION) \
+	    --tidy-flags="$(EXTRATIDYFLAGS)" \
+	    --xmllint-flags="$(EXTRAXMLLINTFLAGS)" \
+	    $<
+
+
 # Explicit Rules
 
 varsenblend.texi: $(srcdir)/../src/enblend.cc \
diff -r 5a9da370be6b -r f2c326ffb36d doc/color-profiles.texi
--- a/doc/color-profiles.texi	Tue Aug 10 08:59:16 2010 +0200
+++ b/doc/color-profiles.texi	Wed Aug 11 19:06:14 2010 +0200
@@ -60,8 +60,6 @@
 experience less change when switching the blending spaces.  However,
 colors close the border of any color space can see marked changes.
 
-@... 2
-@...
 For color geeks: The transformations to @acronym{CIECAM02} color space
 and back use
 
diff -r 5a9da370be6b -r f2c326ffb36d doc/default.css
--- a/doc/default.css	Tue Aug 10 08:59:16 2010 +0200
+++ b/doc/default.css	Wed Aug 11 19:06:14 2010 +0200
@@ -8,7 +8,7 @@
 h1, h2, h3, h4, h5, h6 {margin-left: -4%}
 
 dl, h1, h2, h3, h4, h5, h6, ol, p, table, ul {font-family: sans-serif}
-code, pre {font-family: monospace; font-size: 110%}
+code, pre {font-family: monospace;}
 var {
     font-family: sans-serif;
     font-style: italic
diff -r 5a9da370be6b -r f2c326ffb36d doc/enblend.info
Binary file doc/enblend.info has changed
diff -r 5a9da370be6b -r f2c326ffb36d doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 5a9da370be6b -r f2c326ffb36d doc/html2xhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/html2xhtml	Wed Aug 11 19:06:14 2010 +0200
@@ -0,0 +1,254 @@
+#! /bin/sh
+
+# This file is part of Enblend.
+# Licence details can be found in the file COPYING.
+
+# name:         html2xhtml
+# synopsis:     Convert the HTML output of makeinfo(1) to valid XHTML
+# author:       Dr. Christoph L. Spiel
+# bash version: 3.2.39
+
+
+readonly global__command=`basename $0`
+         global__document_version=unknown
+readonly global__sed=${SED:-sed}
+readonly global__tidy=${TIDY:-tidy}
+         global__tidy_flags=""
+readonly global__xmllint=${XMLLINT:-xmllint}
+         global__xmllint_flags="-valid --noblanks --noent --nsclean --format --encode iso-8859-1"
+
+
+function convert_with_tidy
+{
+    # We add the system identifier
+    #     "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"
+    # with sed(1) after tidy(1).  See function postprocess_tidy_output.
+
+    $global__tidy \
+        --add-xml-decl yes \
+        --doctype '"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"' \
+        --file /dev/null \
+        --new-blocklevel-tags "math, mfenced, mfrac, mover, mrow, msqrt, msub, msup, mtable, mtd, mtr, munder, munderover" \
+        --new-empty-tags mspace \
+        --new-inline-tags "mathinline, mi, mn, mo, mrowinline, msubinline, msupinline, mtext" \
+        --sort-attributes alpha \
+        --output-encoding latin1 \
+        --output-xhtml yes \
+        --preserve-entities yes \
+        --quiet yes \
+        --wrap 0 \
+        $global__tidy_flags \
+        "$@"
+}
+
+
+# We must postprocess tidy(1)'s output, because 1/ it still contains
+# elements that make an XML parser puke and 2/ we have intentionally
+# introduced pseudo MathML tags to coerce tidy(1) into formatting them
+# inline.  These tags must be reverted.
+function postprocess_tidy_output
+{
+    $global__sed \
+        -e '1,9s|""|"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"|' \
+        \
+        -e "s|^<head>|<head>\n<meta content=\"$global__document_version\" name=\"enblend-version\" />|" \
+        \
+        -e 's|<html\([^>]*\) lang="[^"]*"\([^>]*\)|<html\1\2|' \
+        -e 's|<ol[^>]*>|<ol>|' \
+        -e 's|<t\([dh]\)\([^>]*\)width="[^"]*"\([^>]*\)|<t\1\2\3|' \
+        -e 's|<ul\([^>]*\)compact="[^"]*"\([^>]*\)|<ul\1\2|' \
+        \
+        -e 's|<mathinline|<math|g' \
+        -e 's|</mathinline|</math|g' \
+        -e 's|<mrowinline|<mrow|g' \
+        -e 's|</mrowinline|</mrow|g' \
+        -e 's|<msubinline|<msub|g' \
+        -e 's|</msubinline|</msub|g' \
+        -e 's|<msupinline|<msup|g' \
+        -e 's|</msupinline|</msup|'
+}
+
+
+# Makeinfo(1) generates indirect-reference files for each float.
+# Their filenames start with "Table_" or "Figure_*", which is how we
+# distinguish them from the html files making up the body.
+function is_indirect_reference_file
+{
+    local filename=$1
+
+    test -z "${filename%Table_*}" -o -z "${filename%Figure_*}"
+}
+
+
+# Convert all html files iside the given directory.
+function convert_directory
+{
+    local html_directory=$1
+    local xhtml_directory=${html_directory/%.html/.xhtml}
+
+    test -d $xhtml_directory || mkdir $xhtml_directory
+
+    cp *.png $xhtml_directory
+
+    (
+        cd $html_directory
+        ls -1 *.html | \
+            $global__sed -ne 's#\(.*\)\.html#s|\1\\.html|\1.xhtml|g#p' > ,fix-file-refs.sed
+    )
+
+    echo -n '' > $html_directory/,fix-indir.sed
+    for html_file in $html_directory/*.html; do
+        local html_base=`basename $html_file`
+
+        if is_indirect_reference_file $html_base; then
+            url=`$global__sed -ne 's#^.*url=\([^"]*\)".*$#\1#p' < $html_file`
+            target_file=`echo $url | $global__sed -e 's/#.*$//'`
+            echo "s|$html_base|$target_file|" >> $html_directory/,fix-indir.sed
+        fi
+    done
+
+    for html_file in $html_directory/*.html; do
+        local html_base=`basename $html_file`
+
+        if ! is_indirect_reference_file $html_base; then
+            local xhtml_file=$xhtml_directory/${html_base/%.html/.xhtml}
+
+	    convert_with_tidy $html_file | \
+                postprocess_tidy_output | \
+	        $global__sed \
+                  -f $html_directory/,fix-indir.sed \
+                  -f $html_directory/,fix-file-refs.sed \
+	          -e 's|<a\([^>]*\)name="[^"]*"\([^>]*\)|<a\1\2|g' \
+	          -e 's|\("[^/"]*\)\.html\([#"]\)|\1.xhtml\2|' | \
+	        $global__xmllint $global__xmllint_flags --output $xhtml_file -
+        fi
+    done
+}
+
+
+# Convert a single standalone html file.
+function convert_file
+{
+    local html_file=$1
+    local xhtml_file=${html_file/%.html/.xhtml}
+
+    convert_with_tidy $html_file | \
+        postprocess_tidy_output | \
+        $global__sed -e 's|<a\([^>]*\)name=\([^>]*\)|<a\1id=\2|g' | \
+        $global__xmllint $global__xmllint_flags --output $xhtml_file -
+}
+
+
+function convert_html_to_xhtml
+{
+    local html=$1
+
+    if test -d "$html"; then
+        convert_directory "$html"
+    else
+        convert_file "$html"
+    fi
+}
+
+
+# We prefer to check for all binaries before we get an unpleasant
+# surprise in one of the pipes.
+function check_binaries
+{
+    for v in global__sed global__tidy global__xmllint; do
+        eval x=\$$v
+        test -z "$x" && {
+            echo "$global__command: utility \"${v#global__}\" is not defined" 1>&2
+            exit 1
+        }
+        $x --version > /dev/null 2>&1 || {
+            echo "$global__command: cannot execute \"$x\" for \"${v#global__}\"" 1>&2
+            exit 1
+        }
+    done
+}
+
+
+function parse_options
+{
+    let n=0
+
+    while [ -n "$1" ]; do
+        case "$1" in
+            --document-version=*)
+                global__document_version="${1/--document-version=/}"
+                ;;
+            -h | --help)
+                show_help
+                exit 0
+                ;;
+            --tidy-flags=*)
+                global__tidy_flags="$global__tidy_flags ${1/--tidy-flags=/}"
+                ;;
+            --xmllint-flags=*)
+                global__xmllint_flags="$global__xmllint_flags ${1/--xmllint-flags=/}"
+                ;;
+
+            --)
+                shift
+                let ++n
+                break 2
+                ;;
+
+            --*)
+                echo "unknown long option \"$1\"" 1>&2
+                exit 1
+                ;;
+            -*)
+                echo "unknown short option \"$1\"" 1>&2
+                exit 1
+                ;;
+
+            *)
+                break 2
+        esac
+        shift
+        let ++n
+    done
+
+    return $n
+}
+
+
+function show_help
+{
+    cat <<END_OF_HELP
+Usage: $global__command_name [OPTIONS] [HTML...]
+Convert HTML files or directories to XHTML.
+
+Options:
+      --document-version=VERSION
+                             set meta tag for documentation's version
+                             [default: "$global__document_version"]
+      --tidy-flags=FLAGS     set flags for tidy(1)
+      --xmllint-flags=FLAGS  set flags for xmllint(1)
+  -h, --help                 show this help screen
+
+Influential environment variables:
+  SED                        name of sed binary [default: "$global__sed"]
+  TIDY                       name of tidy binary [default: "$global__tidy"]
+  XMLLINT                    name of xmllint binary [default: "$global__xmllint"]
+END_OF_HELP
+}
+
+
+
+function main
+{
+    parse_options "$@"
+    shift $?                    # shift away all options
+
+    check_binaries
+
+    for x in "$@"; do
+        convert_html_to_xhtml "$x"
+    done
+}
+
+
+main "$@"
diff -r 5a9da370be6b -r f2c326ffb36d doc/tidy-post.sed
--- a/doc/tidy-post.sed	Tue Aug 10 08:59:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# name:     tidy-post.sed
-# synopsis: script for postprocessing the output of
-#           tidy(1) to get a valid XHTML document
-# author:   Dr. Christoph L. Spiel
-
-
-# The public id is in tidy.cfg.
-1,9s|""|"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"|
-
-# Trim attibutes that are not allowed in XHTML.
-s|<html\([^>]*\) lang="[^"]*"\([^>]*\)|<html\1\2|
-s|<ol[^>]*>|<ol>|
-s|<t\([dh]\)\([^>]*\)width="[^"]*"\([^>]*\)|<t\1\2\3|
-s|<ul\([^>]*\)compact="[^"]*"\([^>]*\)|<ul\1\2|
-
-# Undo our dirty work that tricks tidy(1) into correctly
-# formatting inline math tags.
-s|<mathinline|<math|g
-s|</mathinline|</math|g
-s|<mrowinline|<mrow|g
-s|</mrowinline|</mrow|g
-s|<msubinline|<msub|g
-s|</msubinline|</msub|g
-s|<msupinline|<msup|g
-s|</msupinline|</msup|g
diff -r 5a9da370be6b -r f2c326ffb36d doc/tidy.cfg
--- a/doc/tidy.cfg	Tue Aug 10 08:59:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-add-xml-decl: yes
-
-doctype: "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
-# We add the system identifier
-#     "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"
-# with sed(1) after tidy(1).
-
-new-blocklevel-tags: math, mfenced, mfrac, mover, mrow, msqrt, msub, msup, mtable, mtd, mtr, munder, munderover
-new-empty-tags: mspace
-new-inline-tags: mathinline, mi, mn, mo, mrowinline, msubinline, msupinline, mtext
-new-pre-tags:
-
-sort-attributes: alpha
-output-encoding: latin1
-output-xhtml: yes
-preserve-entities: yes
-quiet: yes
-wrap: 0
diff -r 5a9da370be6b -r f2c326ffb36d doc/versenblend.texi
--- a/doc/versenblend.texi	Tue Aug 10 08:59:16 2010 +0200
+++ b/doc/versenblend.texi	Wed Aug 11 19:06:14 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 31 May 2010
 @set UPDATED-MONTH May 2010
-@... EDITION 4.1-1e941d40f121
-@... VERSION 4.1-1e941d40f121
+@set EDITION 4.1-5a9da370be6b
+@set VERSION 4.1-5a9da370be6b
diff -r 5a9da370be6b -r f2c326ffb36d doc/versenfuse.texi
--- a/doc/versenfuse.texi	Tue Aug 10 08:59:16 2010 +0200
+++ b/doc/versenfuse.texi	Wed Aug 11 19:06:14 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 10 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-1e941d40f121
-@... VERSION 4.1-1e941d40f121
+@set EDITION 4.1-5a9da370be6b
+@set VERSION 4.1-5a9da370be6b

changeset 5a9da370be6b in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=5a9da370be6b
description:
	Do not suppress the sections of an info file with "--no-headers"
	if the packages is configured with "--disable-split-doc".  Unsplit
	XHTML still will be formatted without sections.

	Add the Make-variable MAKEINFOHTMLFLAGS, which influences the build of
	the XHTML format.

diffstat:

 README               |    2 ++
 VERSION              |    2 +-
 configure.in         |    7 +++++--
 doc/Makefile.am      |    5 ++++-
 doc/enblend.info     |    0 
 doc/enfuse.info      |    0 
 doc/versenblend.texi |    4 ++--
 doc/versenfuse.texi  |    6 +++---
 8 files changed, 17 insertions(+), 9 deletions(-)

diffs (90 lines):

diff -r 1e941d40f121 -r 5a9da370be6b README
--- a/README	Tue Aug 10 08:42:39 2010 +0200
+++ b/README	Tue Aug 10 08:59:16 2010 +0200
@@ -333,6 +333,8 @@
 example, to set the maximum length of lines in Info and plain text
 output with
     make MAKEINFOFLAGS="--fill-column=95" info
+The variable MAKEINFOHTMLFLAGS controls the formatting of XHTML; if
+set, it adds to MAKEINFOFLAGS.
 
 
 * Documentation
diff -r 1e941d40f121 -r 5a9da370be6b VERSION
--- a/VERSION	Tue Aug 10 08:42:39 2010 +0200
+++ b/VERSION	Tue Aug 10 08:59:16 2010 +0200
@@ -1,1 +1,1 @@
-4.1-b2803671dd1f
+4.1-1e941d40f121
diff -r 1e941d40f121 -r 5a9da370be6b configure.in
--- a/configure.in	Tue Aug 10 08:42:39 2010 +0200
+++ b/configure.in	Tue Aug 10 08:59:16 2010 +0200
@@ -456,14 +456,17 @@
      -o "x$split_doc" = "xYES" \
      -o "x$split_doc" = "xYes"; then
     AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS"
+    AM_MAKEINFOHTMLFLAGS="$AM_MAKEINFOHTMLFLAGS"
     AC_MSG_RESULT(yes)
     split_doc=yes
 else
-    AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS --no-split --no-headers"
+    AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS --no-split"
+    AM_MAKEINFOHTMLFLAGS="$AM_MAKEINFOHTMLFLAGS --no-split --no-headers"
     AC_MSG_RESULT(no)
     split_doc=no
 fi
 AC_SUBST(AM_MAKEINFOFLAGS)
+AC_SUBST(AM_MAKEINFOHTMLFLAGS)
 
 # use a static vigra impex library
 CXXFLAGS="-DVIGRA_STATIC_LIB ${CXXFLAGS}"
@@ -572,7 +575,7 @@
  can build all documentation:      ${can_build_doc}${no_doc_reason}
 
  feature selection:
-   split *.info and *.html files:  ${split_doc}
+   split *.info and *.xhtml files: ${split_doc}
    enable debugging support:       ${enable_debug}
    enable malloc debugging:        ${enable_dmalloc}
    OpenEXR image format            ${have_exr}
diff -r 1e941d40f121 -r 5a9da370be6b doc/Makefile.am
--- a/doc/Makefile.am	Tue Aug 10 08:42:39 2010 +0200
+++ b/doc/Makefile.am	Tue Aug 10 08:59:16 2010 +0200
@@ -35,8 +35,11 @@
                   default.css
 
 AM_MAKEINFOFLAGS = @AM_MAKEINFOFLAGS@ \
+                   -I $(top_builddir) -I $(srcdir)
+AM_MAKEINFOHTMLFLAGS = @AM_MAKEINFOHTMLFLAGS@ \
                    -I $(top_builddir) -I $(srcdir) \
-                   --css-include=@srcdir@...
+                   --css-include=@srcdir@... \
+                   $(MAKEINFOHTMLFLAGS)
 export TEXINPUTS=$(top_builddir):$(srcdir)
 
 TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
diff -r 1e941d40f121 -r 5a9da370be6b doc/enblend.info
Binary file doc/enblend.info has changed
diff -r 1e941d40f121 -r 5a9da370be6b doc/enfuse.info
Binary file doc/enfuse.info has changed
diff -r 1e941d40f121 -r 5a9da370be6b doc/versenblend.texi
--- a/doc/versenblend.texi	Tue Aug 10 08:42:39 2010 +0200
+++ b/doc/versenblend.texi	Tue Aug 10 08:59:16 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 31 May 2010
 @set UPDATED-MONTH May 2010
-@... EDITION 4.1-796da75c2703
-@... VERSION 4.1-796da75c2703
+@set EDITION 4.1-1e941d40f121
+@set VERSION 4.1-1e941d40f121
diff -r 1e941d40f121 -r 5a9da370be6b doc/versenfuse.texi
--- a/doc/versenfuse.texi	Tue Aug 10 08:42:39 2010 +0200
+++ b/doc/versenfuse.texi	Tue Aug 10 08:59:16 2010 +0200
@@ -1,4 +1,4 @@
-@... UPDATED 8 August 2010
+@set UPDATED 10 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-796da75c2703
-@... VERSION 4.1-796da75c2703
+@set EDITION 4.1-1e941d40f121
+@set VERSION 4.1-1e941d40f121

changeset b2803671dd1f in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=b2803671dd1f
description:
	Change rendering of images to improve their quality.

	* Rearrange XFig graphics to fit better on their pages.
	* Augment the README file with informaiton on how to control
	  the rendering of the documentation.
	* Introduce the correct discontinuities of the "cut-off"
	  functions.

diffstat:

 README                            |   19 +-
 VERSION                           |    2 +-
 doc/config.gp                     |   10 +-
 doc/enblend.info                  |  494 ++++++++++++----------
 doc/enfuse.info                   |  812 +++++++++++++++++++------------------
 doc/enfuse.texi                   |   43 +-
 doc/entropy-cutoff.gp.in          |   22 +-
 doc/entropy.gp.in                 |   13 +-
 doc/exposure-cutoff.gp.in         |   22 +-
 doc/focus-stack-decision-tree.fig |   10 +-
 doc/gaussian.gp.in                |    9 +-
 doc/laplacian-of-gaussian.gp.in   |   14 +-
 doc/local-analysis-window.fig     |  156 +++---
 doc/sharp-edge.gp.in              |    2 +-
 doc/smooth-edge.gp.in             |    2 +-
 doc/versenfuse.texi               |    4 +-
 doc/workflow.texi                 |    2 +-
 17 files changed, 881 insertions(+), 755 deletions(-)

diffs (truncated from 2219 to 1000 lines):

diff -r 2c47cd11b715 -r b2803671dd1f README
--- a/README	Sat Jul 31 17:09:16 2010 +0200
+++ b/README	Tue Aug 10 08:39:59 2010 +0200
@@ -319,11 +319,20 @@
         @afivepaper
         @afourpaper, @afourwide, @afourlatex
 
-    Moreover, you can specify the height and (optionally) width of the
-    main text area on a page with the
-        @pagesizes HEIGHT [, WIDTH]
-    command.  Remember to supply both HEIGHT and WIDTH with
-    appropriate units ("mm", "in", ...).
+Moreover, you can specify the height and (optionally) width of the
+main text area on a page with the
+    @pagesizes HEIGHT [, WIDTH]
+command.  Remember to supply both HEIGHT and WIDTH with appropriate
+units ("mm", "in", ...).
+
+Another useful Texinfo-command at this level is
+    @finalout
+which suppresses the black rectangles marking overfull hboxes.
+
+Use the standard variable MAKEINFOFLAGS to control makeinfo(1), for
+example, to set the maximum length of lines in Info and plain text
+output with
+    make MAKEINFOFLAGS="--fill-column=95" info
 
 
 * Documentation
diff -r 2c47cd11b715 -r b2803671dd1f VERSION
--- a/VERSION	Sat Jul 31 17:09:16 2010 +0200
+++ b/VERSION	Tue Aug 10 08:39:59 2010 +0200
@@ -1,1 +1,1 @@
-4.1-cd12da20db1a
+4.1-2c47cd11b715
diff -r 2c47cd11b715 -r b2803671dd1f doc/config.gp
--- a/doc/config.gp	Sat Jul 31 17:09:16 2010 +0200
+++ b/doc/config.gp	Tue Aug 10 08:39:59 2010 +0200
@@ -1,7 +1,13 @@
 # Gnuplot configuration
 
+# ASCII size is given in characters.
 Dumb_Width = 71
 Dumb_Height = 36
 
-Png_Width = 400
-Png_Height = 300
+# PNG size is given in pixels.
+Png_Width = 800
+Png_Height = 600
+
+# PDF size is given in inches.
+Pdf_Width = 5
+Pdf_Height = 3.5
diff -r 2c47cd11b715 -r b2803671dd1f doc/enblend.info
--- a/doc/enblend.info	Sat Jul 31 17:09:16 2010 +0200
+++ b/doc/enblend.info	Tue Aug 10 08:39:59 2010 +0200
@@ -105,6 +105,8 @@
 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
 in this tool chain.
 
+
+
 Figure 2.1: Photographic workflow with Enblend and Enfuse.
 
 Take Images
@@ -2085,309 +2087,309 @@
 Program Index
 *************
 
-ale:                                           See 7.        (line 1435)
-align_image_stack (Hugin):                     See 7.        (line 1442)
-cinepaint <1>:                                 See 7.        (line 1454)
-cinepaint:                                     See 3.3.      (line  741)
-convert (ImageMagick):                         See 7.        (line 1465)
-dcraw <1>:                                     See 7.        (line 1425)
+ale:                                           See 7.        (line 1437)
+align_image_stack (Hugin):                     See 7.        (line 1444)
+cinepaint <1>:                                 See 7.        (line 1456)
+cinepaint:                                     See 3.3.      (line  743)
+convert (ImageMagick):                         See 7.        (line 1467)
+dcraw <1>:                                     See 7.        (line 1427)
 dcraw:                                         See 2.        (line  108)
-display (ImageMagick):                         See 7.        (line 1465)
-exiftool:                                      See 7.        (line 1493)
-exrdisplay (OpenEXR):                          See 7.        (line 1471)
-fulla (Hugin):                                 See 7.        (line 1442)
-gimp <1>:                                      See 7.        (line 1461)
-gimp <2>:                                      See 3.3.      (line  741)
+display (ImageMagick):                         See 7.        (line 1467)
+exiftool:                                      See 7.        (line 1495)
+exrdisplay (OpenEXR):                          See 7.        (line 1473)
+fulla (Hugin):                                 See 7.        (line 1444)
+gimp <1>:                                      See 7.        (line 1463)
+gimp <2>:                                      See 3.3.      (line  743)
 gimp:                                          See 2.        (line  108)
-gm (GraphicsMagick):                           See 7.        (line 1465)
-hugin <1>:                                     See 7.        (line 1439)
-hugin <2>:                                     See 3.3.      (line  721)
+gm (GraphicsMagick):                           See 7.        (line 1467)
+hugin <1>:                                     See 7.        (line 1441)
+hugin <2>:                                     See 3.3.      (line  723)
 hugin <3>:                                     See 2.        (line  108)
 hugin:                                         See 1.        (line   62)
-identify (ImageMagick) <1>:                    See 7.        (line 1465)
-identify (ImageMagick):                        See 5.1.      (line 1274)
-montage (ImageMagick):                         See 7.        (line 1465)
-nona (Hugin) <1>:                              See 7.        (line 1442)
-nona (Hugin):                                  See 3.3.      (line  721)
+identify (ImageMagick) <1>:                    See 7.        (line 1467)
+identify (ImageMagick):                        See 5.1.      (line 1276)
+montage (ImageMagick):                         See 7.        (line 1467)
+nona (Hugin) <1>:                              See 7.        (line 1444)
+nona (Hugin):                                  See 3.3.      (line  723)
 PanoTools <1>:                                 See 2.        (line  108)
 PanoTools:                                     See 1.        (line   62)
-pfshdrcalibrate (PFScalibration):              See 7.        (line 1474)
-pfsin (PFSTools):                              See 7.        (line 1474)
-pfsout (PFSTools):                             See 7.        (line 1474)
-pfstmo_* (PFStmo):                             See 7.        (line 1474)
-pfsview (PFSTools):                            See 7.        (line 1474)
-PTmender (PanoTools):                          See 7.        (line 1447)
-PTOptimizer (PanoTools):                       See 7.        (line 1447)
-tifficc (LittleCMS):                           See 7.        (line 1497)
-tiffinfo (libtiff) <1>:                        See 7.        (line 1489)
-tiffinfo (libtiff):                            See 5.1.      (line 1274)
-ufraw <1>:                                     See 7.        (line 1428)
+pfshdrcalibrate (PFScalibration):              See 7.        (line 1476)
+pfsin (PFSTools):                              See 7.        (line 1476)
+pfsout (PFSTools):                             See 7.        (line 1476)
+pfstmo_* (PFStmo):                             See 7.        (line 1476)
+pfsview (PFSTools):                            See 7.        (line 1476)
+PTmender (PanoTools):                          See 7.        (line 1449)
+PTOptimizer (PanoTools):                       See 7.        (line 1449)
+tifficc (LittleCMS):                           See 7.        (line 1499)
+tiffinfo (libtiff) <1>:                        See 7.        (line 1491)
+tiffinfo (libtiff):                            See 5.1.      (line 1276)
+ufraw <1>:                                     See 7.        (line 1430)
 ufraw:                                         See 2.        (line  108)
-ufraw-batch:                                   See 7.        (line 1428)
+ufraw-batch:                                   See 7.        (line 1430)
 Syntactic-Comment Index
 ***********************
 
-enblend-response-file:                         See 3.1.1.    (line  297)
-enfuse-response-file:                          See 3.1.1.    (line  298)
-filename-globbing:                             See 3.1.3.    (line  343)
-glob:                                          See 3.1.3.    (line  339)
-globbing:                                      See 3.1.3.    (line  341)
-response-file:                                 See 3.1.1.    (line  296)
+enblend-response-file:                         See 3.1.1.    (line  299)
+enfuse-response-file:                          See 3.1.1.    (line  300)
+filename-globbing:                             See 3.1.3.    (line  345)
+glob:                                          See 3.1.3.    (line  341)
+globbing:                                      See 3.1.3.    (line  343)
+response-file:                                 See 3.1.1.    (line  298)
 Option Index
 ************
 
---anneal:                                      See 3.4.      (line  789)
---ciecam:                                      See 3.3.      (line  625)
---coarse-mask:                                 See 3.4.      (line  835)
---compression:                                 See 3.2.      (line  412)
---depth:                                       See 3.3.      (line  637)
---dijkstra:                                    See 3.4.      (line  875)
---fallback-profile:                            See 3.3.      (line  729)
---fine-mask:                                   See 3.4.      (line  888)
---gpu:                                         See 3.3.      (line  749)
---help:                                        See 3.2.      (line  448)
---levels:                                      See 3.2.      (line  452)
---load-masks:                                  See 3.4.      (line  895)
---mask-vectorize:                              See 3.4.      (line  901)
---no-ciecam:                                   See 3.3.      (line  773)
---no-optimize:                                 See 3.4.      (line  946)
---optimize:                                    See 3.4.      (line  954)
---optimizer-weights:                           See 3.4.      (line  977)
---output:                                      See 3.2.      (line  493)
---save-masks:                                  See 3.4.      (line 1005)
---smooth-difference:                           See 3.4.      (line 1033)
---verbose:                                     See 3.2.      (line  500)
---version:                                     See 3.2.      (line  535)
---visualize:                                   See 3.4.      (line 1051)
---wrap:                                        See 3.2.      (line  542)
--a:                                            See 3.2.      (line  404)
--b <1>:                                        See 6.        (line 1348)
--b:                                            See 3.3.      (line  613)
--c:                                            See 3.3.      (line  625)
--d:                                            See 3.3.      (line  637)
--f:                                            See 3.3.      (line  717)
--g:                                            See 3.3.      (line  737)
--h:                                            See 3.2.      (line  448)
--l:                                            See 3.2.      (line  452)
--m <1>:                                        See 6.        (line 1348)
--m:                                            See 3.3.      (line  761)
--o:                                            See 3.2.      (line  493)
--V:                                            See 3.2.      (line  535)
--v:                                            See 3.2.      (line  500)
--w:                                            See 3.2.      (line  542)
--x:                                            See 3.2.      (line  592)
+--anneal:                                      See 3.4.      (line  791)
+--ciecam:                                      See 3.3.      (line  627)
+--coarse-mask:                                 See 3.4.      (line  837)
+--compression:                                 See 3.2.      (line  414)
+--depth:                                       See 3.3.      (line  639)
+--dijkstra:                                    See 3.4.      (line  877)
+--fallback-profile:                            See 3.3.      (line  731)
+--fine-mask:                                   See 3.4.      (line  890)
+--gpu:                                         See 3.3.      (line  751)
+--help:                                        See 3.2.      (line  450)
+--levels:                                      See 3.2.      (line  454)
+--load-masks:                                  See 3.4.      (line  897)
+--mask-vectorize:                              See 3.4.      (line  903)
+--no-ciecam:                                   See 3.3.      (line  775)
+--no-optimize:                                 See 3.4.      (line  948)
+--optimize:                                    See 3.4.      (line  956)
+--optimizer-weights:                           See 3.4.      (line  979)
+--output:                                      See 3.2.      (line  495)
+--save-masks:                                  See 3.4.      (line 1007)
+--smooth-difference:                           See 3.4.      (line 1035)
+--verbose:                                     See 3.2.      (line  502)
+--version:                                     See 3.2.      (line  537)
+--visualize:                                   See 3.4.      (line 1053)
+--wrap:                                        See 3.2.      (line  544)
+-a:                                            See 3.2.      (line  406)
+-b <1>:                                        See 6.        (line 1350)
+-b:                                            See 3.3.      (line  615)
+-c:                                            See 3.3.      (line  627)
+-d:                                            See 3.3.      (line  639)
+-f:                                            See 3.3.      (line  719)
+-g:                                            See 3.3.      (line  739)
+-h:                                            See 3.2.      (line  450)
+-l:                                            See 3.2.      (line  454)
+-m <1>:                                        See 6.        (line 1350)
+-m:                                            See 3.3.      (line  763)
+-o:                                            See 3.2.      (line  495)
+-V:                                            See 3.2.      (line  537)
+-v:                                            See 3.2.      (line  502)
+-w:                                            See 3.2.      (line  544)
+-x:                                            See 3.2.      (line  594)
 General Index
 *************
 
-# (response file comment):                     See 3.1.1.    (line  247)
-360o panoramas:                                See 3.2.      (line  542)
-@ (response file prefix):                      See 3.1.      (line  197)
-a.tif:                                         See 3.2.      (line  495)
-affine transformation:                         See 2.        (line  146)
-algorithms, globbing:                          See 3.1.3.    (line  337)
-alpha channel <1>:                             See 2.        (line  167)
+# (response file comment):                     See 3.1.1.    (line  249)
+360o panoramas:                                See 3.2.      (line  544)
+@ (response file prefix):                      See 3.1.      (line  199)
+a.tif:                                         See 3.2.      (line  497)
+affine transformation:                         See 2.        (line  148)
+algorithms, globbing:                          See 3.1.3.    (line  339)
+alpha channel <1>:                             See 2.        (line  169)
 alpha channel:                                 See 1.        (line   55)
-alpha channel, associated:                     See 3.3.      (line  737)
-anneal parameters:                             See 3.4.      (line  789)
+alpha channel, associated:                     See 3.3.      (line  739)
+anneal parameters:                             See 3.4.      (line  791)
 authors, list of:                              See Appendix B.
-                                                             (line 1652)
-binary mask:                                   See 5.        (line 1258)
-bits per channel:                              See 3.3.      (line  637)
-blur difference image:                         See 3.4.      (line 1033)
+                                                             (line 1654)
+binary mask:                                   See 5.        (line 1260)
+bits per channel:                              See 3.3.      (line  639)
+blur difference image:                         See 3.4.      (line 1035)
 bug reports:                                   See Appendix A.
-                                                             (line 1505)
+                                                             (line 1507)
 Burt-Adelson multiresolution spline:           See 1.        (line   43)
-canvas size:                                   See 3.3.      (line  717)
-channel width:                                 See 3.3.      (line  637)
+canvas size:                                   See 3.3.      (line  719)
+channel width:                                 See 3.3.      (line  639)
 channel, alpha:                                See 1.        (line   55)
-CIECAM02 <1>:                                  See 4.        (line 1205)
-CIECAM02:                                      See 3.3.      (line  625)
-coarse mask:                                   See 3.4.      (line  835)
-color appearance model <1>:                    See 4.        (line 1205)
-color appearance model:                        See 3.3.      (line  625)
-color cube, RGB:                               See 4.        (line 1205)
-color profile <1>:                             See 4.        (line 1198)
-color profile:                                 See 3.3.      (line  628)
-color space, sRGB <1>:                         See 4.        (line 1216)
-color space, sRGB:                             See 3.3.      (line  628)
-colors, visualization image:                   See 3.4.      (line 1109)
-compression:                                   See 3.2.      (line  412)
-compression, deflate:                          See 3.2.      (line  427)
-compression, JPEG:                             See 3.2.      (line  418)
-compression, LZW:                              See 3.2.      (line  433)
-compression, packbits:                         See 3.2.      (line  437)
-conversion, raw:                               See 2.        (line  133)
-D50 white point:                               See 4.        (line 1249)
-default output filename:                       See 3.2.      (line  495)
-deflate compression:                           See 3.2.      (line  427)
-DIJKSTRA radius:                               See 3.4.      (line  875)
-double precision float, IEEE754:               See 3.3.      (line  690)
-fallback profile:                              See 3.3.      (line  729)
+CIECAM02 <1>:                                  See 4.        (line 1207)
+CIECAM02:                                      See 3.3.      (line  627)
+coarse mask:                                   See 3.4.      (line  837)
+color appearance model <1>:                    See 4.        (line 1207)
+color appearance model:                        See 3.3.      (line  627)
+color cube, RGB:                               See 4.        (line 1207)
+color profile <1>:                             See 4.        (line 1200)
+color profile:                                 See 3.3.      (line  630)
+color space, sRGB <1>:                         See 4.        (line 1218)
+color space, sRGB:                             See 3.3.      (line  630)
+colors, visualization image:                   See 3.4.      (line 1111)
+compression:                                   See 3.2.      (line  414)
+compression, deflate:                          See 3.2.      (line  429)
+compression, JPEG:                             See 3.2.      (line  420)
+compression, LZW:                              See 3.2.      (line  435)
+compression, packbits:                         See 3.2.      (line  439)
+conversion, raw:                               See 2.        (line  135)
+D50 white point:                               See 4.        (line 1251)
+default output filename:                       See 3.2.      (line  497)
+deflate compression:                           See 3.2.      (line  429)
+DIJKSTRA radius:                               See 3.4.      (line  877)
+double precision float, IEEE754:               See 3.3.      (line  692)
+fallback profile:                              See 3.3.      (line  731)
 feathering, detrimental effect of:             See 1.        (line   62)
-filename, literal:                             See 3.        (line  190)
-fine mask:                                     See 3.4.      (line  888)
-format of response file:                       See 3.1.1.    (line  247)
+filename, literal:                             See 3.        (line  192)
+fine mask:                                     See 3.4.      (line  890)
+format of response file:                       See 3.1.1.    (line  249)
 free documentation license (FDL):              See Appendix C.
-                                                             (line 1690)
-frozen seam-line endpoint:                     See 3.4.      (line 1101)
+                                                             (line 1692)
+frozen seam-line endpoint:                     See 3.4.      (line 1103)
 general index:
-          See ``General Index''.                             (line 2182)
-glob(7):                                       See 3.1.3.    (line  362)
-globbing algorithm literal:                    See 3.1.3.    (line  348)
-globbing algorithm none:                       See 3.1.3.    (line  370)
-globbing algorithm sh:                         See 3.1.3.    (line  379)
-globbing algorithm shell:                      See 3.1.3.    (line  373)
-globbing algorithm wildcard:                   See 3.1.3.    (line  348)
-globbing algorithms:                           See 3.1.3.    (line  337)
+          See ``General Index''.                             (line 2184)
+glob(7):                                       See 3.1.3.    (line  364)
+globbing algorithm literal:                    See 3.1.3.    (line  350)
+globbing algorithm none:                       See 3.1.3.    (line  372)
+globbing algorithm sh:                         See 3.1.3.    (line  381)
+globbing algorithm shell:                      See 3.1.3.    (line  375)
+globbing algorithm wildcard:                   See 3.1.3.    (line  350)
+globbing algorithms:                           See 3.1.3.    (line  339)
 GNU free documentation license:                See Appendix C.
-                                                             (line 1690)
-GPU (Graphics Processing Unit):                See 3.3.      (line  749)
-grammar, response file:                        See 3.1.1.    (line  261)
-grammar, syntactic comment:                    See 3.1.2.    (line  329)
-graphics processing unit:                      See 3.3.      (line  749)
-half precision float, OpenEXR:                 See 3.3.      (line  706)
-helpful programs:                              See 7.        (line 1421)
-Hugin:                                         See A.2.      (line 1595)
-ICC profile <1>:                               See 4.        (line 1198)
-ICC profile:                                   See 3.3.      (line  628)
-IEEE754 double precision float:                See 3.3.      (line  690)
-IEEE754 single precision float:                See 3.3.      (line  680)
-image cache:                                   See 6.        (line 1351)
-image cache, block size:                       See 3.3.      (line  613)
-image cache, cache size:                       See 3.3.      (line  761)
-image cache, location:                         See 6.        (line 1362)
-image colors, visualization:                   See 3.4.      (line 1109)
+                                                             (line 1692)
+GPU (Graphics Processing Unit):                See 3.3.      (line  751)
+grammar, response file:                        See 3.1.1.    (line  263)
+grammar, syntactic comment:                    See 3.1.2.    (line  331)
+graphics processing unit:                      See 3.3.      (line  751)
+half precision float, OpenEXR:                 See 3.3.      (line  708)
+helpful programs:                              See 7.        (line 1423)
+Hugin:                                         See A.2.      (line 1597)
+ICC profile <1>:                               See 4.        (line 1200)
+ICC profile:                                   See 3.3.      (line  630)
+IEEE754 double precision float:                See 3.3.      (line  692)
+IEEE754 single precision float:                See 3.3.      (line  682)
+image cache:                                   See 6.        (line 1353)
+image cache, block size:                       See 3.3.      (line  615)
+image cache, cache size:                       See 3.3.      (line  763)
+image cache, location:                         See 6.        (line 1364)
+image colors, visualization:                   See 3.4.      (line 1111)
 image, multi-layer:                            See 1.        (line   76)
-image, visualization:                          See 3.4.      (line 1068)
+image, visualization:                          See 3.4.      (line 1070)
 index, general:
-          See ``General Index''.                             (line 2182)
+          See ``General Index''.                             (line 2184)
 index, option:
-          See ``Option Index''.                              (line 2139)
+          See ``Option Index''.                              (line 2141)
 index, program:
-          See ``Program Index''.                             (line 2088)
+          See ``Program Index''.                             (line 2090)
 index, syntactic-comment:
-          See ``Syntactic-Comment Index''.                   (line 2130)
-input mask:                                    See 5.1.      (line 1270)
-invocation:                                    See 3.        (line  186)
-JPEG compression:                              See 3.2.      (line  418)
-KImageFuser:                                   See A.2.      (line 1595)
-lens distortion, correction of:                See 2.        (line  146)
-levels, pyramid:                               See 3.2.      (line  452)
-LibJPEG:                                       See 7.        (line 1478)
-LibPNG:                                        See 7.        (line 1481)
-LibTiff:                                       See 7.        (line 1485)
-literal filename:                              See 3.        (line  190)
-load mask:                                     See 3.4.      (line  895)
-loops in seam line:                            See 3.4.      (line  931)
-LZW compression:                               See 3.2.      (line  433)
-mask template character, %:                    See 3.4.      (line 1113)
-mask template character, B:                    See 3.4.      (line 1164)
-mask template character, b:                    See 3.4.      (line 1157)
-mask template character, D:                    See 3.4.      (line 1154)
-mask template character, d:                    See 3.4.      (line 1147)
-mask template character, E:                    See 3.4.      (line 1183)
-mask template character, e:                    See 3.4.      (line 1177)
-mask template character, F:                    See 3.4.      (line 1173)
-mask template character, f:                    See 3.4.      (line 1167)
-mask template character, i:                    See 3.4.      (line 1116)
-mask template character, n:                    See 3.4.      (line 1131)
-mask template character, P:                    See 3.4.      (line 1144)
-mask template character, p:                    See 3.4.      (line 1136)
-mask template characters, table of:            See 3.4.      (line 1112)
-mask, binary:                                  See 5.        (line 1258)
-mask, coarse:                                  See 3.4.      (line  835)
-mask, fine:                                    See 3.4.      (line  888)
-mask, generation:                              See 3.4.      (line  870)
-mask, input files:                             See 5.1.      (line 1270)
-mask, load:                                    See 3.4.      (line  895)
-mask, optimization visualization:              See 3.4.      (line 1051)
-mask, save:                                    See 3.4.      (line 1005)
-mask, vectorization distance:                  See 3.4.      (line  901)
-mask, weight:                                  See 5.        (line 1258)
-masks, understanding:                          See 5.        (line 1258)
-memory, tuning usage of:                       See 6.        (line 1348)
+          See ``Syntactic-Comment Index''.                   (line 2132)
+input mask:                                    See 5.1.      (line 1272)
+invocation:                                    See 3.        (line  188)
+JPEG compression:                              See 3.2.      (line  420)
+KImageFuser:                                   See A.2.      (line 1597)
+lens distortion, correction of:                See 2.        (line  148)
+levels, pyramid:                               See 3.2.      (line  454)
+LibJPEG:                                       See 7.        (line 1480)
+LibPNG:                                        See 7.        (line 1483)
+LibTiff:                                       See 7.        (line 1487)
+literal filename:                              See 3.        (line  192)
+load mask:                                     See 3.4.      (line  897)
+loops in seam line:                            See 3.4.      (line  933)
+LZW compression:                               See 3.2.      (line  435)
+mask template character, %:                    See 3.4.      (line 1115)
+mask template character, B:                    See 3.4.      (line 1166)
+mask template character, b:                    See 3.4.      (line 1159)
+mask template character, D:                    See 3.4.      (line 1156)
+mask template character, d:                    See 3.4.      (line 1149)
+mask template character, E:                    See 3.4.      (line 1185)
+mask template character, e:                    See 3.4.      (line 1179)
+mask template character, F:                    See 3.4.      (line 1175)
+mask template character, f:                    See 3.4.      (line 1169)
+mask template character, i:                    See 3.4.      (line 1118)
+mask template character, n:                    See 3.4.      (line 1133)
+mask template character, P:                    See 3.4.      (line 1146)
+mask template character, p:                    See 3.4.      (line 1138)
+mask template characters, table of:            See 3.4.      (line 1114)
+mask, binary:                                  See 5.        (line 1260)
+mask, coarse:                                  See 3.4.      (line  837)
+mask, fine:                                    See 3.4.      (line  890)
+mask, generation:                              See 3.4.      (line  872)
+mask, input files:                             See 5.1.      (line 1272)
+mask, load:                                    See 3.4.      (line  897)
+mask, optimization visualization:              See 3.4.      (line 1053)
+mask, save:                                    See 3.4.      (line 1007)
+mask, vectorization distance:                  See 3.4.      (line  903)
+mask, weight:                                  See 5.        (line 1260)
+masks, understanding:                          See 5.        (line 1260)
+memory, tuning usage of:                       See 6.        (line 1350)
 multi-directory TIFF:                          See 1.        (line   76)
 multi-layer image:                             See 1.        (line   76)
-nearest-feature transform (NFT):               See 3.4.      (line  870)
+nearest-feature transform (NFT):               See 3.4.      (line  872)
 Octave:                                        See Appendix A.
-                                                             (line 1505)
-OpenEXR, data format:                          See 3.3.      (line  702)
-OpenEXR, half precision float:                 See 3.3.      (line  706)
-optimize seam:                                 See 3.4.      (line  946)
-optimize strategy:                             See 3.4.      (line  959)
-optimize, anneal parameters:                   See 3.4.      (line  789)
-optimizer weights:                             See 3.4.      (line  977)
-optimizer, simulated annealing:                See 3.4.      (line  789)
+                                                             (line 1507)
+OpenEXR, data format:                          See 3.3.      (line  704)
+OpenEXR, half precision float:                 See 3.3.      (line  708)
+optimize seam:                                 See 3.4.      (line  948)
+optimize strategy:                             See 3.4.      (line  961)
+optimize, anneal parameters:                   See 3.4.      (line  791)
+optimizer weights:                             See 3.4.      (line  979)
+optimizer, simulated annealing:                See 3.4.      (line  791)
 option index:
-          See ``Option Index''.                              (line 2139)
-options, common:                               See 3.2.      (line  395)
-options, extended:                             See 3.3.      (line  609)
-options, mask generation:                      See 3.4.      (line  786)
-order, of processing:                          See 3.1.      (line  200)
-output file compression:                       See 3.2.      (line  412)
-output filename, default:                      See 3.2.      (line  495)
-output image, set size of:                     See 3.3.      (line  717)
+          See ``Option Index''.                              (line 2141)
+options, common:                               See 3.2.      (line  397)
+options, extended:                             See 3.3.      (line  611)
+options, mask generation:                      See 3.4.      (line  788)
+order, of processing:                          See 3.1.      (line  202)
+output file compression:                       See 3.2.      (line  414)
+output filename, default:                      See 3.2.      (line  497)
+output image, set size of:                     See 3.3.      (line  719)
 overview:                                      See 1.        (line   43)
-packbits compression:                          See 3.2.      (line  437)
-parallax error:                                See 2.        (line  156)
-perceptual rendering intent:                   See 4.        (line 1247)
-photometric alignment:                         See 2.        (line  148)
+packbits compression:                          See 3.2.      (line  439)
+parallax error:                                See 2.        (line  158)
+perceptual rendering intent:                   See 4.        (line 1249)
+photometric alignment:                         See 2.        (line  150)
 problem reports:                               See Appendix A.
-                                                             (line 1508)
-processing order:                              See 3.1.      (line  200)
-profile, fallback:                             See 3.3.      (line  729)
-profile, ICC <1>:                              See 4.        (line 1198)
-profile, ICC:                                  See 3.3.      (line  628)
+                                                             (line 1510)
+processing order:                              See 3.1.      (line  202)
+profile, fallback:                             See 3.3.      (line  731)
+profile, ICC <1>:                              See 4.        (line 1200)
+profile, ICC:                                  See 3.3.      (line  630)
 program index:
-          See ``Program Index''.                             (line 2088)
-programs, helpful additional:                  See 7.        (line 1421)
-pyramid levels:                                See 3.2.      (line  452)
-radius, DIJKSTRA:                              See 3.4.      (line  875)
-raw conversion:                                See 2.        (line  133)
-rendering intent, perceptual:                  See 4.        (line 1247)
-response file <1>:                             See 3.1.      (line  197)
-response file:                                 See 3.        (line  190)
-response file, comment (#):                    See 3.1.1.    (line  247)
-response file, force recognition of:           See 3.1.1.    (line  291)
-response file, format:                         See 3.1.1.    (line  247)
-response file, grammar:                        See 3.1.1.    (line  261)
-response file, syntactic comment:              See 3.1.2.    (line  317)
-RGB color cube:                                See 4.        (line 1205)
-save mask:                                     See 3.4.      (line 1005)
-seam line, loops:                              See 3.4.      (line  931)
-seam optimization:                             See 3.4.      (line  946)
-seam-line endpoint, frozen:                    See 3.4.      (line 1101)
-simulated annealing optimizer:                 See 3.4.      (line  789)
-single precision float, IEEE754:               See 3.3.      (line  680)
-size, canvas:                                  See 3.3.      (line  717)
-smooth difference image:                       See 3.4.      (line 1033)
+          See ``Program Index''.                             (line 2090)
+programs, helpful additional:                  See 7.        (line 1423)
+pyramid levels:                                See 3.2.      (line  454)
+radius, DIJKSTRA:                              See 3.4.      (line  877)
+raw conversion:                                See 2.        (line  135)
+rendering intent, perceptual:                  See 4.        (line 1249)
+response file <1>:                             See 3.1.      (line  199)
+response file:                                 See 3.        (line  192)
+response file, comment (#):                    See 3.1.1.    (line  249)
+response file, force recognition of:           See 3.1.1.    (line  293)
+response file, format:                         See 3.1.1.    (line  249)
+response file, grammar:                        See 3.1.1.    (line  263)
+response file, syntactic comment:              See 3.1.2.    (line  319)
+RGB color cube:                                See 4.        (line 1207)
+save mask:                                     See 3.4.      (line 1007)
+seam line, loops:                              See 3.4.      (line  933)
+seam optimization:                             See 3.4.      (line  948)
+seam-line endpoint, frozen:                    See 3.4.      (line 1103)
+simulated annealing optimizer:                 See 3.4.      (line  791)
+single precision float, IEEE754:               See 3.3.      (line  682)
+size, canvas:                                  See 3.3.      (line  719)
+smooth difference image:                       See 3.4.      (line 1035)
 SourceForge <1>:                               See Appendix A.
-                                                             (line 1511)
+                                                             (line 1513)
 SourceForge:                                   See 1.        (line   82)
 SourceForge, tracker:                          See Appendix A.
-                                                             (line 1511)
-sRGB color space <1>:                          See 4.        (line 1216)
-sRGB color space:                              See 3.3.      (line  628)
-syntactic comment, grammar:                    See 3.1.2.    (line  329)
-syntactic comment, response file:              See 3.1.2.    (line  317)
+                                                             (line 1513)
+sRGB color space <1>:                          See 4.        (line 1218)
+sRGB color space:                              See 3.3.      (line  630)
+syntactic comment, grammar:                    See 3.1.2.    (line  331)
+syntactic comment, response file:              See 3.1.2.    (line  319)
 syntactic-comment index:
-          See ``Syntactic-Comment Index''.                   (line 2130)
+          See ``Syntactic-Comment Index''.                   (line 2132)
 TIFF, multi-directory:                         See 1.        (line   76)
 tiffcopy:                                      See 1.        (line   76)
 tiffsplit:                                     See 1.        (line   76)
-TMPDIR:                                        See 6.        (line 1362)
+TMPDIR:                                        See 6.        (line 1364)
 tracker, SourceForge:                          See Appendix A.
-                                                             (line 1511)
-transformation, affine:                        See 2.        (line  146)
-understanding masks:                           See 5.        (line 1258)
-virtual reality:                               See 3.2.      (line  552)
-visualization image:                           See 3.4.      (line 1068)
-visualization image colors:                    See 3.4.      (line 1109)
-visualization of mask optimization:            See 3.4.      (line 1051)
-weight mask:                                   See 5.        (line 1258)
-weights, optimizer:                            See 3.4.      (line  977)
-white point, D50:                              See 4.        (line 1249)
+                                                             (line 1513)
+transformation, affine:                        See 2.        (line  148)
+understanding masks:                           See 5.        (line 1260)
+virtual reality:                               See 3.2.      (line  554)
+visualization image:                           See 3.4.      (line 1070)
+visualization image colors:                    See 3.4.      (line 1111)
+visualization of mask optimization:            See 3.4.      (line 1053)
+weight mask:                                   See 5.        (line 1260)
+weights, optimizer:                            See 3.4.      (line  979)
+white point, D50:                              See 4.        (line 1251)
 workflow:                                      See 2.        (line   97)
 workflow with Enblend:                         See 2.        (line  108)
 workflow with Enfuse:                          See 2.        (line  108)
-wrap around:                                   See 3.2.      (line  542)
+wrap around:                                   See 3.2.      (line  544)
diff -r 2c47cd11b715 -r b2803671dd1f doc/enfuse.info
--- a/doc/enfuse.info	Sat Jul 31 17:09:16 2010 +0200
+++ b/doc/enfuse.info	Tue Aug 10 08:39:59 2010 +0200
@@ -96,7 +96,7 @@
 Enfuse
 ******
 
-This manual is for Enfuse (version 4.1-cd12da20db1a, 31 July 2010), a
+This manual is for Enfuse (version 4.1-cd12da20db1a, 8 August 2010), a
 program to merge different exposures of the same scene to produce an
 image that looks much like a tonemapped image.
 
@@ -210,6 +210,8 @@
 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
 in this tool chain.
 
+
+
 Figure 2.1: Photographic workflow with Enblend and Enfuse.
 
 Take Images
@@ -979,34 +981,34 @@
      
            +-----------+------------+-----------+------------+-----------+
            +           +            +           +            +           +
-           |           :            :           :            :           |
+           |           :            :           :            :           *
          1 ++......................................................####***
-           |           :            :           :            :     #**** |
+           |           :            :           :            :      ***  |
            |           :            :           :            :    ***    |
-           |           :            :           :            :  ***      |
-           |           :            :           :            ****        |
+           |           :            :           :            : ****      |
+           |           :            :           :            ***#        |
        0.8 ++..............................................***..........++
-           |           :            :           :       **** :           |
-           |           :            :           :     ***    :           |
-           |           :            :           :   ***      :           |
-           |           :            :           :****        :           |
+           |           :            :           :       ***# :           |
+           |           :            :           :     ***#   :           |
+           |           :            :           :  ****      :           |
+           |           :            :           :***#        :           |
        0.6 ++..................................***......................++
-           |           :            :       ****:            :           |
-           |           :            :     ***   :            :           |
-           |           :            :   ***     :            :           |
-           |           :            :****       :            :           |
+           |           :            :       ***#:            :           |
+           |           :            :     ***#  :            :           |
+           |           :            :  ****     :            :           |
+           |           :            :***#       :            :           |
        0.4 ++......................***..................................++
-           |           :        ****:           :            :           |
-           |           :      ***   :           :            :           |
-           |           :    ***     :           :            :           |
-           |           : ****       :           :            :           |
+           |           :        ***#:           :            :           |
+           |           :      ***#  :           :            :           |
+           |           :   ****     :           :            :           |
+           |           : ***#       :           :            :           |
        0.2 ++..........***..............................................++
-           |        ****            :           :            :           |
-           |      ***  :            :           :            :           |
-           |    ***    :            :           :            :           |
-           | ****      :            :           :            :           |
-         0 ***#.................................................Y.******++
-           |           :           EntropyCutoff(Y, Lower, Upper) ###### |
+           |        ***#            :           :            :           |
+           |      ***# :            :           :            :           |
+           |   ****    :            :           :            :           |
+           | ***#      :            :           :            :           |
+         0 ***.........................................Y + Offset.******++
+           ####        :  EntropyCutoff(Y, Lower, Upper) - Offset ###### |
            +           +            +           +            +           +
            +-----------+------------+-----------+------------+-----------+
            0          0.2          0.4         0.6          0.8          1
@@ -1014,7 +1016,10 @@
 
      Figure 3.1: Linear lightness Y in comparison with an
      entropy-cutoff function for LOWER-CUTOFF = 5% and UPPER-CUTOFF =
-     90% which are rather extreme values.
+     90%, which are rather extreme values.  Please note that we have
+     shifted the original lightness curve up and the cut-off curve down
+     by a very small OFFSET to emphasize that the linear part of Y
+     remains unaltered under the cut-off operation.
 
         Note that a high LOWER-CUTOFF value lightens the resulting
      image, as dark (and presumably noisy) pixels are averaged with
@@ -1126,7 +1131,7 @@
            |      **   :            :           :            :   **      |
            |    ***    :            :           :            :    ***    |
            |  ***      :            :           :            :      ***  |
-           |  *        :            :           :            :        ** |
+           |           :            :           :            :        ** |
          0 ****........................................................***
            |           :          ExposureCutoff(Y, Lower, Upper) ****** |
            +           +            +           +            +           +
@@ -1608,35 +1613,35 @@
 
 
     1 ++----------+------------+---*****---+------------+----------++
-      +           +            +  *     *  +     Gaussian(Y) ****** +
+      +           +            + ***   *** +     Gaussian(Y) ****** +
       |                         **       **                         |
       |                        **         **                        |
-      |                       *             *                       |
-      |                       *             *                       |
+      |                       **           **                       |
+      |                      **             **                      |
   0.8 ++                     *               *                     ++
       |                     *                 *                     |
-      |                    *                   *                    |
-      |                    *                   *                    |
+      |                    **                 **                    |
+      |                   **                   **                   |
       |                   *                     *                   |
-      |                  *                       *                  |
-  0.6 ++                 *                       *                 ++
+      |                  **                     **                  |
+  0.6 ++                **                       **                ++
       |                 *                         *                 |
-      |                 *                         *                 |
-      |                *                           *                |
+      |                **                         **                |
+      |               **                           **               |
       |               *                             *               |
       |              **                             **              |
-      |             *                                 *             |
+      |             **                               **             |
   0.4 ++            *                                 *            ++
-      |            *                                   *            |
-      |            *                                   *            |
+      |            **                                 **            |
+      |           **                                   **           |
       |          **                                     **          |
-      |          *                                       *          |
+      |         **                                       **         |
       |        **                                         **        |
   0.2 ++      **                                           **      ++
       |      **                                             **      |
-      |     *                                                 *     |
-      |   **                                                   **   |
-      |***                                                       ***|
+      |    ***                                               ***    |
+      |  ***                                                   ***  |
+      ****                                                       ****
       *           +            +           +            +           *
     0 ++----------+------------+-----------+------------+----------++
       0          0.2          0.4         0.6          0.8          1
@@ -1735,6 +1740,8 @@
 *note Figure:local-analysis-window:: shows two windows with different
 sizes.
 
+
+
 Figure 5.2: Examples of local analysis windows for the sizes 3 and 5.
 "C" marks the center where the pixel gets the weight.  "N" are
 neighboring pixels, which all contribute equally to the weight.
@@ -1836,34 +1843,34 @@
 
   1 ++--------------+---------------+---------------+--------------++
     +               +             *****             +               +
-    |               :          **** :  *******      :               |
-    |               :        **     :        *******:               |
+    |               :         ***** : ********      :               |
+    |               :       ***     :        ********               |
   0 ++.....................**.......................*****************
     |               :    **         :               :               |
-    |               :    *          :               :               |
+    |               :   **          :               :               |
     |               :  **           :               :               |
-    |               :  *            :               :               |
+    |               : **            :               :               |
  -1 ++...............**............................................++
     |               :*              :               :               |
-    |               *               :               :               |
-    |               *               :               :               |
- -2 ++.............*...............................................++
+    |               **              :               :               |
+    |              **               :               :               |
+ -2 ++............**...............................................++
     |             * :               :               :               |
     |            ** :               :               :               |
-    |           *   :               :               :               |
-    |           *   :               :               :               |
+    |           **  :               :               :               |
+    |          **   :               :               :               |
  -3 ++.........*...................................................++
-    |         *     :               :               :               |
-    |         *     :               :               :               |
+    |         **    :               :               :               |
+    |        **     :               :               :               |
     |       **      :               :               :               |
- -4 ++......*......................................................++
+ -4 ++.....**......................................................++
     |      *        :               :               :               |
-    |     *         :               :               :               |
-    |    *          :               :               :               |
-    |  **           :               :               :               |
+    |    **         :               :               :               |
+    |   **          :               :               :               |
+    | ***           :               :               :               |
  -5 ***............................................................++
     |               :               :               :               |
-    |               :            LaplacianOfGaussian(R, 0.5) ****** |
+    |               :          LaplacianOfGaussian(R, Sigma) ****** |
     +               +               +               +               +
  -6 ++--------------+---------------+---------------+--------------++
     0              0.5              1              1.5              2
@@ -1981,38 +1988,38 @@
 *note Figure:entropy:: shows an entropy function.
 
 
-    1 ++----------+------------+-*********-+------------+----------++
+    1 ++----------+------------+***********+------------+----------++
       +           +          ****         ****    Entropy(p) ****** +
       |                    ***               ***                    |
       |                  ***                   ***                  |
-      |                 **                       **                 |
+      |                ***                       ***                |
       |               **                           **               |
   0.8 ++             **                             **             ++
-      |             *                                 *             |
-      |            *                                   *            |
+      |             **                               **             |
+      |            **                                 **            |
       |           *                                     *           |
-      |          *                                       *          |
-      |         *                                         *         |
-  0.6 ++       *                                           *       ++
-      |        *                                           *        |
+      |          **                                     **          |
+      |         **                                       **         |
+  0.6 ++       **                                         **       ++
+      |       **                                           **       |
       |       *                                             *       |
       |      *                                               *      |
+      |     **                                               **     |
       |     *                                                 *     |
-      |     *                                                 *     |
-      |    *                                                   *    |
-  0.4 ++   *                                                    *  ++
+      |    **                                                 **    |
+  0.4 ++  **                                                   **  ++
       |   *                                                     *   |
-      |   *                                                     *   |
+      |  **                                                     **  |
       |  *                                                       *  |
-      |  *                                                       *  |
-      |  *                                                        * |
+      | **                                                       ** |
+      | *                                                         * |
   0.2 ++*                                                         *++
-      | *                                                          *|
+      |**                                                         **|
       |*                                                           *|
       |*                                                           *|
-      |                                                             |
-      +           +            +           +            +           +
-    0 ++----------+------------+-----------+------------+----------++
+      **                                                           **
+      *           +            +           +            +           *
+    0 *+----------+------------+-----------+------------+----------+*
       0          0.2          0.4         0.6          0.8          1
                                      p
 
@@ -2792,6 +2799,8 @@
 Figure *note Figure:focus-stacking-decision-tree:: helps the user to
 arrive at a well-fused focus stack with as few steps as possible.
 
+
+
 Figure 8.3: Focus stacking decision tree.
 
    Always start with the default, contrast weighting with a local
@@ -3538,395 +3547,395 @@
 Program Index
 *************
 
-ale:                                           See 9.        (line 2863)
-align_image_stack (Hugin):                     See 9.        (line 2870)
-cinepaint <1>:                                 See 9.        (line 2882)
-cinepaint:                                     See 3.3.      (line  838)
-convert (ImageMagick):                         See 9.        (line 2893)
-dcraw <1>:                                     See 9.        (line 2853)
+ale:                                           See 9.        (line 2872)
+align_image_stack (Hugin):                     See 9.        (line 2879)
+cinepaint <1>:                                 See 9.        (line 2891)
+cinepaint:                                     See 3.3.      (line  840)
+convert (ImageMagick):                         See 9.        (line 2902)
+dcraw <1>:                                     See 9.        (line 2862)
 dcraw:                                         See 2.        (line  213)
-display (ImageMagick):                         See 9.        (line 2893)
-exiftool:                                      See 9.        (line 2921)
-exrdisplay (OpenEXR):                          See 9.        (line 2899)
-fulla (Hugin):                                 See 9.        (line 2870)
-gimp <1>:                                      See 9.        (line 2889)
-gimp <2>:                                      See 3.3.      (line  838)
+display (ImageMagick):                         See 9.        (line 2902)
+exiftool:                                      See 9.        (line 2930)
+exrdisplay (OpenEXR):                          See 9.        (line 2908)
+fulla (Hugin):                                 See 9.        (line 2879)
+gimp <1>:                                      See 9.        (line 2898)
+gimp <2>:                                      See 3.3.      (line  840)
 gimp:                                          See 2.        (line  213)
-gm (GraphicsMagick):                           See 9.        (line 2893)
-hugin <1>:                                     See 9.        (line 2867)
-hugin <2>:                                     See 8.1.      (line 2239)
-hugin <3>:                                     See 3.3.      (line  818)
+gm (GraphicsMagick):                           See 9.        (line 2902)
+hugin <1>:                                     See 9.        (line 2876)
+hugin <2>:                                     See 8.1.      (line 2246)
+hugin <3>:                                     See 3.3.      (line  820)
 hugin:                                         See 2.        (line  213)
-identify (ImageMagick) <1>:                    See 9.        (line 2893)
-identify (ImageMagick):                        See 6.1.      (line 2078)
-montage (ImageMagick):                         See 9.        (line 2893)
-nona (Hugin) <1>:                              See 9.        (line 2870)
-nona (Hugin):                                  See 3.3.      (line  818)
+identify (ImageMagick) <1>:                    See 9.        (line 2902)
+identify (ImageMagick):                        See 6.1.      (line 2085)
+montage (ImageMagick):                         See 9.        (line 2902)
+nona (Hugin) <1>:                              See 9.        (line 2879)
+nona (Hugin):                                  See 3.3.      (line  820)
 PanoTools:                                     See 2.        (line  213)
-pfshdrcalibrate (PFScalibration):              See 9.        (line 2902)
-pfsin (PFSTools):                              See 9.        (line 2902)
-pfsout (PFSTools):                             See 9.        (line 2902)
-pfstmo_* (PFStmo):                             See 9.        (line 2902)
-pfsview (PFSTools):                            See 9.        (line 2902)
-PTmender (PanoTools):                          See 9.        (line 2875)
-PTOptimizer (PanoTools):                       See 9.        (line 2875)
-tifficc (LittleCMS):                           See 9.        (line 2925)
-tiffinfo (libtiff) <1>:                        See 9.        (line 2917)
-tiffinfo (libtiff):                            See 6.1.      (line 2078)
-ufraw <1>:                                     See 9.        (line 2856)
+pfshdrcalibrate (PFScalibration):              See 9.        (line 2911)
+pfsin (PFSTools):                              See 9.        (line 2911)
+pfsout (PFSTools):                             See 9.        (line 2911)
+pfstmo_* (PFStmo):                             See 9.        (line 2911)
+pfsview (PFSTools):                            See 9.        (line 2911)
+PTmender (PanoTools):                          See 9.        (line 2884)
+PTOptimizer (PanoTools):                       See 9.        (line 2884)
+tifficc (LittleCMS):                           See 9.        (line 2934)
+tiffinfo (libtiff) <1>:                        See 9.        (line 2926)
+tiffinfo (libtiff):                            See 6.1.      (line 2085)
+ufraw <1>:                                     See 9.        (line 2865)
 ufraw:                                         See 2.        (line  213)
-ufraw-batch:                                   See 9.        (line 2856)
+ufraw-batch:                                   See 9.        (line 2865)
 Syntactic-Comment Index
 ***********************
 
-enblend-response-file:                         See 3.1.1.    (line  402)
-enfuse-response-file:                          See 3.1.1.    (line  403)
-filename-globbing:                             See 3.1.3.    (line  448)
-glob:                                          See 3.1.3.    (line  444)
-globbing:                                      See 3.1.3.    (line  446)
-response-file:                                 See 3.1.1.    (line  401)
+enblend-response-file:                         See 3.1.1.    (line  404)
+enfuse-response-file:                          See 3.1.1.    (line  405)
+filename-globbing:                             See 3.1.3.    (line  450)
+glob:                                          See 3.1.3.    (line  446)
+globbing:                                      See 3.1.3.    (line  448)

changeset 1e941d40f121 in /hgrepo/e/en/enblend/enblend
details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgrepo/e/en/enblend/enblend?cmd=changeset;node=1e941d40f121
description:
	Generate PNG files in the documentation with a transparent background.

	This was required by Yuval Levy, who integrates the (XHTML-)
	documentation into the Enblend website hosted by SourceForge at
	        http://enblend.sourceforge.net/

diffstat:

 README                          |   8 ++++++--
 VERSION                         |   2 +-
 configure.in                    |  20 ++++++++++++++++++++
 doc/Makefile.am                 |   2 +-
 doc/default.css                 |   4 +++-
 doc/enblend.info                |   6 +++---
 doc/enfuse.info                 |   6 +++---
 doc/entropy-cutoff.gp.in        |   2 +-
 doc/entropy.gp.in               |   2 +-
 doc/exposure-cutoff.gp.in       |   2 +-
 doc/gaussian.gp.in              |   2 +-
 doc/laplacian-of-gaussian.gp.in |   2 +-
 doc/sharp-edge.gp.in            |   2 +-
 doc/smooth-edge.gp.in           |   2 +-
 doc/versenblend.texi            |   4 ++--
 doc/versenfuse.texi             |   4 ++--
 16 files changed, 48 insertions(+), 22 deletions(-)

diffs (259 lines):

diff -r b2803671dd1f -r 1e941d40f121 README
--- a/README	Tue Aug 10 08:39:59 2010 +0200
+++ b/README	Tue Aug 10 08:42:39 2010 +0200
@@ -345,10 +345,10 @@
         src/enfuse.1
 
 After the configuration you can build documentation in PostScript,
-PDF, and HTML format.
+PDF, and XHTML format.
         make ps
         make pdf
-        make html
+        make xhtml
 
 Note that some additional packages are required to build these
 formats:
@@ -358,6 +358,10 @@
         freefonts      - Fonts for Gnuplot's PNG format.
         ghostscript    - Convert EPS to PDF.
         perl           - Run Perl programs.
+        pngtopnm       - Convert Portable Network Graphics (PNG) to
+                         portable anymap (PNM).  See http://www.libpng.org/.
+        pnmtopng       - Convert portable anymap (PNM) to Portable
+                         Network Graphics (PNG).  http://www.libpng.org/
         tetex          - Typeset the Texinfo documents in PS or PDF.
         texi2html      - Convert Texinfo to HTML.  Find more information
                          at http://www.nongnu.org/texi2html/.
diff -r b2803671dd1f -r 1e941d40f121 VERSION
--- a/VERSION	Tue Aug 10 08:39:59 2010 +0200
+++ b/VERSION	Tue Aug 10 08:42:39 2010 +0200
@@ -1,1 +1,1 @@
-4.1-2c47cd11b715
+4.1-b2803671dd1f
diff -r b2803671dd1f -r 1e941d40f121 configure.in
--- a/configure.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/configure.in	Tue Aug 10 08:42:39 2010 +0200
@@ -366,6 +366,26 @@
     missing_for_doc="$missing_for_doc fig2dev"
 fi
 
+AC_CHECK_PROG(PNGTOPNM,
+              pngtopnm,
+              pngtopnm,
+              false)
+if test "x$PNGTOPNM" = xfalse; then
+    AC_MSG_WARN(cannot find pngtopnm; will not be able to build documentation)
+    can_build_doc=no
+    missing_for_doc="$missing_for_doc pngtopnm"
+fi
+
+AC_CHECK_PROG(PNMTOPNG,
+              pnmtopng,
+              pnmtopng,
+              false)
+if test "x$PNMTOPNG" = xfalse; then
+    AC_MSG_WARN(cannot find pnmtopng; will not be able to build documentation)
+    can_build_doc=no
+    missing_for_doc="$missing_for_doc pnmtopng"
+fi
+
 AC_PROG_SED
 
 # These variables are mentioned in the AutoMake documentation as being
diff -r b2803671dd1f -r 1e941d40f121 doc/Makefile.am
--- a/doc/Makefile.am	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/Makefile.am	Tue Aug 10 08:42:39 2010 +0200
@@ -180,7 +180,7 @@
                -e 's/^# \?//' < $< > $@
 
 .fig.png:
-	$(FIG2DEV) -L png $< $@
+	$(FIG2DEV) -L png -F $< | $(PNGTOPNM) | $(PNMTOPNG) -transparent white > $@
 
 .fig.eps:
 	$(FIG2DEV) -L eps $< $@
diff -r b2803671dd1f -r 1e941d40f121 doc/default.css
--- a/doc/default.css	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/default.css	Tue Aug 10 08:42:39 2010 +0200
@@ -1,5 +1,7 @@
 /* Settings for generic elements */
 body {
+    background: white;
+    color: black;
     margin-left: 6%;
     margin-right: 6%
 }
@@ -12,7 +14,7 @@
     font-style: italic
 }
 
-/* Class- and attibute based settings */
+/* Class-based and attibute-based settings */
 div.contents {}
 div.float {
     border-bottom: 1px solid;
diff -r b2803671dd1f -r 1e941d40f121 doc/enblend.info
--- a/doc/enblend.info	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/enblend.info	Tue Aug 10 08:42:39 2010 +0200
@@ -33,7 +33,7 @@
 Enblend
 *******
 
-This manual is for Enblend (version 4.1-cd12da20db1a, 31 May 2010), a
+This manual is for Enblend (version 4.1-796da75c2703, 31 May 2010), a
 tool for compositing images in such a way that the seam between the
 images is invisible, or at least very difficult to see.
 
@@ -752,7 +752,7 @@
      - to accelerate some computations.
 
      This is an experimental feature that may not work on all systems.
-     In this version of Enblend, 4.1-cd12da20db1a, only mask
+     In this version of Enblend, 4.1-796da75c2703, only mask
      optimization strategy 1 benefits from this option.
 
      Note that GPU-support must have been compiled into Enblend for
@@ -989,7 +989,7 @@
 
         The optimizer weights DISTANCE-WEIGHT and MISMATCH-WEIGHT
      define how to weight these two criteria.  Enblend up to
-     version 3.2 used 1:1.  This version of Enblend (4.1-cd12da20db1a)
+     version 3.2 used 1:1.  This version of Enblend (4.1-796da75c2703)
      uses 8.0:1.0.
 
         A large DISTANCE-WEIGHT pulls the optimized seam line closer to
diff -r b2803671dd1f -r 1e941d40f121 doc/enfuse.info
--- a/doc/enfuse.info	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/enfuse.info	Tue Aug 10 08:42:39 2010 +0200
@@ -96,7 +96,7 @@
 Enfuse
 ******
 
-This manual is for Enfuse (version 4.1-cd12da20db1a, 8 August 2010), a
+This manual is for Enfuse (version 4.1-796da75c2703, 8 August 2010), a
 program to merge different exposures of the same scene to produce an
 image that looks much like a tonemapped image.
 
@@ -1164,7 +1164,7 @@
         Use gray projector PROJECTOR for conversion of RGB images to
      grayscale masks: (R, G, B) -> Y.
 
-        In version 4.1-cd12da20db1a of Enfuse, the option is effective
+        In version 4.1-796da75c2703 of Enfuse, the option is effective
      for exposure weighting and local contrast weighting.  Default:
      `average'.
 
@@ -1565,7 +1565,7 @@
 Local Entropy    0.0
 
 Table 5.1: Enfuse's default weights as compiled into
-version 4.1-cd12da20db1a.
+version 4.1-796da75c2703.
 
    To disable a particular criterion set its weight to zero as for
 example
diff -r b2803671dd1f -r 1e941d40f121 doc/entropy-cutoff.gp.in
--- a/doc/entropy-cutoff.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/entropy-cutoff.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -38,7 +38,7 @@
 replot
 
 set output "entropy-cutoff.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "entropy-cutoff.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/entropy.gp.in
--- a/doc/entropy.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/entropy.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -26,7 +26,7 @@
 replot
 
 set output "entropy.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "entropy.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/exposure-cutoff.gp.in
--- a/doc/exposure-cutoff.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/exposure-cutoff.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -42,7 +42,7 @@
 replot
 
 set output "exposure-cutoff.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "exposure-cutoff.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/gaussian.gp.in
--- a/doc/gaussian.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/gaussian.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -25,7 +25,7 @@
 replot
 
 set output "gaussian.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "gaussian.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/laplacian-of-gaussian.gp.in
--- a/doc/laplacian-of-gaussian.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/laplacian-of-gaussian.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -30,7 +30,7 @@
 replot
 
 set output "laplacian-of-gaussian.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "laplacian-of-gaussian.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/sharp-edge.gp.in
--- a/doc/sharp-edge.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/sharp-edge.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -11,7 +11,7 @@
 replot
 
 set output "sharp-edge.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "sharp-edge.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/smooth-edge.gp.in
--- a/doc/smooth-edge.gp.in	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/smooth-edge.gp.in	Tue Aug 10 08:42:39 2010 +0200
@@ -11,7 +11,7 @@
 replot
 
 set output "smooth-edge.png"
-set terminal png font FreeSans 10 size Png_Width, Png_Height enhanced
+set terminal png transparent font FreeSans 10 size Png_Width, Png_Height enhanced
 replot
 
 set output "smooth-edge.eps"
diff -r b2803671dd1f -r 1e941d40f121 doc/versenblend.texi
--- a/doc/versenblend.texi	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/versenblend.texi	Tue Aug 10 08:42:39 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 31 May 2010
 @set UPDATED-MONTH May 2010
-@... EDITION 4.1-cd12da20db1a
-@... VERSION 4.1-cd12da20db1a
+@set EDITION 4.1-796da75c2703
+@set VERSION 4.1-796da75c2703
diff -r b2803671dd1f -r 1e941d40f121 doc/versenfuse.texi
--- a/doc/versenfuse.texi	Tue Aug 10 08:39:59 2010 +0200
+++ b/doc/versenfuse.texi	Tue Aug 10 08:42:39 2010 +0200
@@ -1,4 +1,4 @@
 @set UPDATED 8 August 2010
 @set UPDATED-MONTH August 2010
-@... EDITION 4.1-cd12da20db1a
-@... VERSION 4.1-cd12da20db1a
+@set EDITION 4.1-796da75c2703
+@set VERSION 4.1-796da75c2703

details:   http://enblend.hg.sourceforge.net/hgweb/enblend/enblend-web/hgrepo/e/en/enblend/enblend-web/rev/89ae5a7c1567
changeset: 13:89ae5a7c1567
user:      Yuval Levy <yuv@...>
date:      Sun Aug 08 09:25:02 2010 -0400
description:
fixed DOCTYPE to properly display MathML formulas in documentation (C. Spiel)

diffstat:

 header.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r e86260093825 -r 89ae5a7c1567 header.php
--- a/header.php	Sun Aug 01 15:22:11 2010 -0400
+++ b/header.php	Sun Aug 08 09:25:02 2010 -0400
@@ -164,7 +164,7 @@
 $menuscript.='articles=\''.$articles_menu.'\';'."\n";
 
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" >
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

Bugs item #3040388, was opened at 2010-08-06 07:36
Message generated for change (Tracker Item Submitted) made by iainlea
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=696409&aid=3040388&group_id=123407

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: Internal error
Group: v4.0
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Iain Lea (iainlea)
Assigned to: Nobody/Anonymous (nobody)
Summary: Enblend 4.0 + OpenMP + Fedora 13 = crash

Initial Comment:
Recompiled the enblend-4.0 SRPM package from Fedora 13 on x86_64 to use --enable-openmp.

Images are a 9 bracketed set of jpeg's converted from 9 Nikon D300 nef raw files.

Repeatable crash on   $ enfuse --compression=100 in*jpg -o out.jpg

Hardware is i7-920 / 12GB RAM / 300GB raptor / Nvidia GTS250

$ uname -a

Linux studio.bricbrac.de 2.6.33.6-147.fc13.x86_64 #1 SMP Tue Jul 6 22:32:17 UTC 2010 x86_64 x86_64 x86_64 GNU/Linux


$ rpm -qa | egrep glibc

glibc-2.12-3.i686
glibc-2.12-3.x86_64
glibc-common-2.12-3.x86_64
glibc-devel-2.12-3.i686
glibc-devel-2.12-3.x86_64
glibc-headers-2.12-3.x86_64


$ rpm -qa | egrep gomp

libgomp-4.4.4-10.fc13.x86_64


$ rpm -qa | egrep gcc

gcc-4.4.4-10.fc13.x86_64
gcc-c++-4.4.4-10.fc13.x86_64
gcc-gfortran-4.4.4-10.fc13.x86_64
gcc-java-4.4.4-10.fc13.x86_64
libgcc-4.4.4-10.fc13.i686
libgcc-4.4.4-10.fc13.x86_64


$ enfuse --compression=100 20100804_01*jpg -o out.jpg

enfuse: info: input image "20100804_011_EV0.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_012_EV-4.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_013_EV-3.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_014_EV-2.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_015_EV-1.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_016_EV+1.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_017_EV+2.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_018_EV+3.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: info: input image "20100804_019_EV+4.jpg" does not have an alpha channel;
enfuse: info: assuming all pixels should contribute to the final image
enfuse: warning: no usable resolution found in first image "20100804_011_EV0.jpg";
enfuse: warning:   will use 300 dpi
enfuse: info: loading next image: 20100804_011_EV0.jpg 1/1
*** glibc detected *** enfuse: double free or corruption (fasttop): 0x00000000020f1580 ***
======= Backtrace: =========
/lib64/libc.so.6[0x3791c75676]
enfuse[0x4604af]
enfuse[0x47d43a]
enfuse[0x43c257]
/usr/lib64/libgomp.so.1[0x37a3808022]
/lib64/libpthread.so.0[0x3792007761]
/lib64/libc.so.6(clone+0x6d)[0x3791ce14ed]
======= Memory map: ========
00400000-007c9000 r-xp 00000000 08:03 1294938                            /usr/bin/enfuse
009c9000-009cb000 rw-p 003c9000 08:03 1294938                            /usr/bin/enfuse
009cb000-00a0d000 rw-p 00000000 00:00 0
020d4000-02115000 rw-p 00000000 00:00 0                                  [heap]
3791800000-379181e000 r-xp 00000000 08:03 16638075                       /lib64/ld-2.12.so
3791a1e000-3791a1f000 r--p 0001e000 08:03 16638075                       /lib64/ld-2.12.so
3791a1f000-3791a20000 rw-p 0001f000 08:03 16638075                       /lib64/ld-2.12.so
3791a20000-3791a21000 rw-p 00000000 00:00 0
3791c00000-3791d75000 r-xp 00000000 08:03 16638084                       /lib64/libc-2.12.so
3791d75000-3791f75000 ---p 00175000 08:03 16638084                       /lib64/libc-2.12.so
3791f75000-3791f79000 r--p 00175000 08:03 16638084                       /lib64/libc-2.12.so
3791f79000-3791f7a000 rw-p 00179000 08:03 16638084                       /lib64/libc-2.12.so
3791f7a000-3791f7f000 rw-p 00000000 00:00 0
3792000000-3792017000 r-xp 00000000 08:03 16638137                       /lib64/libpthread-2.12.so
3792017000-3792216000 ---p 00017000 08:03 16638137                       /lib64/libpthread-2.12.so
3792216000-3792217000 r--p 00016000 08:03 16638137                       /lib64/libpthread-2.12.so
3792217000-3792218000 rw-p 00017000 08:03 16638137                       /lib64/libpthread-2.12.so
3792218000-379221c000 rw-p 00000000 00:00 0
3792400000-3792483000 r-xp 00000000 08:03 16638155                       /lib64/libm-2.12.so
3792483000-3792682000 ---p 00083000 08:03 16638155                       /lib64/libm-2.12.so
3792682000-3792683000 r--p 00082000 08:03 16638155                       /lib64/libm-2.12.so
3792683000-3792684000 rw-p 00083000 08:03 16638155                       /lib64/libm-2.12.so
3792c00000-3792c15000 r-xp 00000000 08:03 16638157                       /lib64/libz.so.1.2.3
3792c15000-3792e14000 ---p 00015000 08:03 16638157                       /lib64/libz.so.1.2.3
3792e14000-3792e15000 rw-p 00014000 08:03 16638157                       /lib64/libz.so.1.2.3
3793000000-3793007000 r-xp 00000000 08:03 16638138                       /lib64/librt-2.12.so
3793007000-3793206000 ---p 00007000 08:03 16638138                       /lib64/librt-2.12.so
3793206000-3793207000 r--p 00006000 08:03 16638138                       /lib64/librt-2.12.so
3793207000-3793208000 rw-p 00007000 08:03 16638138                       /lib64/librt-2.12.so
3793800000-379381b000 r-xp 00000000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
379381b000-3793a1b000 ---p 0001b000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
3793a1b000-3793a1c000 rw-p 0001b000 08:03 1360963                        /usr/lib64/libxmi.so.0.1.3
3796000000-3796026000 r-xp 00000000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796026000-3796225000 ---p 00026000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796225000-3796226000 rw-p 00025000 08:03 12961697                       /usr/lib64/libpng12.so.0.44.0
3796400000-3796416000 r-xp 00000000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3796416000-3796615000 ---p 00016000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3796615000-3796616000 rw-p 00015000 08:03 16638156                       /lib64/libgcc_s-4.4.4-20100630.so.1
3798400000-37984e9000 r-xp 00000000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37984e9000-37986e9000 ---p 000e9000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986e9000-37986f0000 r--p 000e9000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986f0000-37986f2000 rw-p 000f0000 08:03 12961755                       /usr/lib64/libstdc++.so.6.0.13
37986f2000-3798707000 rw-p 00000000 00:00 0
3799400000-3799404000 r-xp 00000000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
3799404000-3799604000 ---p 00004000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
3799604000-3799605000 rw-p 00004000 08:03 1360975                        /usr/lib64/libImath.so.6.0.0
379a000000-379a042000 r-xp 00000000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a042000-379a241000 ---p 00042000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a241000-379a242000 rw-p 00041000 08:03 1360490                        /usr/lib64/libHalf.so.6.0.0
379a400000-379a41a000 r-xp 00000000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a41a000-379a619000 ---p 0001a000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a619000-379a61d000 rw-p 00019000 08:03 1360969                        /usr/lib64/libIex.so.6.0.0
379a800000-379a8c3000 r-xp 00000000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379a8c3000-379aac3000 ---p 000c3000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379aac3000-379aac7000 rw-p 000c3000 08:03 1360970                        /usr/lib64/libIlmImf.so.6.0.0
379ac00000-379ac06000 r-xp 00000000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
379ac06000-379ae05000 ---p 00006000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
379ae05000-379ae06000 rw-p 00005000 08:03 12965668                       /usr/lib64/libIlmThread.so.6.0.0
37a2e00000-37a2e24000 r-xp 00000000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a2e24000-37a3023000 ---p 00024000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a3023000-37a3024000 rw-p 00023000 08:03 12963563                       /usr/lib64/libjpeg.so.62.0.0
37a3800000-37a380d000 r-xp 00000000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a380d000-37a3a0c000 ---p 0000d000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a3a0c000-37a3a0d000 rw-p 0000c000 08:03 12961098                       /usr/lib64/libgomp.so.1.0.0
37a6a00000-37a6a35000 r-xp 00000000 08:03 12964250                       /usr/lib64/liblcms.so.1.
Abort (core dumped)



----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=696409&aid=3040388&group_id=123407