From f61141c1451d1d966f1d22c6e40bcd5d2b0b7806 Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 4 Feb 2002 18:57:20 +0000
Subject: [PATCH] * doc/Makefile (.SUFFIXES, .texinfo.pdf, clean): Add support
 for texinfo->pdf. (.texinfo.html): Add support for texinfo->html. *
 doc/groff.texinfo: More fixes.

---
 ChangeLog         |   4 ++
 doc/Makefile      |  13 +++-
 doc/groff.texinfo | 196 +++++++++++++++++++++++++++---------------------------
 3 files changed, 111 insertions(+), 102 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0700143..2a602931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
 	* doc/groff.texinfo (Defstr*): Print strings with full syntax.
 	Other minor fixes.
 
+	* doc/Makefile (.SUFFIXES, .texinfo.pdf, clean): Add support for
+	texinfo->pdf.
+	(.texinfo.html): Add support for texinfo->html.
+
 2002-02-03  Werner LEMBERG  <wl@gnu.org>
 
 	Added three new requests `ds1', `as1', and `ami'.  The former two
diff --git a/doc/Makefile b/doc/Makefile
index ede9b400..42b9cbdb 100755
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+#   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -49,7 +50,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ../REVISION`
 
 all: $(DOCS)
 
-.SUFFIXES: .tr .me .ms .ps .dit .html .ascii .texinfo .dvi
+.SUFFIXES: .tr .me .ms .ps .dit .html .ascii .texinfo .dvi .pdf
 
 .dit.ps:
 	$(GROPS) $< >$@
@@ -90,6 +91,12 @@ all: $(DOCS)
 .texinfo.dvi:
 	texi2dvi -e $<
 
+.texinfo.pdf:
+	texi2dvi -e --pdf $<
+
+.texinfo.html:
+	makeinfo --html --no-split $<
+
 groff: groff.texinfo
 	makeinfo groff.texinfo
 
@@ -102,7 +109,7 @@ install:
 
 clean:
 	-rm -f *.ps *.html *.ascii *.png *.gif *.dit core
-	-rm -f *.aux *.dvi *.log *.toc texput.log
+	-rm -f *.aux *.dvi *.pdf *.log *.toc texput.log
 	-rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \
                *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \
                *.tp *.tps *.tr *.vr *.vrs
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index c7c00889..e20a151d 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -1287,8 +1287,8 @@ gtroff [ -abivzCERU ] [ -w@var{name} ] [ -W@var{name} ] [ -d@var{cs} ]
 Obviously, many of the options to @code{groff} are actually passed on to
 @code{gtroff}.
 
-Options without an argument can be grouped behind a single @option{-}.
-A filename of @file{-} denotes the standard input.  It is possible to
+Options without an argument can be grouped behind a single@w{ }@option{-}.
+A filename of@w{ }@file{-} denotes the standard input.  It is possible to
 have whitespace between an option and its parameter.
 
 The @code{grog} command can be used to guess the correct @code{groff}
@@ -1357,9 +1357,9 @@ ignored.
 
 @item -L@var{arg}
 Pass @var{arg} to the spooler.  Each argument should be passed with a
-separate @option{-L} option.  Note that @code{groff} does not prepend a
-@samp{-} to @var{arg} before passing it to the postprocessor.  If the
-@code{print} keyword in the device description file is missing,
+separate @option{-L} option.  Note that @code{groff} does not prepend
+a @samp{-} to @var{arg} before passing it to the postprocessor.
+If the @code{print} keyword in the device description file is missing,
 @option{-L} is ignored.
 
 @item -T@var{dev}
@@ -1491,8 +1491,8 @@ list of incompatibilities between @code{groff} and traditional Unix
 
 @item -d@var{cs}
 @itemx -d@var{name}=s
-Define @var{c} or @var{name} to be a string @var{s}.  @var{c} must be a
-one-letter name; @var{name} can be of arbitrary length.  All string
+Define @var{c} or @var{name} to be a string@w{ }@var{s}.  @var{c}@w{ }must
+be a one-letter name; @var{name} can be of arbitrary length.  All string
 assignments happen before loading any macro file (including the start-up
 file).
 
@@ -1512,10 +1512,10 @@ Number the first page @var{num}.
 @item -o@var{list}
 @cindex print current page register (@code{.P})
 Output only pages in @var{list}, which is a comma-separated list of page
-ranges; @samp{@var{n}} means print page @var{n}, @samp{@var{m}-@var{n}}
-means print every page between @var{m} and @var{n}, @samp{-@var{n}}
-means print every page up to @var{n}, @samp{@var{n}-} means print every
-page beginning with @var{n}.  @code{gtroff} exits after printing the
+ranges; @samp{@var{n}} means print page@w{ }@var{n}, @samp{@var{m}-@var{n}}
+means print every page between @var{m} and@w{ }@var{n}, @samp{-@var{n}}
+means print every page up to@w{ }@var{n}, @samp{@var{n}-} means print every
+page beginning with@w{ }@var{n}.  @code{gtroff} exits after printing the
 last page in the list.  All the ranges are inclusive on both ends.
 
 Within @code{gtroff}, this information can be extracted with the
@@ -1527,11 +1527,11 @@ chapter.
 
 @item -r@var{cn}
 @itemx -r@var{name}=@var{n}
-Set number register @var{c} or @var{name} to the value @var{n}.  @var{c}
-must be a one-letter name; @var{name} can be of arbitrary length.
-@var{n} can be any @code{gtroff} numeric expression.  All register
-assignments happen before loading any macro file (including the start-up
-file).
+Set number register@w{ }@var{c} or @var{name} to the value@w{ }@var{n}.
+@var{c}@w{ }must be a one-letter name; @var{name} can be of arbitrary
+length.  @var{n}@w{ }can be any @code{gtroff} numeric expression.  All
+register  assignments happen before loading any macro file (including
+the start-up file).
 
 @item -F@var{dir}
 Search @file{@var{dir}} for subdirectories @file{dev@var{name}}
@@ -1561,7 +1561,7 @@ not within @code{gtroff}) which can modify the behavior of @code{groff}.
 @table @code
 @item GROFF_COMMAND_PREFIX
 @tindex GROFF_COMMAND_PREFIX, environment variable
-If this is set to @var{X}, then @code{groff} runs @code{@var{X}troff}
+If this is set to@w{ }@var{X}, then @code{groff} runs @code{@var{X}troff}
 instead of @code{gtroff}.  This also applies to @code{tbl}, @code{pic},
 @code{eqn}, @code{grn}, @code{refer}, and @code{soelim}.  It does not
 apply to @code{grops}, @code{grodvi}, @code{grotty}, @code{pre-grohtml},
@@ -1679,7 +1679,7 @@ generates one or more of the options @option{-e}, @option{-man},
 @option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G},
 @option{-s}, and @option{-t}.
 
-A special file name @file{-} refers to the standard input.  Specifying
+A special file name@w{ }@file{-} refers to the standard input.  Specifying
 no files also means to read the standard input.  Any specified options
 are included in the printed command.  No space is allowed between
 options and their arguments.  The only options recognized are
@@ -2335,8 +2335,8 @@ and face are reset to their default values.
 @cindex @code{man} macros, moving left margin
 @Defmac {RS, [@Var{nnn}], man}
 Move the left margin to the right by the value @var{nnn} if specified
-(default unit is @samp{n}); otherwise the default indentation value is
-used.  Calls to the @code{RS} macro can be nested.
+(default unit is @samp{n}); otherwise the default indentation value
+is used.  Calls to the @code{RS} macro can be nested.
 @endDefmac
 
 @Defmac {RE, [@Var{nnn}], man}
@@ -2996,8 +2996,8 @@ The following describes the heading macros:
 @DefmacListEnd {NH, @t{S} @Var{level0} @dots{}, ms}
 Numbered heading.
 The argument is either a numeric argument to indicate the
-level of the heading, or the letter @code{S} followed by numeric arguments
-to set the heading level explicitly.
+level of the heading, or the letter@w{ }@code{S} followed by numeric
+arguments to set the heading level explicitly.
 
 If you specify heading levels out of sequence, such as invoking
 @samp{.NH 3} after @samp{.NH 1}, @code{groff}
@@ -3040,22 +3040,22 @@ the next highlighting, paragraph, or heading macro.
 
 @Defmac {R, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in roman (or regular) type.
-It operates similarly to the @code{B} macro otherwise.
+It operates similarly to the @code{B}@w{ }macro otherwise.
 @endDefmac
 
 @Defmac {I, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in @emph{italic type}.
-It operates similarly to the @code{B} macro otherwise.
+It operates similarly to the @code{B}@w{ }macro otherwise.
 @endDefmac
 
 @Defmac {CW, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in a @code{constant width face}.
-It operates similarly to the @code{B} macro otherwise.
+It operates similarly to the @code{B}@w{ }macro otherwise.
 @endDefmac
 
 @Defmac {BI, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in bold italic type.
-It operates similarly to the @code{B} macro otherwise.
+It operates similarly to the @code{B}@w{ }macro otherwise.
 @endDefmac
 
 @Defmac {BX, [@Var{txt}], ms}
@@ -3441,7 +3441,7 @@ in pairs of tags as follows.
 @DefmacList {TS, [@code{H}], ms}
 @DefmacListEnd {TE, , ms}
 Denotes a table, to be processed by the @code{tbl} preprocessor.
-The optional argument @code{H} to @code{TS} instructs @code{groff}
+The optional argument@w{ }@code{H} to @code{TS} instructs @code{groff}
 to create a running header with the information
 up to the @code{TH} macro.
 @code{groff} prints the header at the beginning of the
@@ -3460,8 +3460,8 @@ a graphics program such as @code{xfig}.
 @DefmacList {EQ, [@Var{align}], ms}
 @DefmacListEnd {EN, , ms}
 Denotes an equation, to be processed by the @code{eqn} preprocessor.
-The optional @var{align} argument can be @code{C}, @code{L}, or
-@code{I} to center (the default), left-justify, or indent the equation.
+The optional @var{align} argument can be @code{C}, @code{L}, or@w{
+}@code{I} to center (the default), left-justify, or indent the equation.
 @endDefmac
 
 @DefmacList {[, , ms}
@@ -3704,7 +3704,7 @@ Details of Galactic Formation
 
 @Defmac {TC, [@code{no}], ms}
 Prints the table of contents on a new page,
-setting the page number to @strong{i} (Roman numeral one).
+setting the page number to@w{ }@strong{i} (Roman numeral one).
 You should usually place this macro at the end of the
 file, since @code{groff} is a single-pass formatter and
 can only print what has been collected up to the point
@@ -4508,9 +4508,9 @@ Extrema: @samp{>?} (maximum), @samp{<?} (minimum).  For example,
 @item
 @cindex scaling operator
 @cindex operator, scaling
-Scaling: @code{(@var{c};@var{e})}.  Evaluate @var{e} using @var{c} as
-the default scaling indicator.  If @var{c} is missing, ignore scaling
-indicators in the evaluation of @var{e}.
+Scaling: @code{(@var{c};@var{e})}.  Evaluate@w{ }@var{e} using@w{ }@var{c}
+as the default scaling indicator.  If @var{c} is missing, ignore scaling
+indicators in the evaluation of@w{ }@var{e}.
 @end itemize
 
 @cindex parentheses
@@ -5292,11 +5292,10 @@ Numeric registers can be accessed via the @code{\n} escape.
 @DefescList {\\n, , i, }
 @DefescItem {\\n, @lparen{}, id, }
 @DefescListEnd {\\n, @lbrack{}, ident, @rbrack}
-Interpolate number register with name @var{ident} (one-character name
-@var{i}, two-character name @var{id}).  This means that the value of
-the register is expanded in-place while @code{gtroff} is parsing the
-input line.  Nested assignments (also called indirect assignments) are
-possible.
+Interpolate number register with name @var{ident} (one-character name@w{
+}@var{i}, two-character name @var{id}). This means that the value of the
+register is expanded in-place while @code{gtroff} is parsing the input line.
+Nested assignments (also called indirect assignments) are possible.
 
 @Example
 .nr a 5
@@ -5349,7 +5348,7 @@ syntax form.
 @DefescItem {\\n, +@lbrack{}, ident, @rbrack{}}
 @DefescListEnd {\\n, -@lbrack{}, ident, @rbrack{}}
 Before interpolating, increment or decrement @var{ident}
-(one-character name @var{i}, two-character name @var{id}) by the
+(one-character name@w{ }@var{i}, two-character name @var{id}) by the
 auto-increment value as specified with the @code{nr} request (or the
 @code{\R} escape).  If no auto-increment value has been specified,
 these syntax forms are identical to @code{\n}.
@@ -5477,7 +5476,7 @@ then apply the @code{af} request to this other register.
 @DefescItem {\\g, @lparen{}, id, }
 @DefescListEnd {\\g, @lbrack{}, ident, @rbrack{}}
 Return the current format of the specified register @var{ident}
-(one-character name @var{i}, two-character name @var{id}).  For
+(one-character name@w{ }@var{i}, two-character name @var{id}).  For
 example, @samp{\ga} after the previous example would produce the
 string @samp{000}.  If the register hasn't been defined yet, nothing
 is returned.
@@ -6076,10 +6075,10 @@ This request is ignored if it has no parameter.
 @DefreqList {hym, [@Var{length}]}
 @DefregListEnd {.hym}
 Set the (right) hyphenation margin to @var{length}.  If the current
-adjustment mode is not @samp{b} or@w{ }@samp{n}, the line is not
+adjustment mode is not @samp{b} or @samp{n}, the line is not
 hyphenated if it is shorter than @var{length}.  Without an argument,
 the hyphenation margin is reset to its default value, which is@w{ }0.
-The default scaling indicator for this request is@w{ }@code{m}.  The
+The default scaling indicator for this request is @samp{m}.  The
 hyphenation margin is associated with the current environment
 (@pxref{Environments}).
 
@@ -6096,11 +6095,11 @@ number register.
 @DefreqList {hys, [@Var{hyphenation_space}]}
 @DefregListEnd {.hys}
 Set the hyphenation space to @var{hyphenation_space}.  If the current
-adjustment mode is @samp{b} or@w{ }@samp{n}, don't hyphenate the line
+adjustment mode is @samp{b} or @samp{n}, don't hyphenate the line
 if it can be justified by adding no more than @var{hyphenation_space}
 extra space to each word space.  Without argument, the hyphenation
 space is set to its default value, which is@w{ }0.  The default
-scaling indicator for this request is@w{ }@code{m}.  The hyphenation
+scaling indicator for this request is @samp{m}.  The hyphenation
 space is associated with the current environment
 (@pxref{Environments}).
 
@@ -6169,8 +6168,7 @@ Space downwards @var{distance}.  With no argument it advances 1@w{
 }line.  A negative argument causes @code{gtroff} to move up the page
 the specified distance.  If the argument is preceded by a @samp{|}
 then @code{gtroff} moves that distance from the top of the page.  This
-request causes a line break.  The default scaling indicator is@w{
-}@code{v}.
+request causes a line break.  The default scaling indicator is @samp{v}.
 @endDefreq
 
 @cindex double spacing (@code{ls})
@@ -6203,7 +6201,7 @@ Sometimes, extra vertical spacing is only needed occasionally, e.g.@:
 to allow space for a tall construct (like an equation).  The @code{\x}
 escape does this.  The escape is given a numerical argument, usually
 enclosed in quotes (like @samp{\x'3p'}); the default scaling indicator
-is@w{ }@code{v}.  If this number is positive extra vertical space is
+is @samp{v}.  If this number is positive extra vertical space is
 inserted below the current line.  A negative number adds space above.
 If this escape is used multiple times on the same line, the maximum of
 the values is used.
@@ -6554,14 +6552,14 @@ The control character (@samp{.}) and the no-break control character
 respectively.
 
 @Defreq {cc, [@Var{c}]}
-Set the control character to @var{c}.  With no argument the default
+Set the control character to@w{ }@var{c}.  With no argument the default
 control character @samp{.} is restored.  The value of the control
 character is associated with the current environment
 (@pxref{Environments}).
 @endDefreq
 
 @Defreq {c2, [@Var{c}]}
-Set the no-break control character to @var{c}.  With no argument the
+Set the no-break control character to@w{ }@var{c}.  With no argument the
 default control character @samp{'} is restored.  The value of the
 no-break control character is associated with the current environment
 (@pxref{Environments}).
@@ -6598,7 +6596,7 @@ necessary then to double the escape character.  Here an example:
 @cindex escape character, changing (@code{ec})
 @cindex character, escape, changing (@code{ec})
 @Defreq {ec, [@Var{c}]}
-Set the escape character to @var{c}.  With no argument the default
+Set the escape character to@w{ }@var{c}.  With no argument the default
 escape character @samp{\} is restored.  It can be also used to
 re-enable the escape mechanism after an @code{eo} request.
 
@@ -6622,8 +6620,8 @@ i.e., the input character gets assigned the metric information of the
 mapped output character.
 
 @Defreq {tr, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}}
-Translate character @var{a} to @var{b}, character @var{c} to @var{d},
-etc.  If there is an odd number of arguments, the last one is
+Translate character @var{a} to@w{ }@var{b}, character @var{c} to@w{
+}@var{d}, etc.  If there is an odd number of arguments, the last one is
 translated to the space character.
 
 Some notes:
@@ -6884,8 +6882,8 @@ the current value by @var{offset}).  Note that this request does not
 cause a break, so changing the page offset in the middle of text being
 filled may not yield the expected result.  The initial value is
 1@dmn{i}.  For tty output devices, it is set to 0 in the startup file
-@file{troffrc}; the default scaling indicator is@w{ }@code{m} (and
-not@w{ }@code{v} as incorrectly documented in the original
+@file{troffrc}; the default scaling indicator is @samp{m} (and
+not @samp{v} as incorrectly documented in the original
 @acronym{UNIX} troff manual).
 
 The current page offset can be found in the read-only number register
@@ -6917,7 +6915,7 @@ Initially, there is no indentation.
 
 If @code{in} is called without an argument, the indentation is reset to
 the previous value before the last call to @code{in}.  The default
-scaling indicator is@w{ }@code{m}.
+scaling indicator is @samp{m}.
 
 The indentation is associated with the current environment
 (@pxref{Environments}).
@@ -6943,7 +6941,7 @@ indentation relative to the value set by the @code{in} request.
 
 This request causes a break; its value is associated with the current
 environment (@pxref{Environments}).  The default scaling indicator
-is@w{ }@code{m}.  A call of @code{ti} without an argument is ignored.
+is @samp{m}.  A call of @code{ti} without an argument is ignored.
 
 If the total indentation value is negative (which is not allowed),
 @code{gtroff} emits a warning of type @samp{range} and sets the
@@ -6971,7 +6969,7 @@ Set the line length to @var{length} (or increment or decrement the
 current value by @var{length}).  Initially, the line length is set to
 6.5@dmn{i}.  The effect of @code{ll} is delayed until a partially
 collected line (if it exists) is output.  The default scaling
-indicator is@w{ }@code{m}.
+indicator is @samp{m}.
 
 If @code{ll} is called without an argument, the line length is reset to
 the previous value before the last call to @code{ll}.  If a negative
@@ -7007,10 +7005,10 @@ page layout.
 @DefreqList {pl, [@Var{length}]}
 @DefreqItem {pl, @t{+}@Var{length}}
 @DefreqItem {pl, @t{-}@Var{length}}
-@DefregListEnd {p}
+@DefregListEnd {.p}
 Set the @dfn{page length} to @var{length} (or increment or decrement
 the current value by @var{length}).  This is the length of the
-physical output page.  The default scaling indicator is@w{ }@code{v}.
+physical output page.  The default scaling indicator is @samp{v}.
 
 @cindex page length register (@code{.p})
 The current setting can be found in the read-only number register
@@ -7089,7 +7087,7 @@ specified (or incremented or decremented) with the @code{lt} request.
 Initially, the title line length is set to 6.5@dmn{i}.  If a negative
 line length is specified (which is not allowed), @code{gtroff} emits a
 warning of type @samp{range} and sets the title line length to zero.
-The default scaling indicator is@w{ }@code{m}.  If @code{lt} is called
+The default scaling indicator is @samp{m}.  If @code{lt} is called
 without an argument, the title length is reset to the previous value
 before the last call to @code{lt}.
 
@@ -7125,7 +7123,7 @@ A read-write register holding the current page number.
 @Defreq {pc, [@Var{char}]}
 Change the page number character (used by the @code{tl} request) to a
 different character.  With no argument, this mechanism is disabled.
-Note that this doesn't affect the number register @code{%}.
+Note that this doesn't affect the number register@w{ }@code{%}.
 @endDefreq
 
 @xref{Traps}.
@@ -7243,7 +7241,7 @@ special symbols (Greek, mathematics).
 @DefescItem {\\f, @lparen{}, fn, }
 @DefescListEnd {\\f, @lbrack{}, font, @rbrack}
 The @code{ft} request and the @code{\f} escape change the current font
-to @var{font} (one-character name @var{f}, two-character name
+to @var{font} (one-character name@w{ }@var{f}, two-character name
 @var{fn}).
 
 If @var{font} is a style name (as set with the @code{sty} request or
@@ -7287,11 +7285,11 @@ eggs, bacon, \fBspam\fP and sausage.
 @cindex @code{fp} request, and font translations
 @cindex @code{sty} request, and font translations
 @Defreq {ftr, f [@Var{g}]}
-Translate font@w{ }@var{f} to font@w{ }@var{g}.  Whenever a font named
-@var{f} is referred to in a @code{\f} escape sequence, or in the
+Translate font@w{ }@var{f} to font@w{ }@var{g}.  Whenever a font named@w{
+}@var{f} is referred to in a @code{\f} escape sequence, or in the
 @code{ft}, @code{ul}, @code{bd}, @code{cs}, @code{tkf},
 @code{special}, @code{fspecial}, @code{fp}, or @code{sty} requests,
-font@w{ }@var{g} is used.  If @var{g} is missing or equal to @var{f}
+font@w{ }@var{g} is used.  If @var{g} is missing or equal to@w{ }@var{f}
 the translation is undone.
 @endDefreq
 
@@ -7357,15 +7355,15 @@ font is the index of a font position and so is also either a font or a
 style.  If it is a style, the font that is actually used is the font
 which name is the concatenation of the name of the current
 family and the name of the current style.  For example, if the current
-font is@w{ }1 and font position@w{ }1 is associated with style@w{
-}@samp{R} and the current font family is@w{ }@samp{T}, then font
+font is@w{ }1 and font position@w{ }1 is associated with style
+@samp{R} and the current font family is @samp{T}, then font
 @samp{TR} will be used.  If the current font is not a style, then the
 current family is ignored.  If the requests @code{cs}, @code{bd},
 @code{tkf}, @code{uf}, or @code{fspecial} are applied to a style,
 they will instead be applied to the member of the current family
 corresponding to that style.
 
-@var{n} must be a non-negative integer value.
+@var{n}@w{ }must be a non-negative integer value.
 
 @pindex DESC
 @kindex styles
@@ -7497,8 +7495,8 @@ syntax forms to access font positions.
 @DefescItem {\\f, , n, }
 @DefescItem {\\f, @lparen{}, nn, }
 @DefescListEnd {\\f, @lbrack{}, nnn, @rbrack}
-Change the current font position to @var{nnn} (one-digit position
-@var{n}, two-digit position @var{nn}), which must be a non-negative
+Change the current font position to @var{nnn} (one-digit position@w{
+}@var{n}, two-digit position @var{nn}), which must be a non-negative
 integer.
 
 If @var{nnn} is associated with a style (as set with the @code{sty}
@@ -7621,7 +7619,7 @@ compatibility mode.
 @cindex Unicode
 @Defesc {\\N, ', n, '}
 Typeset the character with code@w{ }@var{n} in the current font (this
-is @strong{not} the input character code).  @var{n} can be any
+is @strong{not} the input character code).  @var{n}@w{ }can be any
 integer.  Most devices only have characters with codes between 0
 and@w{ }255; the Unicode output device uses codes in the range
 0--65535.  If the current font does not contain a character with that
@@ -7978,7 +7976,7 @@ Increase the width of the preceding character so that the spacing
 between that character and the following character is correct if the
 following character is a roman character.  For example, if an
 italic@w{ }@code{f} is immediately followed by a roman right
-parenthesis, then in many fonts the top right portion of the @code{f}
+parenthesis, then in many fonts the top right portion of the@w{ }@code{f}
 overlaps the top left of the right parenthesis.  Use this escape
 sequence whenever an italic character is immediately followed by a
 roman character without any intervening space.  This small amount of
@@ -8291,7 +8289,7 @@ fractional type sizes:
 @table @code
 @item \s[@var{n}]
 @itemx \s'@var{n}'
-Set the point size to @var{n} scaled points; @var{n}@w{ }is a numeric
+Set the point size to @var{n}@w{ }scaled points; @var{n}@w{ }is a numeric
 expression with a default scale indicator of @samp{z}.
 
 @item \s[+@var{n}]
@@ -8302,8 +8300,8 @@ expression with a default scale indicator of @samp{z}.
 @itemx \s'-@var{n}'
 @itemx \s+'@var{n}'
 @itemx \s-'@var{n}'
-Increase or or decrease the point size by @var{n} scaled points;
-@var{n} is a numeric expression with a default scale indicator of
+Increase or or decrease the point size by @var{n}@w{ }scaled points;
+@var{n}@w{ }is a numeric expression with a default scale indicator of
 @samp{z}.
 @end table
 
@@ -8328,8 +8326,8 @@ even this is a read-write string variable).
 @DefescItem {\\*, , n, }
 @DefescItem {\\*, @lparen{}, nm, }
 @DefescListEnd {\\*, @lbrack{}, name, @rbrack{}}
-Define and access a string variable @var{name} (one-character name
-@var{n}, two-character name @var{nm}).  If @var{name} already exists,
+Define and access a string variable @var{name} (one-character name@w{
+}@var{n}, two-character name @var{nm}).  If @var{name} already exists,
 @code{ds} overwrites the previous definition.
 
 Example:
@@ -9224,7 +9222,7 @@ over that character.
 @endDefesc
 
 @Defesc {\\k, ', x, '}
-Stores the current horizontal position in register @var{x}.
+Stores the current horizontal position in register@w{ }@var{x}.
 Use this, for example, to return to the beginning of a string
 for highlighting or other decoration.
 @endDefesc
@@ -9276,7 +9274,7 @@ of the line.
 @cindex character, underscore
 @cindex line drawing character
 @cindex character for line drawing
-The optional second parameter @var{c} is a character to draw the line
+The optional second parameter@w{ }@var{c} is a character to draw the line
 with.  If this second argument is not specified, @code{gtroff} uses
 the underscore character.
 
@@ -9348,7 +9346,7 @@ Draw a line from the current location to the relative point specified by
 @item \D'c @var{d}'
 @cindex circle drawing (@code{\D})
 @cindex drawing a circle (@code{\D})
-Draw a circle with a diameter of @var{d} with the leftmost point at the
+Draw a circle with a diameter of@w{ }@var{d} with the leftmost point at the
 current position.
 
 @item \D'C @var{d}'
@@ -9415,7 +9413,7 @@ Draw a solid polygon with the same parameters as an outlined polygon.
 @item \D't @var{n}'
 @cindex line thickness (@code{\D})
 @cindex thickness of lines (@code{\D})
-Set the current line thickness to @var{n} machine units.  A value of
+Set the current line thickness to @var{n}@w{ }machine units.  A value of
 zero selects the smallest available line thickness.  A negative value
 makes the line thickness proportional to the current point size (this is
 the default behaviour of @code{ditroff}).
@@ -9599,7 +9597,7 @@ number register @code{.t} still works within diversions.
 @cindex trap, input line, setting (@code{it})
 @Defreq {it, n macro}
 Sets an input line trap.
-@var{n} is the number of lines of input which may be read before
+@var{n}@w{ }is the number of lines of input which may be read before
 @dfn{springing} the trap, @var{macro} is the macro to be invoked.
 Request lines are not counted as input lines.
 
@@ -9812,7 +9810,7 @@ prints@w{ }4.
 in such a way that @acronym{ASCII} and space characters that
 were formatted and diverted are treated like ordinary input
 characters when the diversion is reread.  It can be also used for gross
-hacks; for example, the following sets register @code{n} to@w{ }1.
+hacks; for example, the following sets register@w{ }@code{n} to@w{ }1.
 
 @Example
 .tr @@.
@@ -9866,7 +9864,7 @@ partially collected lines
 
 These environments may be given arbitrary names (see @ref{Identifiers},
 for more info).  Old versions of @code{troff} only had environments
-named @samp{0}, @samp{1} and@w{ }@samp{2}.
+named @samp{0}, @samp{1} and @samp{2}.
 
 @cindex switching environment (@code{ev})
 @cindex environment, switching (@code{ev})
@@ -9972,7 +9970,7 @@ End a nesting level.
 This escape is @code{grohtml} specific.  Provided that this escape
 occurs at the outer nesting level write the @code{filename} to
 @code{stderr}.  The position of the image, @var{P}, must be specified
-and must be one of @code{l}, @code{r}, @code{c}, or @code{i} (left,
+and must be one of @code{l}, @code{r}, @code{c}, or@w{ }@code{i} (left,
 right, centered, inline).  @var{filename} will be associated with the
 production of the next inline image.
 @end table
@@ -10004,7 +10002,7 @@ default color for @code{\m} and @code{\M} is not identical.
 
 @cindex @code{f} unit, and colors
 @cindex unit, @code{f}, and colors
-A new scaling indicator @code{f} has been introduced which multiplies
+A new scaling indicator@w{ }@code{f} has been introduced which multiplies
 its value by 65536; this makes it convenient to specify color components
 as fractions in the range 0 to@w{ }1 (1f equals 65536u).  Example:
 
@@ -11569,15 +11567,15 @@ The @file{DESC} file can contain the following types of line:
 @table @code
 @item res @var{n}
 @kindex res
-There are @var{n} machine units per inch.
+There are @var{n}@w{ }machine units per inch.
 
 @item hor @var{n}
 @kindex hor
-The horizontal resolution is @var{n} machine units.
+The horizontal resolution is @var{n}@w{ }machine units.
 
 @item vert @var{n}
 @kindex vert
-The vertical resolution is @var{n} machine units.
+The vertical resolution is @var{n}@w{ }machine units.
 
 @item sizescale @var{n}
 @kindex sizescale
@@ -11709,8 +11707,8 @@ separated by blanks or tabs.  The format is
 @noindent
 @var{name} identifies the character: If @var{name} is a single
 character@w{ }@var{c} then it corresponds to the @code{gtroff} input
-character @var{c}; if it is of the form @samp{\@var{c}} where @var{c} is
-a single character, then it corresponds to the @code{gtroff} input
+character@w{ }@var{c}; if it is of the form @samp{\@var{c}} where @var{c}
+is a single character, then it corresponds to the @code{gtroff} input
 character@w{ }\@var{c}; otherwise it corresponds to the groff input
 character @samp{\[@var{name}]}.  (If it is exactly two characters
 @var{xx} it can be entered as @samp{\(@var{xx}}.)  @code{gtroff}
@@ -11856,10 +11854,10 @@ Requests appear without the leading control character (normally either
 
 The macro package a specific register belongs to is appended in brackets.
 
-A register name @code{x} consisting of exactly one character can be accessed
-as @samp{\nx}.  A register name @code{xx} consisting of exactly two
-characters can be accessed as @samp{\n(xx}.  Register names @code{xxx} of
-any length can be accessed as @samp{\n[xxx]}.
+A register name@w{ }@code{x} consisting of exactly one character can be
+accessed as @samp{\nx}.  A register name @code{xx} consisting of exactly
+two characters can be accessed as @samp{\n(xx}.  Register names @code{xxx}
+of any length can be accessed as @samp{\n[xxx]}.
 
 @printindex vr
 
@@ -11886,10 +11884,10 @@ They appear without the leading control character (normally @samp{.}).
 
 The macro package a specific string belongs to is appended in brackets.
 
-A string name @code{x} consisting of exactly one character can be accessed
-as @samp{\*x}.  A string name @code{xx} consisting of exactly two characters
-can be accessed as @samp{\*(xx}.  String names @code{xxx} of any length can
-be accessed as @samp{\*[xxx]}.
+A string name@w{ }@code{x} consisting of exactly one character can be
+accessed as @samp{\*x}.  A string name @code{xx} consisting of exactly
+two characters can be accessed as @samp{\*(xx}.  String names @code{xxx}
+of any length can be accessed as @samp{\*[xxx]}.
 
 
 @printindex st
-- 
2.11.4.GIT