Commit 311f955a authored by Andreas Metzler's avatar Andreas Metzler

Drop debian/patches/*, upstream docs are compatible with texinfo 5.1 now.

parent 14f2d019
......@@ -2,6 +2,8 @@ enblend-enfuse (4.1.4+dfsg-1) UNRELEASED; urgency=medium
* New upstream version.
+ Refresh patches-repack/00-win32helpers.patch.
+ Drop debian/patches/*, upstream docs are compatible with texinfo
5.1 now.
-- Andreas Metzler <ametzler@debian.org> Sat, 03 Oct 2015 13:09:56 +0200
......
From 30727827485eeab1bc0eaa90371aa9ddb34b07f8 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:02:40 +0100
Subject: [PATCH 2/9] expand homepage-macro
texinfo 5.1 breaks on variable names (@set / @value) containing
non-alphanumerical characters. - Only a single one of the macros
is inherited from ./configure. Lets just hardcode it instead.
---
doc/bug-reports.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi
index 716146a..250fc20 100644
--- a/doc/bug-reports.texi
+++ b/doc/bug-reports.texi
@@ -16,7 +16,7 @@ reliable and enjoyable.
When you encounter a problem, the first thing to do is to see if it is
already known. To this end visit the package's
@uref{https://@/launchpad.net/, LaunchPad} bug
-@uref{@value{CFG::PACKAGE_BUGREPORT}, database}. Search it for your
+@uref{https://bugs.launchpad.net/enblend, database}. Search it for your
particular problem. If it is not known, please report it.
In order for a bug report to serve its purpose, you must include the
--
1.7.10.4
From 32f8585212aea7cba36aa98df7b8c8715f2579fa Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:05:34 +0100
Subject: [PATCH 3/9] Texinfo 5.1 workaround - disable some macros
Origin: vendor
---
doc/auxmac.texi | 64 +++++++++++++++++++++++++++----------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/doc/auxmac.texi b/doc/auxmac.texi
index 98c679f..c416eac 100644
--- a/doc/auxmac.texi
+++ b/doc/auxmac.texi
@@ -113,38 +113,38 @@ x@c gobble following newline -- The Tricks of a Texinfo Wizard.
@end macro
-@c Required for older versions of makeinfo. The definition of @geq
-@c for TeX lives in auxmac.tex.
-@ifnottex
-@macro geq
-@ifinfo
->=@c
-@end ifinfo
-@html
-&ge;
-@end html
-@docbook
-&ge;
-@end docbook
-@end macro
-@end ifnottex
-
-
-@c Required for older versions of makeinfo. The definition of @leq
-@c for TeX lives in auxmac.tex.
-@ifnottex
-@macro leq
-@ifinfo
-<=@c
-@end ifinfo
-@html
-&le;
-@end html
-@docbook
-&le;
-@end docbook
-@end macro
-@end ifnottex
+@c %%%%@c Required for older versions of makeinfo. The definition of @geq
+@c %%%%@c for TeX lives in auxmac.tex.
+@c %%%%@ifnottex
+@c %%%%@macro geq
+@c %%%%@ifinfo
+@c %%%%>=@c
+@c %%%%@end ifinfo
+@c %%%%@html
+@c %%%%&ge;
+@c %%%%@end html
+@c %%%%@docbook
+@c %%%%&ge;
+@c %%%%@end docbook
+@c %%%%@end macro
+@c %%%%@end ifnottex
+@c %%%%
+@c %%%%
+@c %%%%@c Required for older versions of makeinfo. The definition of @leq
+@c %%%%@c for TeX lives in auxmac.tex.
+@c %%%%@ifnottex
+@c %%%%@macro leq
+@c %%%%@ifinfo
+@c %%%%<=@c
+@c %%%%@end ifinfo
+@c %%%%@html
+@c %%%%&le;
+@c %%%%@end html
+@c %%%%@docbook
+@c %%%%&le;
+@c %%%%@end docbook
+@c %%%%@end macro
+@c %%%%@end ifnottex
@macro plusminus
--
1.7.10.4
From 53812d0cd2fbb6cfafcaa16eb409c01c6392ef48 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:12:42 +0100
Subject: [PATCH 4/9] Texinfo 5.1 workaround - macro on a separate line
Texinfo breaks if macros using a conditional are placed in the middle
of a line. (This is documented in Texinfo 5.1 reference but used to
work.)
Change texinfo source, although it adds unwanted whitespace in output.
---
doc/bug-reports.texi | 4 +++-
doc/enblend.texi | 28 +++++++++++++++++++++-------
doc/enfuse.texi | 48 ++++++++++++++++++++++++++++++++++++------------
3 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi
index 250fc20..1290ef8 100644
--- a/doc/bug-reports.texi
+++ b/doc/bug-reports.texi
@@ -77,7 +77,9 @@ this by running it with the options @option{--version} and
@item
A complete set of input images that will reproduce the bug. Strive
for a minimal set of @emph{small}@footnote{Images of a size less than
-1500@classictimes{}1000 pixels qualify as small.} images.
+1500@c
+@classictimes{}@c
+1000 pixels qualify as small.} images.
@item
The type of machine you are using, and the operating system name and
diff --git a/doc/enblend.texi b/doc/enblend.texi
index f825797..49e5120 100644
--- a/doc/enblend.texi
+++ b/doc/enblend.texi
@@ -510,7 +510,9 @@ 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 @power{2, n}-pixel scale. This is the
reason why an image of
-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
+@math{width}@c
+@classictimes{}@c
+@/@math{height}@dmn{pixels} cannot be
deconstructed into a pyramid of more than
@ifinfo
@display
@@ -1250,7 +1252,9 @@ Maximum finite value: @semilog{4.3, 9}
@cindex canvas size
@cindex size, canvas
Ensure that the minimum ``canvas'' size of the output image is at
-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
+least @var{WIDTH}@c
+@classictimes{}@c
+@/@var{HEIGHT}. Optionally specify
the @var{XOFFSET} and @var{YOFFSET}, too.
@pindex nona @r{(Hugin)}
@@ -1572,7 +1576,9 @@ If omitted @var{FACTOR} defaults to
@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}, this means,
option@tie{}@option{--coarse-mask} shrinks the overlapping
@emph{areas} by a factor of
-@math{@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@classictimes{}@/@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}}.
+@math{@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@c
+@classictimes{}@c
+@/@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}}.
With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
run of Enblend shrinks approximately by 80% and the maximum amount of
memory in use at a time is decreased to 60% (Enblend compiled with
@@ -2494,7 +2500,9 @@ option@tie{}@option{--visualize} to directly judge the effect.
When using this option in conjunction with
option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
smoothing occurs @emph{after} the overlap regions have been shrunken.
-Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
+Thus, blurring affects a @var{FACTOR}@c
+@classictimes{}@c
+@/@var{FACTOR}
times larger area in the original images.
Valid range: @var{RADIUS} @geq{} @value{srcCOLONCOLONminimumDASHsmoothDASHdifference}.
@@ -2606,7 +2614,9 @@ of the image and the final seam-line
@rimage{seam-line-visualization}
@caption{Seam-line visualization of a simple overlap. The
-853@classictimes{}238@dmn{pixel} image is shown at a magification of
+853@c
+@classictimes{}@c
+238@dmn{pixel} image is shown at a magification of
100%.}
@shortcaption{Seam-line visualization}
@@ -2618,7 +2628,9 @@ of the image and the final seam-line
@rimage{seam-line-visualization, 15cm}
@caption{Seam-line visualization of a simple overlap. The
-853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
+853@c
+@classictimes{}@c
+238@dmn{pixel} image has been rescaled to a width of
approximately 15@dmn{cm}.}
@shortcaption{Seam-line visualization}
@@ -2629,7 +2641,9 @@ approximately 15@dmn{cm}.}
@float Figure,Figure:seam-line-visualization
@rimage{seam-line-visualization, 15cm}
-@caption{Seam-line visualization of a simple overlap. The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
+@caption{Seam-line visualization of a simple overlap. The 853@c
+@classictimes{}@c
+238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
@shortcaption{Seam-line visualization}
@end float
diff --git a/doc/enfuse.texi b/doc/enfuse.texi
index d04b9f5..483bc4f 100644
--- a/doc/enfuse.texi
+++ b/doc/enfuse.texi
@@ -623,7 +623,9 @@ 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 @power{2, n}-pixel scale. This is the
reason why an image of
-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
+@math{width}@c
+@classictimes{}@c
+@/@math{height}@dmn{pixels} cannot be
deconstructed into a pyramid of more than
@ifinfo
@display
@@ -1311,7 +1313,9 @@ Maximum finite value: @semilog{4.3, 9}
@cindex canvas size
@cindex size, canvas
Ensure that the minimum ``canvas'' size of the output image is at
-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
+least @var{WIDTH}@c
+@classictimes{}@c
+@/@var{HEIGHT}. Optionally specify
the @var{XOFFSET} and @var{YOFFSET}, too.
@pindex nona @r{(Hugin)}
@@ -1501,8 +1505,12 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement
@var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
step, @var{LCE-FACTOR} is the weight factor (``strength'').
-@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
-@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
+@var{enhanced} = (1 + @var{LCE-FACTOR}) @c
+@classictimes{}@c
+ @var{original}
+@minus{} @var{LCE-FACTOR} @c
+@classictimes{}@c
+ Gaussian@/Smooth(@var{original},
@var{LCE-SCALE}).
@var{LCE-SCALE} defaults to @value{srcCOLONCOLONdefaultDASHlceDASHscale} pixels and
@@ -1531,7 +1539,9 @@ left unchanged. This effectively suppresses weak edges.
@opindex --contrast-window-size
Set the window @var{SIZE} for local contrast analysis. The window
-will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If
+will be a square of @var{SIZE}@c
+@classictimes{}@c
+@/@var{SIZE} pixels. If
given an even @var{SIZE}, Enfuse will automatically use the next odd
number.
@@ -1585,7 +1595,9 @@ output image.
@opindex --entropy-window-size
Window @var{SIZE} for local entropy analysis. The window will be a
-square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
+square of @var{SIZE}@c
+@classictimes{}@c
+@/@var{SIZE} pixels.
In the entropy calculation @var{SIZE} values of 3 to 7 yield an
acceptable compromise of the locality of the information and the
@@ -4656,10 +4668,14 @@ Experience has shown that neither the parameters @var{EDGESCALE} and
@var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
@acronym{LoG}-only, or a blend of both) scales to different image
sizes. In practice, this means that if you start with a set of
-reduced size images, say 2808@classictimes{}1872 pixels, carefully
+reduced size images, say 2808@c
+@classictimes{}@c
+1872 pixels, carefully
optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
@acronym{LoG}-only the best mode, and then switch to the original
-resolution of 5616@classictimes{}3744 pixels, multiplying (or
+resolution of 5616@c
+@classictimes{}@c
+3744 pixels, multiplying (or
dividing) the parameters by four and sticking to @acronym{LoG}-only
might @emph{not} result in the best fused image. For best quality,
perform the parameter optimization and the search for the most
@@ -5080,9 +5096,13 @@ centers around the image effects.
Images should align well to be suitable for fusion. However, there is
no hard mathematical rule what ``well'' means. The alignment
requirements for 16@dmn{MPixel} images to yield a sharp
-4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
+4"@c
+@classictimes{}@c
+6" print at 300@dmn{dpi} (``dpi'' means dots per
inch) or even for web presentation are relatively low, whereas the
-alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
+alignment of 8@dmn{MPixel} images for a 12"@c
+@classictimes{}@c
+18" print
ought to be tight.
@pindex hugin
@@ -5548,7 +5568,9 @@ next section.
Let us use an example to illustrate the problem of relating the
sharpness with the local contrast variations. Say we use a
-5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge}
+5@c
+@classictimes{}@c
+5 contrast window. Moreover, let @code{sharp_edge}
and @code{smooth_edge} be two specific configurations:
@example
@@ -5727,7 +5749,9 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}.
Apply the default grayscale projector: @code{average} and throw away
all edges with a curvature of less than 0.5% and replace the
@acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use
-a window of 7@classictimes{}7@dmn{pixel} window to compute the
+a window of 7@c
+@classictimes{}@c
+7@dmn{pixel} window to compute the
@acronym{SDev}.
@end table
--
1.7.10.4
From a4acc187401ed14af07f86978c549cf684afd3e2 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:15:29 +0100
Subject: [PATCH 5/9] Texinfo 5.1 workaround - macro on a separate line
Texinfo breaks if macros using a conditional are placed in the middle
of a line. (This is documented in Texinfo 5.1 reference but used to
work.)
Change texinfo source, although it adds unwanted whitespace in output.
---
doc/enblend.texi | 27 ++++++++++++++++++---------
doc/enfuse.texi | 27 ++++++++++++++++++---------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/doc/enblend.texi b/doc/enblend.texi
index 49e5120..e1baee0 100644
--- a/doc/enblend.texi
+++ b/doc/enblend.texi
@@ -1196,11 +1196,14 @@ For floating-point format, use
@itemize
@item
-Minimum normalized value: @semilog{1.2, -38}
+Minimum normalized value:
+@semilog{1.2, -38}
@item
-Epsilon: @semilog{1.2, -7}
+Epsilon:
+@semilog{1.2, -7}
@item
-Maximum finite value: @semilog{3.4, 38}
+Maximum finite value:
+@semilog{3.4, 38}
@end itemize
@c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
@@ -1212,11 +1215,14 @@ Maximum finite value: @semilog{3.4, 38}
@itemize
@item
-Minimum normalized value: @semilog{2.2, -308}
+Minimum normalized value:
+@semilog{2.2, -308}
@item
-Epsilon: @semilog{2.2, -16}
+Epsilon:
+@semilog{2.2, -16}
@item
-Maximum finite value: @semilog{1.8, 308}
+Maximum finite value:
+@semilog{1.8, 308}
@end itemize
@end table
@@ -1238,11 +1244,14 @@ floating-point numbers.
@itemize
@item
-Minimum normalized value: @semilog{9.3, -10}
+Minimum normalized value:
+@semilog{9.3, -10}
@item
-Epsilon: @semilog{2.0, -3}
+Epsilon:
+@semilog{2.0, -3}
@item
-Maximum finite value: @semilog{4.3, 9}
+Maximum finite value:
+@semilog{4.3, 9}
@end itemize
@item -f @var{WIDTH}x@var{HEIGHT}
diff --git a/doc/enfuse.texi b/doc/enfuse.texi
index 483bc4f..27e8b33 100644
--- a/doc/enfuse.texi
+++ b/doc/enfuse.texi
@@ -1257,11 +1257,14 @@ For floating-point format, use
@itemize
@item
-Minimum normalized value: @semilog{1.2, -38}
+Minimum normalized value:
+@semilog{1.2, -38}
@item
-Epsilon: @semilog{1.2, -7}
+Epsilon:
+@semilog{1.2, -7}
@item
-Maximum finite value: @semilog{3.4, 38}
+Maximum finite value:
+@semilog{3.4, 38}
@end itemize
@c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
@@ -1273,11 +1276,14 @@ Maximum finite value: @semilog{3.4, 38}
@itemize
@item
-Minimum normalized value: @semilog{2.2, -308}
+Minimum normalized value:
+@semilog{2.2, -308}
@item
-Epsilon: @semilog{2.2, -16}
+Epsilon:
+@semilog{2.2, -16}
@item
-Maximum finite value: @semilog{1.8, 308}
+Maximum finite value:
+@semilog{1.8, 308}
@end itemize
@end table
@@ -1299,11 +1305,14 @@ floating-point numbers.
@itemize
@item
-Minimum normalized value: @semilog{9.3, -10}
+Minimum normalized value:
+@semilog{9.3, -10}
@item
-Epsilon: @semilog{2.0, -3}
+Epsilon:
+@semilog{2.0, -3}
@item
-Maximum finite value: @semilog{4.3, 9}
+Maximum finite value:
+@semilog{4.3, 9}
@end itemize
@item -f @var{WIDTH}x@var{HEIGHT}
--
1.7.10.4
From 6686fad3501e6aef8245e434155e271ed225a2ab Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:19:45 +0100
Subject: [PATCH 6/9] Texinfo 5.1 workaround - macro on a separate line
Texinfo breaks if macros using a conditional are placed in the middle
of a line. (This is documented in Texinfo 5.1 reference but used to
work.)
Change texinfo source, although it adds unwanted whitespace in output.
---
doc/enfuse.texi | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/doc/enfuse.texi b/doc/enfuse.texi
index 27e8b33..3d230b5 100644
--- a/doc/enfuse.texi
+++ b/doc/enfuse.texi
@@ -3583,7 +3583,9 @@ $$
@noindent
It associates a probability@tie{}@math{p} with each of the @math{n}
-different possible outcomes@tie{}@inlineomega{} of the random
+different possible outcomes@tie{}@c
+@inlineomega{}
+ of the random
variable@tie{}@math{X}.
@cindex expectation value
Based on @math{w}, we define the @dfn{expectation value} or ``First
@@ -4210,7 +4212,9 @@ $$
@end docbook
@noindent
-The parameter@tie{}@inlinesigma{}, the argument of
+The parameter@tie{}@c
+@inlinesigma{}
+, the argument of
option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
are detected by @math{g(x, y)}. We apply the Laplacian operator in
Cartesian coordinates
@@ -4422,7 +4426,9 @@ $$
</informalequation>
@end docbook
-where we have used the dimensionless distance@tie{}@inlinexi{} from
+where we have used the dimensionless distance@tie{}@c
+@inlinexi{}
+ from
the origin
@ifinfo
@display
@@ -4577,7 +4583,9 @@ $R = \sqrt{x^2 + y^2}$.
@float Figure,Figure:laplacian-of-gaussian
@vimage{laplacian-of-gaussian}
-@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
+@caption{Laplacian-of-Gaussian function for @c
+@inlinesigma{}
+ = 0.5.}
@shortcaption{Laplacian-of-Gaussian}
@end float
--
1.7.10.4
From e3f81b899eb1a1b8918e8794774747d4355839bc Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:21:34 +0100
Subject: [PATCH 7/9] Leave TEXINPUTS alone
Do not export TEXINPUTS in Makefile(.am). Automake seems to have this in
hand anyway and it breaks building the pdf-documentation with texinfo 5.1.
Watch texinfo failing on
TEXINPUTS="." texi2dvi --pdf --batch mini.texi
and succeding without TEXINPUTS or with TEXINPUTS=".:". Where mini.texi
looks like this:
|-------------
|\input thumbpdf.sty
|\input texinfo
|Hello World
|@bye
|-------------
Bug: https://bugs.launchpad.net/bugs/1181678
---
doc/Makefile.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 75567b9..f46a105 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -895,8 +895,6 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-am uninstall-dvi-am uninstall-html-am \
uninstall-info-am uninstall-pdf-am uninstall-ps-am
-export TEXINPUTS=$(top_builddir):$(srcdir)
-
# Phony Targets
.PHONY: install-html
--
1.7.10.4
From 7da7340e373b18f1a6a412a8c0427e1a11010bdd Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:39:48 +0100
Subject: [PATCH 8/9] Texinfo 5.1 workaround - macro on a separate line
Texinfo breaks if macros using a conditional are placed in the middle
of a line. (This is documented in Texinfo 5.1 reference but used to
work.)
Change texinfo source, although it adds unwanted whitespace in output.
---
doc/enblend.texi | 4 +++-
doc/enfuse.texi | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/enblend.texi b/doc/enblend.texi
index e1baee0..abf088e 100644
--- a/doc/enblend.texi
+++ b/doc/enblend.texi
@@ -508,7 +508,9 @@ As a guideline, remember that each new level works on a linear scale
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 @power{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
@math{width}@c
@classictimes{}@c
diff --git a/doc/enfuse.texi b/doc/enfuse.texi
index 3d230b5..63aa1ca 100644
--- a/doc/enfuse.texi
+++ b/doc/enfuse.texi
@@ -621,7 +621,9 @@ As a guideline, remember that each new level works on a linear scale
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 @power{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
@math{width}@c
@classictimes{}@c
--
1.7.10.4
From 63484fd3e22307e8416676393a7fec83db202db3 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 27 Oct 2013 08:45:23 +0100
Subject: [PATCH 9/9] Texinfo 5.1 workaround - @equationW
Texinfo breaks if macros using a conditional are placed in the middle
of a line. (This is documented in Texinfo 5.1 reference but used to
work.)
Change texinfo source, although it adds unwanted whitespace in output.
---
doc/enfuse.texi | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/doc/enfuse.texi b/doc/enfuse.texi
index 63aa1ca..8ecf313 100644
--- a/doc/enfuse.texi
+++ b/doc/enfuse.texi
@@ -2477,7 +2477,8 @@ to the final @math{Q(x, y)}:
@math{w(P(1, x, y)) * P(1, x, y) +
... +
w(P(n, x, y)) * P(n, x, y)
---> Q(x, y),}@w{ }@equationW{}
+--> Q(x, y),}@w{ }@c
+@equationW{}
@end display
@end ifinfo
@html
@@ -2545,7 +2546,9 @@ w(P(n, x, y)) * P(n, x, y)
</mrow>
<mtext>,</mtext>
<mspace width="4em"/>
- <mtext>@equationW{}</mtext>
+ <mtext>@c
+@equationW{}
+ </mtext>
</mrow>
</math>
@end html
@@ -2553,7 +2556,9 @@ w(P(n, x, y)) * P(n, x, y)
$$
w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
\rightarrow
- Q(x, y),\hskip4em\hbox{@equationW{}}
+ Q(x, y),\hskip4em\hbox{@c
+@equationW{}
+}
$$
@end tex
@docbook
@@ -2971,7 +2976,9 @@ contributes as much as its weight demands. Of course the weights can
be extreme, favoring only a few pixels or even only one pixel in the
input stack. Extremes are not typical, however.
-Equal weights are another extreme that turns @equationW{} into an
+Equal weights are another extreme that turns
+@equationW{}
+into an
arithmetic average. This is why we sometimes speak of the ``averaging
property'' of this weighting algorithm, like smoothing out noise.
@@ -2992,7 +2999,8 @@ Trouper'') weighting mode, where the pixel with the highest weight
wins, this is, gets weight@tie{}one, and all other pixels get the
weight of zero
(@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
-Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{}
+Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@c
+@equationW{}
becomes
@ifinfo
@display
@@ -3137,7 +3145,9 @@ where
@noindent
Note that this ``averaging'' scheme lacks the nice noise-reduction
-property of the weighted average@tie{}@equationW{}, because only a
+property of the weighted average@tie{}@c
+@equationW{}
+, because only a
single input pixel contributes to the output.