* doc/groff.texinfo: More fixes.

* src/include/color.h: Decorate with `const'.
Use `size_t'.
Include `stddef.h'.
* src/libs/libgroff.color.cc: Decorate with `const'.
Use `size_t'.
(color::color): Initialize members.
* src/libs/libdriver/input.cc (parse_D_command): Handle `f'
command according to the documentation.

* man/groff_out.man: Updated.
Minor fixes.

* src/preproc/html/pre-html.cc (write_start_image): Remove
redundant output.
* tmac/www.tmac (DC, HTML-DO-IMAGE): Ditto.

* src/devices/grohtml/post-html.cc (page::add_and_encode): Using
\C'hy' caused an assertion failure.

* src/roff/troff/env.cc (environment::environment): Initialize
`emitted_node'.
(environment::copy): Handle `ignore_next_eol' and `emitted_node'.

1 files changed, 289 insertions, 121 deletions

diff --git a/man/groff_out.man b/man/groff_out.man
index d7840278..6dba4913 100644
--- a/man/groff_out.man
+++ b/man/groff_out.man
@@ -3,7 +3,7 @@
 .ig
 groff_out.5
 
-Last update: 31 Jan 2002
+Last update: 10 Apr 2002
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -50,7 +50,7 @@ delim $$
 .
 .ig
 Unfortunately, old versions of groff used an illogical position change
-after some D-commands (Dp, DP, Dt).  If the number register
+after some D\~commands (Dp, DP, Dt).  If the number register
 @STUPID_DRAWING_POSITIONING is 1 (actual default) then change position
 after these commands, otherwise the position is not changed.
 ..
@@ -80,7 +80,7 @@ after these commands, otherwise the position is not changed.
 ..
 .de ShellCommand
 .  br
-.  IR "shell#" "\h'1m'\f[CB]\$*\f[P]\/"
+.  IR "shell>" "\h'1m'\f[CB]\$*\f[P]\/"
 ..
 .ec
 .\" End of macro definitions
@@ -204,7 +204,7 @@ after these commands, otherwise the position is not changed.
 .  IP "\f[B]Da\f[P]\ \*[@args]\|\*[@linebreak]"
 .  rm @args
 ..
-.c graphical command .D with a variable number of arguments
+.c graphics command .D with a variable number of arguments
 .c format: .D-multiarg <subcommand>
 .de D-multiarg
 .  ds @sub \$1\"
@@ -231,7 +231,8 @@ after these commands, otherwise the position is not changed.
 .  rm @args
 ..
 .de xsub
-.  RI \[lq] "x\ \$1" \[rq]:
+.  RI "(" "\$1" " control command)"
+.  br
 ..
 .ec
 .\" End of macro definitions 
@@ -423,7 +424,7 @@ commands must have all of their arguments on the same line as the
 command, i.e.\& the arguments may not be splitted by a line break.
 .
 .P
-Empty lines, i.e.\& lines containing only space and/or a comment can
+Empty lines, i.e.\& lines containing only space and/or a comment, can
 occur everywhere.
 .
 They are just ignored.
@@ -490,7 +491,7 @@ commands.
 .
 The
 .I groff prologue
-is guaranteed to consist of the following three lines:
+is guaranteed to consist of the following three lines (in that order):
 .RS
 .P
 .B x\ T
@@ -555,8 +556,10 @@ extensions.
 .
 .TP
 .BI # anything \[la]end_of_line\[ra]
-comment, ignore any characters from the
-.B #
+A comment.
+.
+Ignore any characters from the
+.BR # \~\c
 character up to the next newline character.
 .
 .P
@@ -585,7 +588,7 @@ Optionally,
 can be inserted before, after, and between the command letter and its
 arguments.
 .
-All of these commands are stackable, i.e.\& they can be preceded by
+All of these commands are stackable, i.e., they can be preceded by
 other simple commands or followed by arbitrary other commands on the
 same line.
 .
@@ -593,6 +596,7 @@ A separating syntactical space is only necessary when two integer
 arguments would clash or if the preceding argument ends with a string
 argument.
 .
+.
 .if (\n[@USE_ENV_STACK] == 1) \{\
 .command {
 Open a new environment by copying the actual device configuration data
@@ -601,13 +605,15 @@ to the environment stack.
 The current environment is setup by the device specification and
 manipulated by the setting commands.
 .
+.
 .command }
 Close the actual environment (opened by a preceding
 .BR { \~command)
 and restore the previous environment from the environment
 stack as the actual device configuration data.
 .
-\}			\" endif @USE_ENV_STACK
+\}              \" endif @USE_ENV_STACK
+.
 .
 .command C xxx \[la]white_space\[ra]
 Print a special groff character named
@@ -621,6 +627,7 @@ the character's size is read from the font file.
 .
 The print position is not changed.
 .
+.
 .command c c
 Print character\~\c
 .argument c
@@ -629,11 +636,13 @@ the character's size is read from the font file.
 .
 The print position is not changed.
 .
+.
 .command f n
 Set font to font number\~\c
 .argument n
 (a non-negative integer).
 .
+.
 .command H n
 Move right to the absolute vertical position\~\c
 .argument n
@@ -641,6 +650,7 @@ Move right to the absolute vertical position\~\c
 .unit u )
 relative to left edge of current page.
 .
+.
 .command h n
 Move
 .argument n
@@ -655,37 +665,56 @@ also, but
 .I groff
 doesn't use this.
 .
+.
+.command m "color_scheme \f[R][\f[P]component .\|.\|.\f[R]]\f[P]"
+Set the color for text (glyphs), line drawing, and the outline of
+graphic objects using different color schemes; the analoguous command
+for the filling color of graphic objects is
+.BR DF .
+.
+The color components are specified as integer arguments between 0 and
+\n[@maxcolor] with black having all components\~0.
+.
+The number of color components and their meaning vary for the
+different color schemes.
+.
+These commands are generated by the groff escape sequence
+.BR \*[@backslash]m .
+.
+No position changing.
+.
+These commands are a groff extension.
+.
+.
+.RS
+.
 .command mc "cyan magenta yellow"
-Set color for glyphs and line drawing using the CMY color scheme,
-where all arguments are integers between 0 and \n[@maxcolor] with black
-having all arguments\~0.
+Set color using the CMY color scheme, having the 3\~color components
+cyan, magenta, and yellow.
 .
-This command is a groff extension.
 .
 .command md
-Set color for glyphs and line drawing to the default drawing color value
+Set color to the default color value
 (black in most cases).
 .
-This command is a groff extension.
+No component arguments.
+.
 .
 .command mg "gray"
-Set color for glyphs and line drawing to the shade of gray given by
-the argument, an integer between\~0 (black) and \n[@maxcolor] (white).
+Set color to the shade of gray given by the argument, an integer
+between 0 (black) and \n[@maxcolor] (white).
 .
-This command is a groff extension.
 .
 .command mk "cyan magenta yellow black"
-Set color for glyphs and line drawing using the CMYK color scheme,
-where all arguments are integers between\~0 and \n[@maxcolor].
-.
-This command is a groff extension.
+Set color using the CMYK color scheme, having the 4\~color components
+cyan, magenta, yellow, and black.
 .
 .command mr "red green blue"
-Set color for glyphs and line drawing using the RGB color scheme,
-where all arguments are integers between\~0 and \n[@maxcolor] with black
-having all arguments\~0.
+Set color using the RGB color scheme, having the 3\~color components
+red, green, and blue.
+.
+.RE
 .
-This command is a groff extension.
 .
 .command N n
 Print character with index\~\c
@@ -694,6 +723,7 @@ Print character with index\~\c
 .
 This command is a groff extension.
 .
+.
 .command n b\ a
 Inform the device about a line break, but no positioning is done by
 this command.
@@ -709,6 +739,7 @@ any action.
 In groff, they are just ignored, but they must be provided for
 compatibility reasons.
 .
+.
 .command p n
 Begin a new page in the outprint.
 .
@@ -725,6 +756,7 @@ page, so a
 .BR p \~command
 must be issued before any of these commands.
 .
+.
 .command s n
 Set point size to
 .argument n
@@ -741,6 +773,7 @@ Classical troff used the unit
 instead; see section
 .BR COMPATIBILITY .
 .
+.
 .command t xxx \[la]white_space\[ra]
 .command+ t "xxx dummy_arg" \[la]white_space\[ra]
 Print a word, i.e.\& a sequence of characters
@@ -750,8 +783,8 @@ integer argument is ignored (this allows the formatter to generate
 an even number of arguments).
 .
 The first character should be printed at the current position, the
-current horizontal position should be increased by the width of the
-first character, and so on for each character.
+current horizontal position should then be increased by the width of
+the first character, and so on for each character.
 .
 The widths of the characters are read from the font file, scaled for the
 current point size, and rounded to a multiple of the horizontal
@@ -765,9 +798,10 @@ This command is a groff extension; it is only used for devices whose
 .I DESC
 file contains the
 .B tcommand
-line; see
+keyword; see
 .BR groff_font (@MAN5EXT@).
 .
+.
 .command u "n xxx" \[la]white_space\[ra]
 Print word with track kerning.
 .
@@ -784,9 +818,10 @@ This command is a groff extension; it is only used for devices whose
 .I DESC
 file contains the
 .B tcommand
-line; see
+keyword; see
 .BR groff_font (@MAN5EXT@).
 .
+.
 .command V n
 Move down to the absolute vertical position\~\c
 .argument n
@@ -794,6 +829,7 @@ Move down to the absolute vertical position\~\c
 .unit u )
 relative to upper edge of current page.
 .
+.
 .command v n
 Move
 .argument n
@@ -810,6 +846,7 @@ also, but
 .I groff
 doesn't use this.
 .
+.
 .command w
 Informs about a paddable white space to increase readability.
 .
@@ -820,7 +857,7 @@ The spacing itself must be performed explicitly by a move command.
 .SS "Graphics Commands"
 .\" --------------------------------------------------------------------
 .
-Each graphical or drawing command in the intermediate output starts
+Each graphics or drawing command in the intermediate output starts
 with the letter\~\c
 .B D
 followed by another single character that specifies a subcommand; this
@@ -844,7 +881,7 @@ letters and makes the space before the first argument optional.
 As usual, each space can be any sequence of tab and space characters.
 .
 .P
-Some graphical commands can take a variable number of arguments.
+Some graphics commands can take a variable number of arguments.
 .
 In this case, they are integers representing a size measured in basic
 units\~\c
@@ -870,19 +907,20 @@ escape sequence; see
 .BR groff (@MAN7EXT@).
 .
 .P
-Unknown D-commands are assumed to be device-specific.
+Unknown D\~commands are assumed to be device-specific.
 .
 Its arguments are parsed as strings; the whole information is then
 sent to the postprocessor.
 .
 .P
-In the following command references, the syntax element
+In the following command reference, the syntax element
 .I \[la]line_break\[ra]
 means a
 .I syntactical line break
 as defined in section
 .BR Separation .
 .
+.
 .D-multiarg ~
 Draw B-spline from current position to offset
 .indexed_offset h 1 v 1 ,
@@ -893,6 +931,7 @@ if given, etc.\& up to
 This command takes a variable number of argument pairs;
 the current position is moved to the terminal point of the drawn curve.
 .
+.
 .Da-command
 Draw arc from current position to
 .indexed_offset h 1 v 1 \|+\|\c
@@ -901,6 +940,7 @@ with center at
 .indexed_offset h 1 v 1 ;
 then move the current position to the final point of the arc.
 .
+.
 .D-command C d
 .D-command+ C d dummy_arg
 Draw a solid circle using the current fill color with diameter\~\c
@@ -915,6 +955,7 @@ formatter to generate an even number of arguments).
 .
 This command is a groff extension.
 .
+.
 .D-command c d
 Draw circle line with diameter\~\c
 .argument d
@@ -923,6 +964,7 @@ Draw circle line with diameter\~\c
 with leftmost point at the current position; then move the current
 position to the rightmost point of the circle.
 .
+.
 .D-command E "h v"
 Draw a solid ellipse in the current fill color with a horizontal
 diameter of\~\c
@@ -936,6 +978,7 @@ rightmost point of the ellipse.
 .
 This command is a groff extension.
 .
+.
 .D-command e "h v"
 Draw an outlined ellipse with a horizontal diameter of\~\c
 .argument h
@@ -946,66 +989,102 @@ and a vertical diameter of\~\c
 with the leftmost point at current position; then move to the
 rightmost point of the ellipse.
 .
-.D-command Fc "cyan magenta yellow"
-Set fill color for solid drawing objects using the CMY color scheme,
-where all arguments are integers between 0 and \n[@maxcolor] with black
-having all arguments\~0.
+.
+.D-command F "color_scheme \f[R][\f[P]component .\|.\|.\f[R]]\f[P]"
+Set fill color for solid drawing objects using different color
+schemes; the analoguous command for setting the color of text, line
+graphics, and the outline of graphic objects is
+.BR m .
+.
+The color components are specified as integer arguments between 0 and
+\n[@maxcolor] with black having all components\~0.
+.
+The number of color components and their meaning vary for the
+different color schemes.
+.
+These commands are generated by the groff escape sequences
+.B \*[@backslash]DF
+and
+.B \*[@backslash]M
+(with no other corresponding graphics command).
 .
 No position changing.
 .
 This command is a groff extension.
 .
+.
+.RS
+.
+.D-command Fc "cyan magenta yellow"
+Set fill color for solid drawing objects using the CMY color scheme,
+having the 3\~color components cyan, magenta, and yellow.
+.
+.
 .D-command Fd
 Set fill color for solid drawing objects to the default fill color value
 (black in most cases).
 .
-No position changing.
+No component arguments.
 .
-This command is a groff extension.
 .
 .D-command Fg "gray"
 Set fill color for solid drawing objects to the shade of gray given by
 the argument, an integer between 0 (black) and \n[@maxcolor] (white).
 .
-No position changing.
-.
-This command is a groff extension.
 .
 .D-command Fk "cyan magenta yellow black"
 Set fill color for solid drawing objects using the CMYK color scheme,
-where all arguments are integers between 0 and \n[@maxcolor].
-.
-No position changing.
-.
-This command is a groff extension.
+having the 4\~color components cyan, magenta, yellow, and black.
 .
 .D-command Fr "red green blue"
 Set fill color for solid drawing objects using the RGB color scheme,
-where all arguments are integers between 0 and \n[@maxcolor] with black
-having all arguments\~0.
+having the 3\~color components red, green, and blue.
 .
-No position changing.
+.RE
 .
-This command is a groff extension.
 .
 .D-command f n
-Obsolete color command; sets the shade of gray for filling solid
-drawing objects to integer\~\c
-.argument n ,
+The argument
+.argument n
+must be an integer in the range -32767 to 32767.
+.
+.RS
+.TP
+.RI "0 \[<=] " n " \[<=] 1000"
+Set the color for filling solid drawing objects to a shade of gray,
 where 0 corresponds to solid white, 1000 (the default) to solid black,
-and values in between to intermediate shades of gray.
+and values in between to intermediate shades of gray; this is
+obsoleted by command
+.BR DFg .
+.
+.TP
+.IR n " < 0 or " n " > 1000"
+Set the filling color to the color that is currently being used for
+the text and the outline, see command
+.BR m .
+For example, the command sequence
 .
-Values outside of this range selects the shade of gray that is currently
-being used for lines and text (normally black).
+.nf
+.ft CB
+.RS
+.RS
+mg 0 0 \n[@maxcolor]
+Df -1
+.RE
+.ft
+.fi
 .
-This is internally mapped to the
-.B DFg
-command.
+sets all colors to blue.
+.RE
 .
+.P
 No position changing.
 .
 This command is a groff extension.
 .
+.RE
+.
+.
 .D-command l "h v"
 Draw line from current position to offset
 .offset h v
@@ -1013,6 +1092,7 @@ Draw line from current position to offset
 .unit u );
 then set current position to the end of the drawn line.
 .
+.
 .D-multiarg p
 Draw a polygon line from current position to offset
 .offset h1 v1 ,
@@ -1037,6 +1117,7 @@ the position doesn't change.
 .
 This command is a groff extension.
 .
+.
 .D-multiarg P
 The same macro as the corresponding
 .B Dp
@@ -1052,6 +1133,7 @@ No position changing.
 .
 This command is a groff extension.
 .
+.
 .D-command t n
 Set the current line thickness to\~\c
 .argument n
@@ -1131,10 +1213,10 @@ means a
 as defined in section
 .BR Separation .
 .
-.x-command F filename
+.x-command F name
 .xsub Filename
 Use
-.argument filename
+.argument name
 as the intended name for the current file in error reports.
 .
 This is useful for remembering the original file name when groff uses
@@ -1144,16 +1226,18 @@ The input file is not changed by this command.
 .
 This command is a groff extension.
 .
+.
 .x-command f "n\ s"
 .xsub font
 Mount font position\~\c
 .argument n
 (a non-negative integer) with font named\~\c
 .argument s
-(a word),
+(a text word),
 cf.
 .BR groff_font (@MAN5EXT@).
 .
+.
 .x-command H n
 .xsub Height
 Set character height to\~\c
@@ -1167,12 +1251,14 @@ points (\c
 instead; see section
 .BR COMPATIBILITY .
 .
+.
 .x-command i
 .xsub init
 Initialize device.
 .
 This is the third command of the prologue.
 .
+.
 .x-command p
 .xsub pause
 Parsed but ignored.
@@ -1181,6 +1267,7 @@ The classical documentation reads
 .I pause device, can be
 .IR restarted .
 .
+.
 .x-command r "n\ h\ v"
 .xsub resolution
 Resolution is\~\c
@@ -1196,6 +1283,7 @@ per inch.
 .
 This is the second command of the prologue.
 .
+.
 .x-command S n
 .xsub Slant
 Set slant to\~\c
@@ -1203,11 +1291,13 @@ Set slant to\~\c
 (an integer in basic units\~\c
 .unit u ).
 .
+.
 .x-command s
 .xsub stop
 Terminates the processing of the current file; issued as the last
 command of any intermediate troff output.
 .
+.
 .x-command t
 .xsub trailer
 Generate trailer information, if any.
@@ -1216,14 +1306,20 @@ In
 .IR groff ,
 this is actually just ignored.
 .
+.
 .x-command T xxx
 .xsub Typesetter
 Set name of device to word
 .argument xxx ,
 a sequence of characters ended by the next white space character.
 .
+The possible device names coincide with those from the groff
+.B -T
+option.
+.
 This is the first command of the prologue.
 .
+.
 .x-command u n
 .xsub underline
 Configure underlining of spaces.
@@ -1243,6 +1339,7 @@ mode and is ignored otherwise.
 .
 This command is a groff extension.
 .
+.
 .x-command X anything
 .xsub X-escape
 Send string
@@ -1269,7 +1366,7 @@ This command is generated by the
 escape sequence
 .BR \*[@backslash]X .
 .
-The line continuing feature is a groff extension.
+The line-continuing feature is a groff extension.
 .
 .
 .\" --------------------------------------------------------------------
@@ -1284,6 +1381,7 @@ character.
 .
 It didn't have a command code, but is represented by a 3-character
 argument consisting of exactly 2 digits and a character.
+.
 .TP
 .argument ddc
 Move right
@@ -1293,7 +1391,8 @@ Move right
 then print character\~\c
 .argument c .
 .
-.IP
+.RS
+.P
 In groff, arbitrary syntactical space around and within this command
 is allowed to be added.
 .
@@ -1306,7 +1405,9 @@ In
 large cluster of these and other commands were used, mostly without
 spaces; this made such output almost unreadable.
 .
-.IP
+.RE
+.
+.P
 For modern high-resolution devices, this command does not make sense
 because the width of the characters can become much larger than two
 decimal digits.
@@ -1316,7 +1417,7 @@ In groff, this is only used for the devices
 .BR X75-12 ,
 .BR X100 ,
 and
-.B X100-12 .
+.BR X100-12 .
 .
 For other devices,
 the commands
@@ -1327,6 +1428,35 @@ provide a better functionality.
 .
 .
 .\" --------------------------------------------------------------------
+.SH "POSTPROCESSING"
+.\" --------------------------------------------------------------------
+.
+The
+.I roff
+postprocessors are programs that have the task to translate the
+intermediate output into actions that are sent to a device.
+.
+A device can be some piece of hardware such as a printer, or a software
+file format suitable for graphical or text processing.
+.
+The
+.I groff
+system provides powerful means that make the programming of such
+postprocessors an easy task.
+.P
+There is a library function that parses the intermediate output and
+sends the information obtained to the device via methods of a class
+with a common interface for each device.
+.
+So a
+.I groff
+postprocessor must only redefine the methods of this class.
+.
+For details, see the reference in section
+.BR FILES .
+.
+.
+.\" --------------------------------------------------------------------
 .SH "EXAMPLES"
 .\" --------------------------------------------------------------------
 .
@@ -1334,7 +1464,7 @@ This section presents the intermediate output generated from the same
 input for three different devices.
 .
 The input is the sentence
-.I `hell world'
+.I hell world
 fed into groff on the command line.
 .
 .Topic
@@ -1342,6 +1472,7 @@ High-resolution device
 .I ps
 .
 .RS
+.
 .P
 .ShellCommand echo "hell world" | groff -Z -T ps
 .
@@ -1370,30 +1501,63 @@ x stop
 .fi
 .RE
 .
+.P
+This output can be fed into the postprocessor
+.BR grops (@MAN1EXT@)
+to get its representation as a PostScript file.
+.
+.
 .Topic
 Low-resolution device
 .I latin1
 .
 .RS
+.
+.P
+This is similar to the high-resolution device except that the
+positioning is done at a minor scale.
+.
+Some comments (lines starting with
+.IR # )
+were added for clarification; they were not generated by the
+formatter.
+.
 .P
 .ShellCommand echo "hell world" | groff -Z -T latin1
 .
 .P
 .nf
+.I # prologue
 .ft CB
 x T latin1
 x res 240 24 40
 x init
+.I # begin a new page
+.ft CB
 p1
+.I # font setup
+.ft CB
 x font 1 R
 f1
 s10
+.I # initial positioning on the page
+.ft CB
 V40
 H0
+.I # write text `hell'
+.ft CB
 thell
+.I # inform about a space, and do it by a horizontal jump
+.ft CB
 wh24
+.I # write text `world'
+.ft CB
 tworld
+.I # announce line break, but do nothing because ...
+.ft CB
 n40 0
+.I # ... the end of the document has been reached
+.ft CB
 x trailer
 V2640
 x stop
@@ -1401,10 +1565,22 @@ x stop
 .fi
 .RE
 .
+.P
+This output can be fed into the postprocessor
+.BR grotty (@MAN1EXT@)
+to get a formatted text document.
+.
+.
 .Topic
-Classical style output for the X devices
+Classical style output
 .
 .RS
+.
+.P
+As a computer monitor has a very low resolution compared to modern
+printers the intermediate output for the X\~devices can use the
+jump-and-write command with its 2-digit displacements.
+.
 .P
 .ShellCommand echo "hell world" | groff -Z -T X100
 .
@@ -1420,6 +1596,8 @@ f5
 s10
 V16
 H100
+.I # write text with old-style jump-and-write command
+.ft CB
 ch07e07l03lw06w11o07r05l03dh7
 n16 0
 x trailer
@@ -1430,37 +1608,15 @@ x stop
 .RE
 .
 .P
-The text clusters of the classical output are much harder to be read,
-due to the obsolete jump'n'write command.
-.
-.
-.\" --------------------------------------------------------------------
-.SH "POSTPROCESSING"
-.\" --------------------------------------------------------------------
-.
-The
-.I roff
-postprocessors are programs that have the task to translate the
-intermediate output into actions that are sent to a device.
-.
-A device can be some piece of hardware such as a printer, or a software
-file format suitable for graphical or text processing.
+This output can be fed into the postprocessor
+.BR xditview (1x)
+or
+.BR gxditview (@MAN1EXT@)
+for displaying in X window.
 .
-The
-.I groff
-system provides powerful means that make the programming of such
-postprocessors an easy task.
 .P
-There is a library function that parses the intermediate output and
-sends the information obtained to the device via methods of a class
-with a common interface for each device.
-.
-So a
-.I groff
-postprocessor must only redefine the methods of this class.
-.
-For details, see the reference in section
-.BR FILES .
+Due to the obsolete jump-and-write command, the text clusters in the
+classical output are almost unreadable.
 .
 .
 .\" --------------------------------------------------------------------
@@ -1512,11 +1668,10 @@ has the implicit unit scaled point\~\c
 in groff, while classical troff had point (\c
 .unit p ).
 .
-This isn't an incompatibility, but a compatible extension.
-.
-For, both units coincide for all devices without a
+This isn't an incompatibility, but a compatible extension,
+for both units coincide for all devices without a
 .I sizescale
-parameter, this includes all classical and the groff text devices.
+parameter, including all classical and the groff text devices.
 .
 The few groff devices with a sizescale parameter either did
 not exist, had a different name, or seem to have had a different
@@ -1533,7 +1688,7 @@ and
 .B Dt
 is illogical, but as old versions of groff used this feature it is
 kept for compatibility reasons.
-.\}			\" @STUPID_DRAWING_POSITIONING
+.\}             \" @STUPID_DRAWING_POSITIONING
 .el \{\
 .Topic
 Temporarily, there existed some confusion on the positioning after the
@@ -1545,14 +1700,14 @@ groff drawing commands:
 .
 .RS
 .P
-.I The position after a graphical object has been drawn is at its end;
+.I The position after a graphic object has been drawn is at its end;
 .I for circles and ellipses, the "end" is at the right side.
 .RE
 .
 .P
 From this, the positionings specified for the drawing commands above
 follow quite naturally.
-.\}			\" @STUPID_DRAWING_POSITIONING
+.\}             \" @STUPID_DRAWING_POSITIONING
 .
 .P
 The differences between groff and classical troff are documented in
@@ -1591,11 +1746,11 @@ A reference like
 refers to a manual page; here
 .I groff
 in section\~\c
-.I 7
+.I @MAN7EXT@
 of the man-page documentation system.
 .
-To read the example, look up section\~7 in your desktop help system or
-call from the shell prompt
+To read the example, look up section\~@MAN7EXT@ in your desktop help
+system or call from the shell prompt
 .
 .RS
 .P
@@ -1607,11 +1762,10 @@ For more details, see
 .BR man (1).
 .
 .TP
-.BR troff (@MAN1EXT@)
-.TP+
 .BR groff (@MAN1EXT@)
-for getting the device-independent intermediate output from the shell
-prompt.
+option
+.B -Z
+and further readings on groff.
 .
 .TP
 .BR groff (@MAN7EXT@)
@@ -1626,9 +1780,12 @@ for details on the device scaling parameters of the
 file.
 .
 .TP
+.BR troff (@MAN1EXT@)
+generates the device-independent intermediate output.
+.
+.TP
 .BR roff (@MAN7EXT@)
-for historical aspects, a list of the available postprocessors, and
-further readings.
+for historical aspects and the general structure of roff systems.
 .
 .TP
 .BR groff_diff (@MAN7EXT@)
@@ -1636,8 +1793,20 @@ The differences between the intermediate output in groff and classical
 troff.
 .
 .P
-The main source of information on all aspects of the groff system is
-the
+.BR \%grodvi (@MAN1EXT@),
+.BR \%grohtml (@MAN1EXT@),
+.BR \%grolbp (@MAN1EXT@),
+.BR \%grolj4 (@MAN1EXT@),
+.BR \%grops (@MAN1EXT@),
+.BR \%grotty (@MAN1EXT@)
+.br
+.RS
+the groff postprocessor programs.
+.RE
+.
+.P
+For a treatment of all aspects of the groff system within a single
+document, see the
 .I groff info
 .IR file .
 .
@@ -1646,7 +1815,6 @@ It can be read within the integrated help systems, within
 or from the shell prompt by
 .
 .RS
-.P
 .ShellCommand info groff
 .RE
 .
@@ -1704,7 +1872,7 @@ described only parts of the
 .I groff
 extensions of the output language.
 .
-It has been rewritten 2001 by
+It has been rewritten 2002 by
 .MTO bwarken@mayn.de "Bernd Warken"
 and is maintained by
 .MTO wl@gnu.org "Werner Lemberg" .