Apply italic corrections

Partly based on suggestions from Bjarni Ingi Gislason in Debian
bug #892421, although I had to take a slightly different approach to
avoid confusing po4a.

* man/man1/apropos.man1 (OPTIONS): Apply italic corrections to
descriptions of --sections and --systems.  Simplify three-font handling
for --systems.
* man/man1/man.man1 (Finding manual pages): Likewise.
* man/man1/whatis.man1 (OPTIONS): Likewise.
* man/man1/manpath.man1 (OPTIONS): Apply italic corrections to
description of --systems, and simplify three-font handling.

4 files changed, 21 insertions, 63 deletions

diff --git a/man/man1/apropos.man1 b/man/man1/apropos.man1
index 84a2f24b..1f882c74 100644
--- a/man/man1/apropos.man1
+++ b/man/man1/apropos.man1
@@ -101,7 +101,9 @@ results from poorly-written
 .B NAME
 sections.
 .TP
-\fB\-s\fP \fIlist\fP, \fB\-\-sections\fP \fIlist\fP, \fB\-\-section\fP \fIlist\fP
+\fB\-s\fR \fIlist\/\fR, \
+\fB\-\-sections=\fIlist\/\fR, \
+\fB\-\-section=\fIlist\fR
 Search only the given manual sections.
 .I list
 is a colon- or comma-separated list of sections.
@@ -113,20 +115,9 @@ while if an entry in
 .I list
 has an extension, for example "3perl", then the list will only include
 pages in that exact part of the manual section.
-.\"
-.\" Due to the rather silly limit of 6 args per request in some `native'
-.\" *roff compilers, we have do the following to get the two-line
-.\" hanging tag on one line. .PP to begin a new paragraph, then the
-.\" tag, then .RS (start relative indent), the text, finally .RE
-.\" (end relative indent).
-.\"
-.PP
-.B \-m
-.I system\c
-\|[\|,.\|.\|.\|]\|,
-.BI \-\-systems= system\c
-\|[\|,.\|.\|.\|]
-.RS
+.TP
+\fB\-m\fR \fIsystem\fR\|[\|,.\|.\|.\|]\|, \
+\fB\-\-systems=\fIsystem\fR\|[\|,.\|.\|.\|]
 If this system has access to other operating system's manual page
 descriptions, they can be searched using this option.
 To search NewOS's manual page descriptions, use the option
@@ -144,7 +135,6 @@ in the argument string.
 This option will override the
 .RB $ SYSTEM
 environment variable.
-.RE
 .TP
 .BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate set of colon-delimited manual page hierarchies to
diff --git a/man/man1/man.man1 b/man/man1/man.man1
index 74eb1172..32f781c2 100644
--- a/man/man1/man.man1
+++ b/man/man1/man.man1
@@ -688,20 +688,9 @@ Note that it will not take effect until the search for pages actually
 begins.
 Output such as the help message will always be displayed in the initially
 determined locale.
-.\"
-.\" Due to the rather silly limit of 6 args per request in some `native'
-.\" *roff compilers, we have do the following to get the two-line
-.\" hanging tag on one line. .PP to begin a new paragraph, then the
-.\" tag, then .RS (start relative indent), the text, finally .RE
-.\" (end relative indent).
-.\"
-.PP
-.B \-m
-.I system\c
-\|[\|,.\|.\|.\|]\|,
-.BI \-\-systems= system\c
-\|[\|,.\|.\|.\|]
-.RS
+.TP
+\fB\-m\fR \fIsystem\fR\|[\|,.\|.\|.\|]\|, \
+\fB\-\-systems=\fIsystem\fR\|[\|,.\|.\|.\|]
 If this system has access to other operating system's manual pages, they can
 be accessed using this option.
 To search for a manual page from NewOS's manual page collection,
@@ -719,7 +708,6 @@ in the argument string.
 This option will override the
 .RB $ SYSTEM
 environment variable.
-.RE
 .TP
 .BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate manpath to use.
@@ -741,7 +729,9 @@ To view manual pages outside such hierarchies, see the
 .B \-l
 option.
 .TP
-.BI \-S\  list \fR,\ \fB\-s\  list \fR,\ \fB\-\-sections= list
+\fB\-S\fR \fIlist\/\fR, \
+\fB\-s\fR \fIlist\/\fR, \
+\fB\-\-sections=\fIlist\/\fR
 List is a colon- or comma-separated list of `order specific' manual sections
 to search.
 This option overrides the
diff --git a/man/man1/manpath.man1 b/man/man1/manpath.man1
index e04fc8ea..625b1976 100644
--- a/man/man1/manpath.man1
+++ b/man/man1/manpath.man1
@@ -50,20 +50,9 @@ each path element is converted to its relative catpath.
 .if !'po4a'hide' .BR \-g ", " \-\-global
 Produce a manpath consisting of all paths named as `global' within the
 man-db configuration file.
-.\"
-.\" Due to the rather silly limit of 6 args per request in some `native'
-.\" *roff compilers, we have do the following to get the two-line
-.\" hanging tag on one line. .PP to begin a new paragraph, then the
-.\" tag, then .RS (start relative indent), the text, finally .RE
-.\" (end relative indent).
-.\"
-.PP
-.B \-m
-.I system\c
-\|[\|,.\|.\|.\|]\|,
-.BI \-\-systems= system\c
-\|[\|,.\|.\|.\|]
-.RS
+.TP
+\fB\-m\fR \fIsystem\fR\|[\|,.\|.\|.\|]\|, \
+\fB\-\-systems=\fIsystem\fR\|[\|,.\|.\|.\|]
 If this system has access to other operating system's manual hierarchies,
 this option can be used to include them in the output of
 .BR %manpath% .
@@ -81,7 +70,6 @@ must be included in the argument string.
 This option will override the
 .RB $ SYSTEM
 environment variable.
-.RE
 .TP
 .BI \-C\  file \fR,\ \fB\-\-config\-file= file
 Use this user configuration file rather than the default of
diff --git a/man/man1/whatis.man1 b/man/man1/whatis.man1
index 079b2819..fab02a26 100644
--- a/man/man1/whatis.man1
+++ b/man/man1/whatis.man1
@@ -105,7 +105,9 @@ results from poorly-written
 .B NAME
 sections.
 .TP
-\fB\-s\fP \fIlist\fP, \fB\-\-sections\fP \fIlist\fP, \fB\-\-section\fP \fIlist\fP
+\fB\-s\fR \fIlist\/\fR, \
+\fB\-\-sections=\fIlist\/\fR, \
+\fB\-\-section=\fIlist\fR
 Search only the given manual sections.
 .I list
 is a colon- or comma-separated list of sections.
@@ -117,20 +119,9 @@ while if an entry in
 .I list
 has an extension, for example "3perl", then the list will only include
 pages in that exact part of the manual section.
-.\"
-.\" Due to the rather silly limit of 6 args per request in some `native'
-.\" *roff compilers, we have do the following to get the two-line
-.\" hanging tag on one line. .PP to begin a new paragraph, then the
-.\" tag, then .RS (start relative indent), the text, finally .RE
-.\" (end relative indent).
-.\"
-.PP
-.B \-m
-.I system\c
-\|[\|,.\|.\|.\|]\|,
-.BI \-\-systems= system\c
-\|[\|,.\|.\|.\|]
-.RS
+.TP
+\fB\-m\fR \fIsystem\fR\|[\|,.\|.\|.\|]\|, \
+\fB\-\-systems=\fIsystem\fR\|[\|,.\|.\|.\|]
 If this system has access to other operating system's manual page names,
 they can be accessed using this option.
 To search NewOS's manual page names,
@@ -148,7 +139,6 @@ in the argument string.
 This option will override the
 .RB $ SYSTEM
 environment variable.
-.RE
 .TP
 .BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate set of colon-delimited manual page hierarchies to