Some more docbook fixes.

3 files changed, 54 insertions, 20 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8c34d4c0..b0a25850 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Cleanups to docbook, finish math stuff.
+
 2014-03-28         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Minor cleanups to the indexing.
diff --git a/doc/gawk.texi b/doc/gawk.texi
index b6af32e5..48219eb8 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -169,6 +169,9 @@
 @ignore
 Some comments on the layout for TeX.
 1. Use at least texinfo.tex 2014-01-30.15
+2. When using @docbook, if the last line is part of a paragraph, end
+it with a space and @c so that the lines won't run together. This is a
+quirk of the language / makeinfo, and isn't going to change.
 @end ignore
 
 @c merge the function and variable indexes into the concept index
@@ -1061,7 +1064,7 @@ $\sim\! Cn^2$
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>&sim; Cn<superscript>2</superscript></emphasis>&thinsp;
+<emphasis>&sim; Cn<superscript>2</superscript></emphasis> @c
 @end docbook
 performance, while
 theory predicted
@@ -1074,7 +1077,7 @@ $\sim\! Cn\log n$
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>&sim; Cn log n</emphasis>&thinsp;
+<emphasis>&sim; Cn log n</emphasis> @c
 @end docbook
 behavior. A few minutes poring
 over the @file{awkprof.out} profile pinpointed the problem to
@@ -17303,7 +17306,7 @@ All known POSIX-compliant systems support timestamps from 0 through
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>31</superscript> &minus; 1,&thinsp;
+2<superscript>31</superscript> &minus; 1, @c
 @end docbook
 which is sufficient to represent times through
 2038-01-19 03:14:07 UTC.  Many systems support a wider range of timestamps,
@@ -28793,7 +28796,7 @@ then the answer is
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript>.&thinsp;
+2<superscript>53</superscript>. @c
 @end docbook
 The next representable number is the even number
 @iftex
@@ -28805,7 +28808,7 @@ The next representable number is the even number
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript> &plus; 2,
+2<superscript>53</superscript> &plus; 2, @c
 @end docbook
 meaning it is unlikely that you will be able to make
 @command{gawk} print
@@ -28818,7 +28821,7 @@ meaning it is unlikely that you will be able to make
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript> &plus; 1&thinsp;
+2<superscript>53</superscript> &plus; 1 @c
 @end docbook
 in integer format.
 The range of integers exactly representable by a 64-bit double
@@ -28832,7 +28835,7 @@ is
 @end ifnotdocbook
 @end ifnottex
 @docbook
-[&minus;2<superscript>53</superscript>, 2<superscript>53</superscript>].&thinsp;
+[&minus;2<superscript>53</superscript>, 2<superscript>53</superscript>]. @c
 @end docbook
 If you ever see an integer outside this range in @command{awk}
 using 64-bit doubles, you have reason to be very suspicious about
@@ -29062,7 +29065,7 @@ number is then
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>s &cdot; 2<superscript>e</superscript></emphasis>.&thinsp;
+<emphasis>s &sdot; 2<superscript>e</superscript></emphasis>. @c
 @end docbook
 The first bit of a non-zero binary significand
 is always one, so the significand in an IEEE-754 format only includes the
@@ -29311,7 +29314,7 @@ numbers are not implemented.}
 @end ifnotdocbook
 @end ifnottex
 @docbook
-(<emphasis>emax</emphasis> = 2<superscript>30</superscript> &minus; 1, <emphasis>emin</emphasis> = &minus;<emphasis>emax</emphasis>)&thinsp;
+(<emphasis>emax</emphasis> = 2<superscript>30</superscript> &minus; 1, <emphasis>emin</emphasis> = &minus;<emphasis>emax</emphasis>) @c
 @end docbook
 for all floating-point contexts.
 There is no explicit mechanism to adjust the exponent range.
@@ -29390,7 +29393,7 @@ formula:
 @end ifnottex
 @docbook
 <para>
-<emphasis>prec</emphasis> = 3.322 &cdot; <emphasis>dps</emphasis>
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis> @c
 </para>
 @end docbook
 
@@ -29628,8 +29631,13 @@ For example, the following computes
 @math{5^{4^{3^{2}}}},
 @end iftex
 @ifnottex
+@ifnotdocbook
 5^4^3^2,
+@end ifnotdocbook
 @end ifnottex
+@docbook
+5<superscript>4<superscript>3<superscript>2</superscript></superscript></superscript>, @c
+@end docbook
 the result of which is beyond the
 limits of ordinary @command{gawk} numbers:
 
@@ -29651,9 +29659,16 @@ floating-point values instead, the precision needed for correct output
 would be @math{3.322 @cdot 183231},
 @end iftex
 @ifnottex
+@ifnotdocbook
 @samp{prec = 3.322 * dps}),
 would be 3.322 x 183231,
+@end ifnotdocbook
 @end ifnottex
+@docbook
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>),
+would be
+<emphasis>prec</emphasis> = 3.322 &sdot; 183231, @c
+@end docbook
 or 608693.
 
 The result from an arithmetic operation with an integer and a floating-point value
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 8b0ddda0..81407770 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -164,6 +164,9 @@
 @ignore
 Some comments on the layout for TeX.
 1. Use at least texinfo.tex 2014-01-30.15
+2. When using @docbook, if the last line is part of a paragraph, end
+it with a space and @c so that the lines won't run together. This is a
+quirk of the language / makeinfo, and isn't going to change.
 @end ignore
 
 @c merge the function and variable indexes into the concept index
@@ -1056,7 +1059,7 @@ $\sim\! Cn^2$
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>&sim; Cn<superscript>2</superscript></emphasis>&thinsp;
+<emphasis>&sim; Cn<superscript>2</superscript></emphasis> @c
 @end docbook
 performance, while
 theory predicted
@@ -1069,7 +1072,7 @@ $\sim\! Cn\log n$
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>&sim; Cn log n</emphasis>&thinsp;
+<emphasis>&sim; Cn log n</emphasis> @c
 @end docbook
 behavior. A few minutes poring
 over the @file{awkprof.out} profile pinpointed the problem to
@@ -16473,7 +16476,7 @@ All known POSIX-compliant systems support timestamps from 0 through
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>31</superscript> &minus; 1,&thinsp;
+2<superscript>31</superscript> &minus; 1, @c
 @end docbook
 which is sufficient to represent times through
 2038-01-19 03:14:07 UTC.  Many systems support a wider range of timestamps,
@@ -27934,7 +27937,7 @@ then the answer is
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript>.&thinsp;
+2<superscript>53</superscript>. @c
 @end docbook
 The next representable number is the even number
 @iftex
@@ -27946,7 +27949,7 @@ The next representable number is the even number
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript> &plus; 2,
+2<superscript>53</superscript> &plus; 2, @c
 @end docbook
 meaning it is unlikely that you will be able to make
 @command{gawk} print
@@ -27959,7 +27962,7 @@ meaning it is unlikely that you will be able to make
 @end ifnotdocbook
 @end ifnottex
 @docbook
-2<superscript>53</superscript> &plus; 1&thinsp;
+2<superscript>53</superscript> &plus; 1 @c
 @end docbook
 in integer format.
 The range of integers exactly representable by a 64-bit double
@@ -27973,7 +27976,7 @@ is
 @end ifnotdocbook
 @end ifnottex
 @docbook
-[&minus;2<superscript>53</superscript>, 2<superscript>53</superscript>].&thinsp;
+[&minus;2<superscript>53</superscript>, 2<superscript>53</superscript>]. @c
 @end docbook
 If you ever see an integer outside this range in @command{awk}
 using 64-bit doubles, you have reason to be very suspicious about
@@ -28203,7 +28206,7 @@ number is then
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>s &cdot; 2<superscript>e</superscript></emphasis>.&thinsp;
+<emphasis>s &sdot; 2<superscript>e</superscript></emphasis>. @c
 @end docbook
 The first bit of a non-zero binary significand
 is always one, so the significand in an IEEE-754 format only includes the
@@ -28452,7 +28455,7 @@ numbers are not implemented.}
 @end ifnotdocbook
 @end ifnottex
 @docbook
-(<emphasis>emax</emphasis> = 2<superscript>30</superscript> &minus; 1, <emphasis>emin</emphasis> = &minus;<emphasis>emax</emphasis>)&thinsp;
+(<emphasis>emax</emphasis> = 2<superscript>30</superscript> &minus; 1, <emphasis>emin</emphasis> = &minus;<emphasis>emax</emphasis>) @c
 @end docbook
 for all floating-point contexts.
 There is no explicit mechanism to adjust the exponent range.
@@ -28531,7 +28534,7 @@ formula:
 @end ifnottex
 @docbook
 <para>
-<emphasis>prec</emphasis> = 3.322 &cdot; <emphasis>dps</emphasis>
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis> @c
 </para>
 @end docbook
 
@@ -28769,8 +28772,13 @@ For example, the following computes
 @math{5^{4^{3^{2}}}},
 @end iftex
 @ifnottex
+@ifnotdocbook
 5^4^3^2,
+@end ifnotdocbook
 @end ifnottex
+@docbook
+5<superscript>4<superscript>3<superscript>2</superscript></superscript></superscript>, @c
+@end docbook
 the result of which is beyond the
 limits of ordinary @command{gawk} numbers:
 
@@ -28792,9 +28800,16 @@ floating-point values instead, the precision needed for correct output
 would be @math{3.322 @cdot 183231},
 @end iftex
 @ifnottex
+@ifnotdocbook
 @samp{prec = 3.322 * dps}),
 would be 3.322 x 183231,
+@end ifnotdocbook
 @end ifnottex
+@docbook
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>),
+would be
+<emphasis>prec</emphasis> = 3.322 &sdot; 183231, @c
+@end docbook
 or 608693.
 
 The result from an arithmetic operation with an integer and a floating-point value