This commit was generated by cvs2svn to compensate for changes in r151497,

which included commits to RCS files with non-trunk default branches.

7 files changed, 350 insertions, 107 deletions

diff --git a/contrib/groff/man/ditroff.man b/contrib/groff/man/ditroff.man
index 0867f3d0..ea3bb86 100644
--- a/contrib/groff/man/ditroff.man
+++ b/contrib/groff/man/ditroff.man
@@ -1,11 +1,11 @@
 .ig
 ditroff.man
 
-Last update: 4 Jan 2002
+Last update: 2 Jul 2004
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -85,7 +85,9 @@ today.
 In order to distinguish it from Osanna's original mono-device version,
 it was called
 .I ditroff
-.RI ( d\/ evice\~ i\/ ndependent\~ troff\/ )
+(\c
+.IR d\/ evice\~ i\/ ndependent\~ troff\/\c
+)
 on some systems, though this naming isn't mentioned in the classical
 documentation.
 .
@@ -169,7 +171,7 @@ multi-devicing.
 .SH "AUTHORS"
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/contrib/groff/man/groff.man b/contrib/groff/man/groff.man
index 8238717..2e0bfc7 100644
--- a/contrib/groff/man/groff.man
+++ b/contrib/groff/man/groff.man
@@ -2,11 +2,12 @@
 .ig
 groff.man
 
-Last update: 13 Feb 2003
+Last update: 17 Feb 2005
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+  Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -24,6 +25,9 @@ FDL in the main directory of the groff source package.
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do nr groff_C \n[.C]
+.cp 0
+.
 .mso www.tmac
 .
 .if n \{\
@@ -1012,6 +1016,17 @@ True if there is a register named
 Formatter is
 .BR troff .
 .
+.TPx
+.BI F font
+True if there exists a font named
+.IR font .
+.
+.TPx
+.BI S style
+True if a style named
+.I style
+has been registered.
+.
 .RE
 .PD
 .
@@ -1165,6 +1180,16 @@ until
 .request .end
 is called.
 .
+.REQ .am1 macro
+Same as
+.request .am
+but with compatibility mode switched off during macro expansion.
+.
+.REQ .am1 macro end
+Same as
+.request .am
+but with compatibility mode switched off during macro expansion.
+.
 .REQ .ami macro
 Append to a macro whose name is contained in the string register
 .I macro
@@ -1180,14 +1205,14 @@ and
 are string registers whose contents are interpolated for the macro name
 and the end macro, respectively.
 .
-.REQ .am1 macro
+.REQ .ami1 macro
 Same as
-.request .am
+.request .ami
 but with compatibility mode switched off during macro expansion.
 .
-.REQ .am1 macro end
+.REQ .ami1 macro end
 Same as
-.request .am
+.request .ami
 but with compatibility mode switched off during macro expansion.
 .
 .REQ .as stringvar anything
@@ -1196,15 +1221,15 @@ Append
 to
 .IR stringvar .
 .
-.REQ .asciify diversion
-Unformat ASCII characters, spaces, and some escape sequences in
-.IR diversion .
-.
 .REQ .as1 stringvar anything
 Same as
 .request .as
 but with compatibility mode switched off during string expansion.
 .
+.REQ .asciify diversion
+Unformat ASCII characters, spaces, and some escape sequences in
+.IR diversion .
+.
 .REQ .backtrace
 Print a backtrace of the input on stderr.
 .
@@ -1429,6 +1454,16 @@ and
 are string registers whose contents are interpolated for the macro name
 and the end macro, respectively.
 .
+.REQ .dei1 macro
+Same as
+.request .dei
+but with compatibility mode switched off during macro expansion.
+.
+.REQ .dei1 macro end
+Same as
+.request .dei
+but with compatibility mode switched off during macro expansion.
+.
 .REQ .di
 End current diversion.
 .
@@ -1530,6 +1565,13 @@ Define fallback character
 as string
 .IR anything .
 .
+.REQ .fcolor
+Set fill color to previous fill color.
+.
+.REQ .fcolor c
+Set fill color to
+.IR c .
+.
 .REQ .fi
 Fill output lines.
 .
@@ -1592,6 +1634,13 @@ Translate
 to
 .IR font2 .
 .
+.REQ .gcolor
+Set glyph color to previous glyph color.
+.
+.REQ .gcolor c
+Set glyph color to
+.IR c .
+.
 .REQ .hc
 Remove additional hyphenation indicator character.
 .
@@ -1963,6 +2012,10 @@ Read insertion.
 .REQ .return
 Return from a macro.
 .
+.REQ .return anything
+Return twice, namely from the macro at the current level and from the macro
+one level higher.
+.
 .REQ .rfschar f c1 c2 .\|.\|.\&
 Remove the definitions of characters
 .IR c1 ,
@@ -3041,7 +3094,7 @@ The skew of a character is how far to the right of the center of a character
 the center of an accent over that character should be placed.
 .
 .REG .d
-Current vertical place in current diversion; equal to register
+Current vertical place in current diversion; equal to
 .register nl .
 .
 .REG .ev
@@ -3137,6 +3190,12 @@ The title length (as set by the
 .request lt
 request).
 .
+.REG .m
+The current drawing color (string-valued).
+.
+.REG .M
+The current background color (string-valued).
+.
 .REG .n
 Length of text portion on previous output line.
 .
@@ -3188,6 +3247,19 @@ The slant of the current font as set with
 The last requested pointsize in points as a decimal fraction
 (string-valued).
 .
+.REG .ss
+The value of the parameters set by the first argument of the
+.request ss
+request.
+.
+.REG .sss
+The value of the parameters set by the second argument of the
+.request ss
+request.
+.
+.REG .sty
+The current font style (string-valued).
+.
 .REG .t
 Distance to the next trap.
 .
@@ -3215,21 +3287,13 @@ the difference of what the vertical position would have been but for
 the trap, and what the vertical position actually is.
 .
 Useful in conjunction with the
-.register .ne
-register.
-.
-.REG .ss
-The value of the parameters set by the first argument of the
-.request ss
-request.
-.
-.REG .sss
-The value of the parameters set by the second argument of the
-.request ss
-request.
+.register .ne .
 .
 .REG .u
-Equal to 1 bin fill mode and 0 in nofill mode.
+Equal to 1 in fill mode and 0 in nofill mode.
+.
+.REG .U
+Equal to 1 in safer mode and 0 in unsafe mode.
 .
 .REG .v
 Current vertical line spacing.
@@ -3387,7 +3451,7 @@ The current year (year 2000 compliant).
 .REG yr
 Current year minus 1900.
 .
-For Y2K compliance use register
+For Y2K compliance use
 .register year
 instead.
 .
@@ -3424,7 +3488,8 @@ be reproduced, and say which version of groff you are using.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -3488,6 +3553,7 @@ pointers to further documentation.
      "Nroff/\:Troff User's Manual by Osanna & Kernighan"
 \[em] the bible for classical troff.
 .
+.cp \n[groff_C]
 .
 .\" --------------------------------------------------------------------
 .\" Emacs Setup
diff --git a/contrib/groff/man/groff_char.man b/contrib/groff/man/groff_char.man
index ed078e5..c386900 100644
--- a/contrib/groff/man/groff_char.man
+++ b/contrib/groff/man/groff_char.man
@@ -8,7 +8,7 @@ groff_char \- groff glyph names
 .
 .
 .\" --------------------------------------------------------------------
-.\" Legalize
+.\" Legal terms
 .\" --------------------------------------------------------------------
 .
 .ig
@@ -17,9 +17,9 @@ groff_char(7)
 This file is part of groff (GNU roff).
 
 File position: <groff_src_top>/man/groff_char.man
-Last update: 24 Feb 2003
+Last update: 05 Dec 2004
 
-Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by Werner Lemberg <wl@gnu.org>
 with additions by Bernd Warken <bwarken@mayn.de>
 
@@ -37,6 +37,9 @@ FDL in the main directory of the groff source package.
 .\" Setup Part 1
 .\" --------------------------------------------------------------------
 .
+.do nr groff_char_C \n[.C]
+.cp 0
+.
 .\" groff only
 .if \n(.g .mso www.tmac
 .\".if \n(.g .ne 2v
@@ -1127,7 +1130,7 @@ square root sign.
 .2e OK a19 u2713 "check mark, tick"
 .
 .Pa
-.I Legalize
+.I Legal Symbols
 .P
 .2s co copyright u00A9 "+"
 .C2 rg registered u00AE "+"
@@ -1235,6 +1238,7 @@ square root sign.
 .CN integral integral u222B "***"
 .CN sum summation u2211 "***"
 .CN product product u220F "***"
+.CN coproduct uni2210 u2210 "***"
 .C2 gr gradient u2207 "+"
 .C2 sr radical u221A "square root +"
 .CN sqrt radical u221A "***"
@@ -1353,7 +1357,8 @@ phi, and `\f(CW\e[+f]\fP' the curly variant.
 .SH "AUTHOR"
 .\" --------------------------------------------------------------------
 .
-Copyright \(co 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright \(co 1989-2000, 2001, 2002, 2003,
+2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -1407,6 +1412,8 @@ No. 2, Summer 1989
 .ie \n(.g .URL http://\:www.unicode.org "The Unicode Standard"
 .el The Unicode Standard <http://www.unicode.org>
 .
+.cp \n[groff_char_C]
+.
 .\" --------------------------------------------------------------------
 .\" Emacs settings
 .\" --------------------------------------------------------------------
diff --git a/contrib/groff/man/groff_diff.man b/contrib/groff/man/groff_diff.man
index eb00b44..94873dd 100644
--- a/contrib/groff/man/groff_diff.man
+++ b/contrib/groff/man/groff_diff.man
@@ -3,12 +3,12 @@
 .ig
 groff_diff.man
 
-Last update : 1 Mar 2003
+Last update : 26 Jul 2004
 
 This file is part of groff, the GNU roff type-setting system.
 It is the source of the man-page groff_diff(7).
 
-Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by James Clark
 
 modified by Werner Lemberg <wl@gnu.org>
@@ -28,6 +28,9 @@ FDL in the main directory of the groff source package.
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do nr groff_diff_C \n[.C]
+.cp 0
+.
 .mso www.tmac
 .
 .if n \{\
@@ -878,14 +881,6 @@ or string diversion is currently undefined or if it is defined to be a
 request; normally they modify the value of an existing object.
 .
 .TP
-.BI .ami\  xx\ yy
-Append to macro indirectly.
-.
-See the
-.B dei
-request below for more information.
-.
-.TP
 .BI .am1\  xx\ yy
 Similar to
 .BR .am , 
@@ -908,6 +903,41 @@ and
 .BR .ds1 .
 .
 .TP
+.BI .ami\  xx\ yy
+Append to macro indirectly.
+.
+See the
+.B dei
+request below for more information.
+.
+.TP
+.BI .ami1\  xx\ yy
+Same as the
+.B ami
+request but compatibility mode is switched off during execution.
+.
+.TP
+.BI .as1\  xx\ yy
+Similar to
+.BR .as , 
+but compatibility mode is switched off during expansion.
+.
+To be more precise, a `compatibility save' token is inserted at the
+beginning of the string, and a `compatibility restore' token at the end.
+.
+As a consequence, the requests
+.BR as ,
+.BR as1 ,
+.BR ds ,
+and
+.B ds1
+can be intermixed freely since the compatibility save/\:restore tokens
+only affect the (sub)strings defined by
+.B as1
+and
+.BR ds1 .
+.
+.TP
 .BI .asciify\  xx
 This request `unformats' the diversion
 .I xx
@@ -953,27 +983,6 @@ use
 instead.
 .
 .TP
-.BI .as1\  xx\ yy
-Similar to
-.BR .as , 
-but compatibility mode is switched off during expansion.
-.
-To be more precise, a `compatibility save' token is inserted at the
-beginning of the string, and a `compatibility restore' token at the end.
-.
-As a consequence, the requests
-.BR as ,
-.BR as1 ,
-.BR ds ,
-and
-.B ds1
-can be intermixed freely since the compatibility save/\:restore tokens
-only affect the (sub)strings defined by
-.B as1
-and
-.BR ds1 .
-.
-.TP
 .B .backtrace
 Print a backtrace of the input stack on stderr.
 .
@@ -1244,6 +1253,14 @@ and
 is not the same.
 .
 .TP
+.BI .de1\  xx\ yy
+Similar to
+.BR .de , 
+but compatibility mode is switched off during execution.
+.
+On entry, the current compatibility mode is saved and restored at exit.
+.
+.TP
 .BI .dei\  xx\ yy
 Define macro indirectly.
 .
@@ -1273,12 +1290,10 @@ is equivalent to
 .RE
 .
 .TP
-.BI .de1\  xx\ yy
-Similar to
-.BR .de , 
-but compatibility mode is switched off during execution.
-.
-On entry, the current compatibility mode is saved and restored at exit.
+.BI .dei1\  xx\ yy
+Similar to the
+.B dei
+request but compatibility mode is switched off during execution.
 .
 .TP
 .BI .do\  xxx
@@ -1379,6 +1394,15 @@ is checked only if the particular glyph isn't found in the current font.
 This test happens before checking special fonts.
 .
 .TP
+.BI .fcolor\  c
+Set the fill color to
+.IR c .
+If
+.I c
+is missing,
+switch to the previous fill color.
+.
+.TP
 .BI .fschar\  f\ c\ string
 Define fallback glyph
 .I c
@@ -1425,7 +1449,11 @@ Whenever a font named
 .I f
 is referred to in an
 .B \[rs]f
-escape sequence, or in the
+escape sequence, in the
+.B F
+and
+.B S
+conditional operators, or in the
 .BR ft ,
 .BR ul ,
 .BR bd ,
@@ -1448,6 +1476,15 @@ then font
 will not be translated.
 .
 .TP
+.BI .gcolor\  c
+Set the glyph color to
+.IR c .
+If
+.I c
+is missing,
+switch to the previous glyph color.
+.
+.TP
 .BI .hcode \ c1\ code1\ c2\ code2\|.\|.\|.\&
 Set the hyphenation code of character
 .I c1
@@ -1890,6 +1927,9 @@ request.
 .B .return
 Within a macro, return immediately.
 .
+If called with an argument, return twice, namely from the current macro and
+from the macro one level higher.
+.
 No effect otherwise.
 .
 .TP
@@ -2449,6 +2489,24 @@ there is a current diversion; this behaviour is so anomalous that it
 must be considered a bug.
 .
 .TP
+.BI .de\  xx\ yy
+.TQ
+.BI .am\  xx\ yy
+.TQ
+.BI .ds\  xx\ yy
+.TQ
+.BI .as\  xx\ yy
+In compatibility mode, these requests behaves similar to
+.BR .de1 ,
+.BR .am1 ,
+.BR .ds1 ,
+and
+.BR .as1 ,
+respectively: A `compatibility save' token is inserted at the
+beginning, and a `compatibility restore' token at the end, with
+compatibility mode switched on during execution.
+.
+.TP
 .BI .ev\  xx
 If
 .I xx
@@ -2675,6 +2733,18 @@ The title length as set by the
 request.
 .
 .TP
+.B \[rs]n[.m]
+The name of the current drawing color.
+.
+This is a string-valued register.
+.
+.TP
+.B \[rs]n[.M]
+The name of the current background color.
+.
+This is a string-valued register.
+.
+.TP
 .B \[rs]n[.ne]
 The amount of space that was needed in the last
 .B ne
@@ -2741,6 +2811,12 @@ arguments of the
 request.
 .
 .TP
+.B \[rs]n[.sty]
+The current font style.
+.
+This is a string-valued register.
+.
+.TP
 .B \[rs]n[.tabs]
 A string representation of the current tab settings suitable for use
 as an argument to the
@@ -2765,6 +2841,12 @@ Useful in conjunction with the
 register.
 .
 .TP
+.B \[rs]n[.U]
+Set to 1 if in safer mode and to 0 if in unsafe mode (as given with the
+.B \-U
+command line option).
+.
+.TP
 .B \[rs]n[.vpt]
 1\~if vertical position traps are enabled, 0\~otherwise.
 .
@@ -2902,7 +2984,7 @@ is the current year minus 1900.
 predefines a single (read/write) string-based register,
 .BR \[rs]*(.T ,
 which contains the argument given to the
-.B -T
+.B \-T
 command line option, namely the current output device (for example,
 .I latin1
 or
@@ -2912,7 +2994,7 @@ Note that this is not the same as the (read-only) number register
 which is defined to be\~1 if
 .B troff
 is called with the
-.B -T
+.B \-T
 command line option, and zero otherwise.
 .
 This behaviour is different to UNIX troff.
@@ -3037,6 +3119,26 @@ has been defined by the
 .B char
 request.
 .
+.TP
+.BI .if\ F f
+True if font
+.I f
+exists.
+.
+.B f
+is handled as if it was opened with the
+.B ft
+request (this is, font translation and styles are applied), without
+actually mounting it.
+.
+.TP
+.BI .if\ S s
+True if style
+.I s
+has been registered.
+.
+Font translation is applied.
+.
 .P
 The
 .B tr
@@ -3053,16 +3155,11 @@ Example:
 .ne 6v+\n(.Vu
 .ft CB
 .nf
-.Text .de foo
-.Text .  nop Hello, I'm `foo'.
-.Text .  nop I will now define `bar'.
+.Text .if t \[rs]{\[rs]
 .Text .  de bar
 .Text .    nop Hello, I'm `bar'.
 .Text .  .
-.Text .  nop Done.
-.Text ..
-.Text .foo
-.Text .bar
+.Text .\[rs]}
 .fi
 .
 .
@@ -3425,7 +3522,7 @@ for groff.
 provides a
 .B compatibility mode
 that allows to process roff code written for classical
-.troff
+.B troff
 or for other implementations of roff in a consistent way.
 .
 .P
@@ -3539,8 +3636,8 @@ pointsize will be set to 10\~scaled points.
 .
 .P
 In
-.I groff
-mode, there is a fundamental difference between unformatted input
+.IR groff ,
+there is a fundamental difference between unformatted input
 characters, and formatted output characters (glyphs).
 .
 Everything that affects how a glyph will be output is
@@ -3590,8 +3687,8 @@ The following example will make things clearer.
 .RE
 .
 .P
-In
-.I GNU mode
+With
+.I GNU troff
 this will be printed as
 .esc \[rs] .
 So each pair of input backslashes
@@ -3662,7 +3759,7 @@ classical "device-independent" troff did.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -3740,6 +3837,7 @@ of 1992, being the
 .URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \
      "classical troff documentation" .
 .
+.cp \n[groff_diff_C]
 .
 .\" --------------------------------------------------------------------
 .\" Emacs variables
diff --git a/contrib/groff/man/groff_font.man b/contrib/groff/man/groff_font.man
index 462baeb..b806aac 100644
--- a/contrib/groff/man/groff_font.man
+++ b/contrib/groff/man/groff_font.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-1995, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -17,17 +17,20 @@ translations approved by the Free Software Foundation instead of in
 the original English.
 ..
 .
+.do nr groff_font_C \n[.C]
+.cp 0
+.
 .de TQ
-.br
-.ns
-.TP \\$1
+.  br
+.  ns
+.  TP \\$1
 ..
 .
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
 ..
 .
 .
@@ -45,7 +48,8 @@ font format.
 The font files for device
 .I name
 are stored in a directory
-.BI dev name.
+.BI dev name\c
+\&.
 .
 There are two types of file: a
 device description file called
@@ -100,7 +104,18 @@ The horizontal resolution is
 machine units.
 .
 .TP
-.BI paperheight\  n
+.BI image_generator\  string
+Needed for
+.B grohtml
+only.
+It specifies the program to generate PNG images from
+PostScript input.
+Under GNU/Linux this is usually
+.I gs
+but under other systems (notably cygwin) it might be set to another name.
+.
+.TP
+.BI paperlength\  n
 The physical vertical dimension of the output medium in machine units.
 .
 This isn't used by
@@ -273,6 +288,13 @@ for fonts whose point size is
 scaled points.
 .
 .TP
+.B unscaled_charwidths
+Make the font handling module always return unscaled character widths.
+Needed for the
+.B grohtml
+device.
+.
+.TP
 .B use_charnames_in_special
 This command indicates that troff should encode named characters inside
 special commands.
@@ -519,9 +541,13 @@ field has the form (in one line; it is broken here for the sake of
 readability):
 .
 .IP
-.IR width [\fB, height [\fB, depth [\fB, italic-correction
+.I width\c
+.RI [\fB, height\c
+.RI [\fB, depth\c
+.RI [\fB, italic-correction
 .br
-.RI [\fB, left-italic-correction [\fB, subscript-correction ]]]]]
+.RI [\fB, left-italic-correction\c
+.RI [\fB, subscript-correction ]]]]]
 .
 .LP
 There must not be any spaces between these subfields.
@@ -627,6 +653,8 @@ of device
 .BR groff_out (@MAN5EXT@),
 .BR @g@troff (@MAN1EXT@).
 .
+.cp \n[groff_font_C]
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/contrib/groff/man/groff_tmac.man b/contrib/groff/man/groff_tmac.man
index c1d8006..030e739f 100644
--- a/contrib/groff/man/groff_tmac.man
+++ b/contrib/groff/man/groff_tmac.man
@@ -14,11 +14,11 @@ groff_tmac.5
 
 File position: <groff-source>/man/groff_tmac.man
 
-Last update: 13 Mar 2003
+Last update: 27 Jul 2004
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de> and Werner Lemberg
 <wl@gnu.org>
 
@@ -36,6 +36,9 @@ FDL in the main directory of the groff source package.
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do nr groff_tmac_C \n[.C]
+.cp 0
+.
 .mso www.tmac
 .
 .if n \{\
@@ -339,6 +342,7 @@ This is the classical macro package for UNIX manual pages
 (man\~pages); it is quite handy and easy to use; see
 .BR groff_man (@MAN7EXT@).
 .
+.
 .TP
 .B doc
 .TP+
@@ -450,6 +454,22 @@ orientation:
 .
 .
 .TP
+.B pic
+This file provides proper definitions for the macros
+.B PS
+and
+.BR PE ,
+needed for the
+.BR @g@pic (@MAN1EXT@)
+preprocessor.
+.
+They will center each picture.
+.
+Use it only if your macro package doesn't provide proper definitions
+for those two macros (actually, most of them already have).
+.
+.
+.TP
 .B pspic
 A single macro is provided in this file,
 .BR PSPIC ,
@@ -509,6 +529,17 @@ option causes the graphic to be indented by\~\c
 (default scaling indicator is\~\c
 .BR m ).
 .
+.
+.TP
+.B trace
+Use this for tracing macro calls.
+.
+It is only useful for debugging.
+.
+See
+.BR groff_trace (@MAN7EXT@) .
+.
+.
 .TP
 .B tty-char
 Overrides the definition of standard troff characters and some groff
@@ -1180,7 +1211,7 @@ See the previous section for a detailed description.
 .SH AUTHOR
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -1210,10 +1241,12 @@ groff
 .BR info (1)
 file.
 .
+.
 .TP
 .BR groff (@MAN1EXT@)
 an overview of the groff system.
 .
+.
 .TP
 .BR groff_man (@MAN7EXT@),
 .TP+
@@ -1227,9 +1260,12 @@ an overview of the groff system.
 .TP+
 .BR groff_ms (@MAN7EXT@),
 .TP+
+.BR groff_trace (@MAN7EXT@),
+.TP+
 .BR groff_www (@MAN7EXT@).
 the groff tmac macro packages.
 .
+.
 .TP
 .BR groff (@MAN7EXT@)
 the groff language.
@@ -1239,6 +1275,8 @@ the groff language.
 The Filesystem Hierarchy Standard is available at the
 .URL http://\:www.pathname.com/\:fhs/ "FHS web site" .
 .
+.cp \n[groff_tmac_C]
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/contrib/groff/man/roff.man b/contrib/groff/man/roff.man
index 621b362..50cde7b 100644
--- a/contrib/groff/man/roff.man
+++ b/contrib/groff/man/roff.man
@@ -1,11 +1,11 @@
 .ig
 roff.man
 
-Last update: 3 Apr 2003
+Last update: 1 Jun 2004
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -23,6 +23,9 @@ FDL in the main directory of the groff source package.
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do nr roff_C \n[.C]
+.cp 0
+.
 .mso www.tmac
 .
 .if n \{\
@@ -470,7 +473,7 @@ Labs tried to launch a rescue project with their
 operating system.
 .
 It is freely available for non-commercial use, even the source code,
-but has a proprietary license that empedes the free development.
+but has a proprietary license that impedes the free development.
 .
 This concept is outdated, so Plan\~9 was not accepted as a platform to
 bundle the main-stream development.
@@ -520,7 +523,7 @@ When you read a system manual page (man page) roff is working in the
 background.
 .
 Roff documents can be viewed with a native viewer called
-.BR xditview (1x),
+.BR \%xditview (1x),
 a standard program of the X window distribution, see
 .BR X (7x).
 .
@@ -1166,7 +1169,7 @@ provides the free roff implementation groff, the actual standard roff.
 .\" --------------------------------------------------------------------
 .
 Many classical
-.troff
+.B troff
 documents are still available on-line.
 .
 The two main manuals of the troff language are
@@ -1244,7 +1247,7 @@ might be a good starting point.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -1264,6 +1267,7 @@ It was written by
 it is maintained by
 .MTO wl@gnu.org "Werner Lemberg".
 .
+.cp \n[roff_C]
 .
 .\" --------------------------------------------------------------------
 .\" Emacs setup