* tmac/an-old.tmac (RI): Always start with font `R'.

(RI, IR): Properly end with font `R'.

* man/ditroff.man, man/groff_font.man, man/groff_out.man,
src/devices/grohtml/grohtml.man, src/preproc/grn/grn.man,
src/preproc/pic/pic.man, tmac/groff_man.man, tmac/groff_ms.man:
Don't pass more than six arguments to .R, .I, .B, etc., for
compatibility with traditional troff macros.

12 files changed, 73 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index bd9f6fc7..48761b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-07-03  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac (RI): Always start with font `R'.
+	(RI, IR): Properly end with font `R'.
+
+2004-07-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* man/ditroff.man, man/groff_font.man, man/groff_out.man,
+	src/devices/grohtml/grohtml.man, src/preproc/grn/grn.man,
+	src/preproc/pic/pic.man, tmac/groff_man.man, tmac/groff_ms.man:
+	Don't pass more than six arguments to .R, .I, .B, etc., for
+	compatibility with traditional troff macros.
+
 2004-07-02  Werner LEMBERG  <wl@gnu.org>
 
 	* src/roff/troff/input.h: s/COMPATIBLE_SAVE/PUSH_GROFF_MODE/.
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
index 563ab99a..bd5223d4 100644
--- a/contrib/mm/groff_mm.man
+++ b/contrib/mm/groff_mm.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 2.12 2004/05/13 13:13:24 wlemb Exp $
+.\" $Id: groff_mm.man,v 2.13 2004/07/03 12:46:56 wlemb Exp $
 .\"
 .de T2
 .if t .ne 2v
@@ -1278,7 +1278,7 @@ the header in letters or other special texts.
 This macro must be used before any text to inhibit the pageheader
 on the first page.
 .TP
-.B PIC [-L] [-C] [-R] [-I n] filename [width [height]]
+.B "PIC [-L] [-C] [-R] [-I n] filename [width [height]]"
 \fBPIC\fP includes a Postscript file in the document.
 The macro depends on \fBmmroff\fP and \fBINITR\fP.
 \fB-L\fP, \fB-C\fP, \fB-R\fP and \fB-I n\fP adjusts the picture
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 524c99ec..210b4a47 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -13047,9 +13047,13 @@ in special fonts, we must call @code{rchar} to remove the definition
 of the fallback glyph.  Anyway, the translation is still active;
 @samp{x} now maps to the real glyph @samp{foo}.
 
-@cindex compatibility mode
-@cindex mode, compatibility
-Macro arguments preserve the compatibility mode:
+@cindex compatibility mode, and parameters
+@cindex mode, compatibility, and parameters
+@cindex arguments, and compatibility mode
+@cindex parameters, and compatibility mode
+@cindex macro arguments, and compatibility mode
+@cindex request arguments, and compatibility mode
+Macro and request arguments preserve the compatibility mode:
 
 @Example
 .cp 1     \" switch to compatibility mode
@@ -13068,7 +13072,7 @@ Since compatibility mode is on while @code{de} is called, the macro
 compatibility mode status which was active at the point where @code{xx}
 is called.
 
-After expansion of the macro arguments, the compatibility save and restore
+After expansion of the parameters, the compatibility save and restore
 tokens are removed.
 
 
diff --git a/man/ditroff.man b/man/ditroff.man
index 0867f3d0..ea3bb86c 100644
--- a/man/ditroff.man
+++ b/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/man/groff_font.man b/man/groff_font.man
index 759b5444..7da71550 100644
--- a/man/groff_font.man
+++ b/man/groff_font.man
@@ -522,9 +522,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.
diff --git a/man/groff_out.man b/man/groff_out.man
index bdcee62f..d7825941 100644
--- a/man/groff_out.man
+++ b/man/groff_out.man
@@ -3,7 +3,7 @@
 .ig
 groff_out.5
 
-Last update: 1 Jun 2004
+Last update: 2 Jul 2004
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -1541,36 +1541,36 @@ formatter.
 .
 .P
 .nf
-.I # prologue
+.I "# prologue"
 .ft CB
 x T latin1
 x res 240 24 40
 x init
-.I # begin a new page
+.I "# begin a new page"
 .ft CB
 p1
-.I # font setup
+.I "# font setup"
 .ft CB
 x font 1 R
 f1
 s10
-.I # initial positioning on the page
+.I "# initial positioning on the page"
 .ft CB
 V40
 H0
-.I # write text `hell'
+.I "# write text `hell'"
 .ft CB
 thell
-.I # inform about a space, and do it by a horizontal jump
+.I "# inform about a space, and do it by a horizontal jump"
 .ft CB
 wh24
-.I # write text `world'
+.I "# write text `world'"
 .ft CB
 tworld
-.I # announce line break, but do nothing because ...
+.I "# announce line break, but do nothing because ..."
 .ft CB
 n40 0
-.I # ... the end of the document has been reached
+.I "# ... the end of the document has been reached"
 .ft CB
 x trailer
 V2640
@@ -1610,7 +1610,7 @@ f5
 s10
 V16
 H100
-.I # write text with old-style jump-and-write command
+.I "# write text with old-style jump-and-write command"
 .ft CB
 ch07e07l03lw06w11o07r05l03dh7
 n16 0
@@ -1714,8 +1714,10 @@ groff drawing commands:
 .
 .RS
 .P
-.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.
+.ft I
+The position after a graphic object has been drawn is at its end;
+for circles and ellipses, the "end" is at the right side.
+.ft
 .RE
 .
 .P
diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.man
index 054d9767..8670b820 100644
--- a/src/devices/grohtml/grohtml.man
+++ b/src/devices/grohtml/grohtml.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1999-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1999-2000, 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 are
@@ -203,7 +203,9 @@ mounted at font positions 1 to 4.
 .SH DEPENDENCIES
 .B grohtml
 is dependent upon the png utilities
-.RB ( \&\%pnmcut ,\  \%pnmcrop ,\  \%pnmtopng )
+.RB ( \%pnmcut ,
+.BR \%pnmcrop ,
+.BR \%pnmtopng )
 and GhostScript
 .RB ( gs ).
 .B \%pnmtopng
diff --git a/src/preproc/grn/grn.man b/src/preproc/grn/grn.man
index b9bf60a3..eb4ba570 100644
--- a/src/preproc/grn/grn.man
+++ b/src/preproc/grn/grn.man
@@ -1,6 +1,6 @@
 '\" t
 .ig
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 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
@@ -262,7 +262,10 @@ point size.
 Scale text to match the picture.
 Gremlin text is usually printed in the point size specified with the
 commands
-.BR 1 ,\  2 ,\  3 ,\ or\  4
+.BR 1 ,
+.BR 2 ,
+.BR 3 ,
+.RB or\~ 4 ,
 regardless of any scaling factors in the picture.
 Setting
 .B pointscale
diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.man
index d46f3b32..6a20c199 100644
--- a/src/preproc/pic/pic.man
+++ b/src/preproc/pic/pic.man
@@ -834,7 +834,7 @@ Three additional modifiers are available to specify colored objects:
 sets the color of the outline,
 .B shaded
 the fill color, and
-.BR colo [ u ] r [ ed ]
+.B colo\fR[\fPu\fR]\fPr\fR[\fPed\fR]
 sets both.
 All three keywords expect a suffix specifying the color, for example
 .RS
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 6b75be20..1fd7866f 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004
 .\"   Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -456,14 +456,15 @@
 .
 .de1 RI
 .  if \\n[.$] \{\
-.    ds an-result \&\\$1
+.    ds an-result \&\f[R]\\$1
 .    shift
 .    while (\\n[.$] >= 2) \{\
 .      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \,\f[I]\\$1\f[R]
+.    if \\n[.$] .as an-result \,\f[I]\\$1
 \\*[an-result]
+.    ft R
 .  \}
 ..
 .
@@ -477,6 +478,7 @@
 .    \}
 .    if \\n[.$] .as an-result \/\\$1
 \\*[an-result]
+.    ft R
 .  \}
 ..
 .
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index 5886e4f8..8e153b8f 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1999-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1999-2000, 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
@@ -183,7 +183,7 @@ which will be loaded immediately after the
 package.
 .
 .TP
-.BI .TH " title section " [ extra1 "] [" extra2 "] [" extra3 ]
+.BI .TH " title section \fB[\fPextra1\fB]\fP \fB[\fPextra2\fB]\fP \fB[\fPextra3\fB]"
 Set the title of the man page to
 .I title
 and the section to
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index 8d62e8de..39dd43e6 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -361,7 +361,7 @@ The
 macros provide a variety of methods to highlight
 or emphasize text:
 .TP
-.BI "\&.B [" txt " [" post " [" pre ]]]
+.B "\&.B [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
 Sets its first argument in
 .BR "bold type" .
 If you specify a second argument,
@@ -389,27 +389,27 @@ If you give this macro no arguments,
 prints all text following in bold until
 the next highlighting, paragraph, or heading macro.
 .TP
-.BI "\&.R [" txt " [" post " [" pre ]]]
+.B "\&.R [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
 Sets its first argument in
 roman (or regular) type.
 It operates similarly to the
 .B B
 macro otherwise.
 .TP
-.BI "\&.I [" txt " [" post " [" pre ]]]
+.B "\&.I [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
 Sets its first argument in
 .IR "italic type" .
 It operates similarly to the
 .B B
 macro otherwise.
 .TP
-.BI "\&.CW [" txt " [" post " [" pre ]]]
+.B "\&.CW [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
 Sets its first argument in a constant width face.
 It operates similarly to the
 .B B
 macro otherwise.
 .TP
-.BI "\&.BI [" txt " [" post " [" pre ]]]
+.B "\&.BI [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
 Sets its first argument in bold italic type.
 It operates similarly to the
 .B B
@@ -758,7 +758,7 @@ This is more flexible than defining the individual strings.
 The syntax for these macros is as follows:
 .RS
 .IP
-.BI "\&.OH '" left ' center ' right '
+.B "\&.OH '\fIleft\fP'\fIcenter\fP'\fIright\fP'"
 .RE
 .IP
 You can replace the quote (') marks with any character not