* 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.

3 files changed, 13 insertions, 11 deletions

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