groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 03/09: man pages: Set filespecs in italics, not bold.


From: G. Branden Robinson
Subject: [groff] 03/09: man pages: Set filespecs in italics, not bold.
Date: Fri, 14 Dec 2018 10:46:58 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 5874e7593689adf67e8f6ea5a53a4e51fa58a2e9
Author: G. Branden Robinson <address@hidden>
Date:   Fri Dec 14 09:41:42 2018 -0500

    man pages: Set filespecs in italics, not bold.
    
    contrib/pdfmark/pdfroff.1.man:
    man/groff.7.man:
    man/groff_diff.7.man:
    man/groff_font.5.man:
    man/groff_out.5.man:
    man/groff_tmac.5.man:
    src/devices/grodvi/grodvi.1.man:
    src/devices/grolbp/grolbp.1.man:
    src/devices/grolj4/grolj4.1.man:
    src/devices/gropdf/gropdf.1.man:
    src/devices/grops/grops.1.man:
    src/devices/grotty/grotty.1.man:
    src/devices/xditview/gxditview.1.man:
    src/preproc/eqn/eqn.1.man:
    src/preproc/grn/grn.1.man:
    src/preproc/pic/pic.1.man:
    src/preproc/refer/refer.1.man:
    src/roff/groff/groff.1.man:
    src/roff/troff/troff.1.man:
    src/utils/indxbib/indxbib.1.man:
    src/utils/tfmtodit/tfmtodit.1.man:
    tmac/groff_ms.7.man:
    tmac/groff_www.7.man:
    + As above.
    
    contrib/pdfmark/pdfroff.1.man:
    man/groff_font.5.man:
    man/groff_out.5.man:
    man/groff_tmac.5.man:
    src/devices/grodvi/grodvi.1.man:
    src/devices/grohtml/grohtml.1.man:
    src/devices/grolbp/grolbp.1.man:
    src/devices/grolj4/grolj4.1.man:
    src/devices/gropdf/gropdf.1.man:
    src/devices/grops/grops.1.man:
    src/devices/grotty/grotty.1.man:
    src/devices/xditview/gxditview.1.man:
    src/preproc/grn/grn.1.man:
    src/preproc/refer/refer.1.man:
    src/roff/groff/groff.1.man:
    src/roff/troff/troff.1.man:
    src/utils/indxbib/indxbib.1.man:
    src/utils/tfmtodit/tfmtodit.1.man:
    + Set variable parts of filespecs in roman in filespec context but in
      italics when isolated in running prose; see groff_man(7).
    
    contrib/pdfmark/pdfroff.1.man:
    + Set shell variable expansions within filespecs in roman.
    + Stop suppressing hyphenation before macro-expanded filespecs.  Since
      commit ea32b7d0462813fc3e7c423efb6d805273df9edd, we get free
      discretionary breaks after slashes in macro-expanded filespec
      components anyway.  So with any luck, even in the unlikely case a
      filespec paragraph tag has to be broken, it won't be done in an
      eye-watering place using a hyphen.
    
    man/groff_out.5.man:
    + Remove pseudo-prefix from src/libs/libdriver/input.cpp.  The
      subsequent paragraph already describes it as being relative to the top
      of the groff source tree.  I think this is an abuse of the Files
      section (and this is section 5--files don't open files), but doing
      something about that is out of scope for this changeset.
    
    man/groff_tmac.5.man:
    + Use font macros rather than font escapes; also eliminates use of
      italic-correction escapes.
    
    src/devices/gropdf/gropdf.1.man:
    src/devices/grops/grops.1.man:
    + Don't quote filespecs on top of or instead of italicizing them.
    
    src/devices/grotty/grotty.1.man:
    + Delete word "kludgy" from the description of the alternate character
      definitions in tty-char.tmac; Ingo Schwarze has spent some effort
      improving them.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 contrib/pdfmark/pdfroff.1.man        | 40 +++++++--------
 man/groff.7.man                      |  2 +-
 man/groff_diff.7.man                 |  4 +-
 man/groff_font.5.man                 | 32 +++++++-----
 man/groff_out.5.man                  |  6 +--
 man/groff_tmac.5.man                 | 99 ++++++++++++++++++------------------
 src/devices/grodvi/grodvi.1.man      | 24 ++++-----
 src/devices/grohtml/grohtml.1.man    |  4 +-
 src/devices/grolbp/grolbp.1.man      | 28 +++++-----
 src/devices/grolj4/grolj4.1.man      | 10 ++--
 src/devices/gropdf/gropdf.1.man      | 53 +++++++++++--------
 src/devices/grops/grops.1.man        | 72 +++++++++++++++-----------
 src/devices/grotty/grotty.1.man      | 44 ++++++++--------
 src/devices/xditview/gxditview.1.man | 18 ++++---
 src/preproc/eqn/eqn.1.man            | 20 ++++----
 src/preproc/grn/grn.1.man            | 18 +++----
 src/preproc/pic/pic.1.man            |  8 +--
 src/preproc/refer/refer.1.man        |  4 +-
 src/roff/groff/groff.1.man           | 28 +++++-----
 src/roff/troff/troff.1.man           | 49 +++++++++---------
 src/utils/indxbib/indxbib.1.man      | 16 +++---
 src/utils/tfmtodit/tfmtodit.1.man    | 12 ++---
 tmac/groff_ms.7.man                  |  9 ++--
 tmac/groff_www.7.man                 |  5 +-
 24 files changed, 319 insertions(+), 286 deletions(-)

diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.man
index b5fc5aa..1f4587f 100644
--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
@@ -140,7 +140,7 @@ macro package, should the user choose to employ it.
 Specifically, if the
 .I pdfhref
 macro, defined in the
-.B pdfmark.tmac
+.I pdfmark.tmac
 package, is used to define public reference marks, or dynamic links to
 such reference marks, then
 .B pdfroff
@@ -649,14 +649,13 @@ Input and output files for
 may be named according to any convention of the user's choice.
 Typically, input files may be named according to the choice of the
 principal formatting macro package, e.g.,
-.IB file .ms
+.RI file .ms
 might be an input file for formatting using the
 .B ms
 macros
-.RB ( s.tmac );
+.RI ( s.tmac );
 normally, the final output file should be named
-.IB file .pdf\c
-\&.
+.RI file .pdf .
 .
 .
 .P
@@ -672,7 +671,7 @@ is available,
 it is invoked to create a private subdirectory of
 the nominated temporary files directory,
 (with subdirectory name derived from the template
-.BR pdfroff-XXXXXXXXXX );
+.IR pdfroff-XXXXXXXXXX );
 if this subdirectory is successfully created,
 the temporary files will be placed within it,
 otherwise they will be placed directly in the directory
@@ -680,8 +679,8 @@ nominated in the environment.
 .P
 All temporary files themselves
 are named according to the convention
-.BI pdf $$ .*\c
-\&, where
+.IR pdf $$ . *,
+where
 .I $$
 is the standard shell variable representing the process ID of the
 .B pdfroff
@@ -692,7 +691,7 @@ represents any of the extensions used by
 to identify the following temporary and intermediate files.
 .
 .TP
-.BI pdf $$ .tmp
+.IR pdf $$ .tmp
 A scratch pad file,
 used to capture reference data emitted by
 .BR groff ,
@@ -701,7 +700,7 @@ during the
 compilation phase.
 .
 .TP
-.BI pdf $$ .ref
+.IR pdf $$ .ref
 The
 .IR "reference dictionary" ,
 as compiled in the last but one pass of the
@@ -724,11 +723,10 @@ this intermediate file becomes permanent,
 and is named
 .IR name ,
 rather than
-.BI pdf $$ .ref\c
-\&.
+.IR pdf $$ .ref .
 .
 .TP
-.BI pdf $$ .cmp
+.IR pdf $$ .cmp
 Used to collect
 .I reference dictionary
 entries during the active pass of the
@@ -737,10 +735,9 @@ compilation phase.
 .
 At the end of any pass,
 when the content of
-.BI pdf $$ .cmp
+.IR pdf $$ .cmp
 compares as identical to
-.BI pdf $$ .ref\c
-\&,
+.IR pdf $$ .ref ,
 (or the corresponding file named by the
 .BR \%\-\-reference\-dictionary =\c
 .I name
@@ -754,7 +751,7 @@ is appended to this intermediate file,
 for inclusion in the final formatting passes.
 .
 .TP
-.BI pdf $$ .tc
+.IR pdf $$ .tc
 An intermediate
 .I PostScript
 file,
@@ -765,7 +762,7 @@ on ultimate output to the
 postprocessor.
 .
 .TP
-.BI pdf $$ .ps
+.IR pdf $$ .ps
 An intermediate
 .I PostScript
 file,
@@ -774,8 +771,7 @@ in which the body text is collected prior to ultimate 
output to the
 postprocessor,
 in the proper sequence,
 .I after
-.BI pdf $$ .tc\c
-\&.
+.IR pdf $$ .tc .
 .
 .
 .\" ====================================================================
@@ -820,7 +816,7 @@ the use of any specific
 .B groff
 macro package, a number of supplied macro packages,
 and in particular those associated with the package
-.BR pdfmark.tmac ,
+.IR pdfmark.tmac ,
 are best suited for use with
 .B pdfroff
 as the preferred formatter.
@@ -829,7 +825,7 @@ Detailed documentation on the use of these packages may be 
found,
 in PDF format, in the reference guide
 .BR "\*(lqPortable Document Format Publishing with GNU Troff\*(rq" ,
 included in the installed documentation set as
-.BR address@hidden@/pdfmark.pdf .
+.IR @PDFDOCDIR@/pdfmark.pdf .
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/man/groff.7.man b/man/groff.7.man
index c21b1a2..a30755b 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -2326,7 +2326,7 @@ positions.
 Set available font sizes similar to the
 .B sizes
 command in a
-.B DESC
+.I DESC
 file.
 .
 .TPx
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 5d93684..39d1747 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -165,7 +165,7 @@ is equal to
 points, where
 .B sizescale
 is specified in the
-.B DESC
+.I DESC
 file (1 by default).
 .
 There is a new scale indicator\~\c
@@ -2107,7 +2107,7 @@ Shifting by negative amounts is currently undefined.
 This command is similar to the
 .B sizes
 command of a
-.B DESC
+.I DESC
 file.
 .
 It sets the available font sizes for the current font to
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 06a8017..cb3bbf0 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -37,15 +37,14 @@ font format.
 The font files for device
 .I name
 are stored in a directory
-.BI dev name\/\c
-\&.
+.IR dev name.
 .
-There are two types of file: a device description file called
-.B DESC
-and for each font\~\c
-.I F
-a font file called\~\c
-.IR F .
+There are two types of file:
+a device description file called
+.I DESC
+and for each
+.RI font \~F ,
+a font file called\~F.
 .
 These are text files;
 unlike the ditroff font format,
@@ -56,7 +55,9 @@ there is no associated binary format.
 .SS DESC file format
 .\" ====================================================================
 .
-The DESC file can contain the following types of line as shown below.
+The
+.I DESC
+file can contain the following types of line as shown below.
 .
 Later entries in the file override previous values.
 .
@@ -141,8 +142,9 @@ if it holds predefined paper types.
 .
 Alternatively,
 .I string
-can be a file name (e.g.\& \[oq]/etc/papersize\[cq]); if the file can
-be opened,
+can be a file name (e.g.\&
+.IR /etc/papersize );
+if the file can be opened,
 .B groff
 reads the first line and tests for the above paper sizes.
 .
@@ -346,7 +348,9 @@ and
 .B sizes
 lines are compulsory.
 .
-Not all commands in the DESC file are used by
+Not all commands in the
+.I DESC
+file are used by
 .B troff
 itself; some of the keywords (or even additional ones) are used by
 postprocessors to store arbitrary information about the device.
@@ -663,12 +667,12 @@ Most entries in kernpairs section have a negative value 
for\~\c
 .\" ====================================================================
 .
 .TP
-.BI @FONTDIR@/dev name /DESC
+.IR @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
 .
 .TP
-.BI @FONTDIR@/dev name / F
+.IR @FONTDIR@/dev name / F
 Font file for font\~\c
 .I F
 of device
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 4f0efaf..6f1bd18 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -1824,12 +1824,12 @@ are documented in
 .\" ====================================================================
 .
 .TP
-.BI @FONTDIR@/dev name /DESC
+.IR @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
 .
 .TP
-.IB \[la]groff-source-dir\[ra] /src/libs/libdriver/input.cpp
+.I src/libs/libdriver/input.cpp
 Defines the parser and postprocessor for the
 .I intermediate
 .IR output .
@@ -1904,7 +1904,7 @@ language such as numerical units and escape sequences.
 .TP
 .BR groff_font (@MAN5EXT@)
 for details on the device scaling parameters of the
-.B DESC
+.I DESC
 file.
 .
 .
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 29b25b6..d70ed3d 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -96,7 +96,7 @@ or the
 .B man
 macro package.
 See below the description of the
-.B andoc.tmac
+.I andoc.tmac
 file.
 .
 .
@@ -105,16 +105,16 @@ file.
 .\" ====================================================================
 .
 .TP
-.B man
+.I man
 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
+.I doc
 .TQ
-.B mdoc
+.I mdoc
 An alternative macro package for man\~pages mainly used in BSD
 systems; it provides many new features, but it is not the standard for
 man\~pages; see
@@ -122,9 +122,9 @@ man\~pages; see
 .
 .
 .TP
-.B andoc
+.I andoc
 .TQ
-.B mandoc
+.I mandoc
 Use this file in case you don't know whether the
 .B man
 macros or the
@@ -145,7 +145,7 @@ to use.
 .
 .
 .TP
-.B me
+.I me
 The classical
 .I me
 macro package; see
@@ -153,7 +153,7 @@ macro package; see
 .
 .
 .TP
-.B mm
+.I mm
 The semi-classical
 .I mm
 macro package; see
@@ -161,7 +161,7 @@ macro package; see
 .
 .
 .TP
-.B mom
+.I mom
 The new
 .I mom
 macro package, only available in groff.
@@ -175,7 +175,7 @@ See
 .
 .
 .TP
-.B ms
+.I ms
 The classical
 .I ms
 macro package; see
@@ -187,27 +187,27 @@ macro package; see
 .\" ====================================================================
 .
 .TP
-.B cs
+.I cs
 This file adds support for Czech localization, including the main macro
 packages (me, mom, mm, and ms).
 .
 .IP
 Note that
-.B cs.tmac
+.I cs.tmac
 sets the input encoding to latin-2.
 .
 .
 .TP
-.B de
+.I de
 .TQ
-.B den
+.I den
 German localization support, including the main macro packages (me, mom,
 mm, and ms).
 .
 .IP
-.B de.tmac
+.I de.tmac
 selects hyphenation patterns for traditional orthography, and
-.B den.tmac
+.I den.tmac
 does the same for the new orthography
 (\[oq]Recht\%schreib\%reform\[cq]).
 .
@@ -215,7 +215,7 @@ It should be used as the last macro package on the command 
line.
 .
 .
 .TP
-.B fr
+.I fr
 This file adds support for French localization, including the main macro
 packages (me, mom, mm, and ms).
 .
@@ -230,13 +230,13 @@ Example:
 .
 .IP
 Note that
-.B fr.tmac
+.I fr.tmac
 sets the input encoding to latin-9 to get proper support of the
 \[oq]oe\[cq] ligature.
 .
 .
 .TP
-.B sv
+.I sv
 Swedish localization support, including the me, mom, and ms macro
 packages.
 .
@@ -252,13 +252,13 @@ It should be used as the last macro package on the 
command line.
 .
 .
 .TP
-.B latin1
+.I latin1
 .TQ
-.B latin2
+.I latin2
 .TQ
-.B latin5
+.I latin5
 .TQ
-.B latin9
+.I latin9
 Various input encodings supported directly by groff.
 .
 Normally, this macro is loaded at the very beginning of a document or
@@ -271,7 +271,7 @@ Note that these macro packages don't work on EBCDIC hosts.
 .
 .
 .TP
-.B cp1047
+.I cp1047
 Encoding support for EBCDIC.
 .
 On those platforms it is loaded automatically at start-up.
@@ -313,13 +313,13 @@ macro package or to plain groff.
 .
 .
 .TP
-.B 62bit
+.I 62bit
 Provides macros for addition, multiplication, and division of 62-bit
 integers (allowing safe multiplication of 31-bit integers, for example).
 .
 .
 .TP
-.B ec
+.I ec
 Switch to the EC and TC font families.
 .
 To be used with
@@ -328,17 +328,17 @@ To be used with
 .
 .
 .TP
-.B hdtbl
+.I hdtbl
 The Heidelberger table macros, contributed by Joachim Walsdorff, allow
 the generation of tables through a syntax similar to the HTML table
 model.
 .
 Note that
-.B hdtbl
+.I hdtbl
 is a macro package, not a preprocessor like
 .BR tbl (@MAN1EXT@).
 .
-.B hdtbl
+.I hdtbl
 works only with the
 .B \-Tps
 and
@@ -350,7 +350,7 @@ See
 .
 .
 .TP
-.B papersize
+.I papersize
 This macro file is already loaded at start-up by
 .B @address@hidden
 so it isn't necessary to call it explicitly.
@@ -394,20 +394,20 @@ orientation:
 .
 .
 .TP
-.B pdfpic
+.I pdfpic
 A single macro is provided in this file,
 .BR PSPIC ,
 to include a PDF graphic in a document, i.e., under the output device
 .BR \-Tpdf .
 .
 For all other devices,
-.B pspic
+.I pspic
 is used.
 .
 So
-.B pdfpic
+.I pdfpic
 is an extension of
-.B pspic.
+.IR pspic .
 .
 By that you can now even replace all
 .B PSPIC
@@ -423,7 +423,7 @@ options.
 .
 .
 .TP
-.B pic
+.I pic
 This file provides proper definitions for the macros
 .B PS
 and
@@ -439,7 +439,7 @@ definitions for those two macros (actually, most of them 
already do).
 .
 .
 .TP
-.B pspic
+.I pspic
 A single macro is provided in this file,
 .BR PSPIC ,
 to include a PostScript graphic in a document.
@@ -540,7 +540,7 @@ image's width.
 .
 .
 .TP
-.B ptx
+.I ptx
 A single macro is provided in this file,
 .BR xx ,
 for formatting permuted index entries as produced by the GNU
@@ -552,7 +552,7 @@ your document and adapt it to your needs.
 .
 .
 .TP
-.B trace
+.I trace
 Use this for tracing macro calls.
 .
 It is only useful for debugging.
@@ -562,7 +562,7 @@ See
 .
 .
 .TP
-.B tty-char
+.I tty-char
 Overrides the definition of standard troff characters and some groff
 characters for TTY devices.
 .
@@ -571,7 +571,7 @@ normal TTY formatting to allow processing with critical 
equipment.
 .
 .
 .TP
-.B www
+.I www
 Additions of elements known from the HTML format, as used in the
 internet (World Wide Web) pages; this includes URL links and mail
 addresses; see
@@ -672,7 +672,8 @@ would not make much sense.
 .
 .P
 A second strange feature of classical troff was to name macro files
-in the form \f[B]tmac.\f[]\,\f[I]name\f[].
+in the form
+.IR tmac. name.
 In modern operating systems, the type of a file is specified as a
 postfix, the file name extension.
 .
@@ -716,9 +717,9 @@ at run-time; this makes the contents of the macro package
 available.
 .
 In groff, the file
-.IB name .tmac
+.RI name .tmac
 is searched within the tmac path; if not found,
-.BI tmac. name
+.IR tmac. name
 is searched for instead.
 .
 .
@@ -805,7 +806,7 @@ to invoke
 .
 .P
 If you want to write your own groff macro file, call it
-.IB whatever .tmac
+.RI whatever .tmac
 and put it in a directory in the tmac path;
 see section \[lq]Files\[rq] below.
 .
@@ -1176,10 +1177,10 @@ the diversion and can be manipulated from within the 
macros.
 .\" ====================================================================
 .
 All macro package files must be named
-.IB name .tmac
+.RI name .tmac
 to fully use the tmac mechanism.
 .
-.BI tmac. name
+.IR tmac. name
 as with classical packages is possible as well, but deprecated.
 .
 .
@@ -1216,7 +1217,7 @@ a platform-specific directory, being
 .
 .RS
 .IP
-.B @SYSTEMMACRODIR@
+.I @SYSTEMMACRODIR@
 .RE
 .
 .IP
@@ -1227,7 +1228,7 @@ a site-specific (platform-independent) directory, being
 .
 .RS
 .IP
-.B @LOCALMACRODIR@
+.I @LOCALMACRODIR@
 .RE
 .
 .IP
@@ -1238,7 +1239,7 @@ the main tmac directory, being
 .
 .RS
 .IP
-.B @MACRODIR@
+.I @MACRODIR@
 .RE
 .
 .IP
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.1.man
index 4c07ce2..843a1f9 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -77,7 +77,7 @@ Normally it should be run by
 This will run
 .BR @address@hidden \-Tdvi ;
 it will also input the macros in
-.BR @MACRODIR@/\:dvi.tmac .
+.IR @MACRODIR@/\:dvi.tmac .
 .
 .LP
 The DVI file generated by
@@ -122,7 +122,7 @@ may not contain a newline.
 For inclusion of EPS image files,
 .B \-Tdvi
 loads
-.B pspic.tmac
+.I pspic.tmac
 automatically, providing the
 .B PSPIC
 macro.
@@ -143,7 +143,7 @@ additional commands:
 .TP
 .BI internalname\   name
 The name of the tfm file (without the
-.B .tfm
+.I .tfm
 extension) is
 .IR name .
 .
@@ -215,7 +215,7 @@ Other drawing commands will be ignored.
 .TP
 .BI \-F dir
 Prepend directory
-.IB dir /dev name
+.RI dir /dev name
 to the search path for font and device description files;
 .I name
 is the name of the device, usually
@@ -235,7 +235,7 @@ This overrides the
 and
 .B paperwidth
 commands in the
-.B DESC
+.I DESC
 file; it accepts the same arguments as the
 .B papersize
 command (see
@@ -377,14 +377,14 @@ These two fonts are not mounted by default.
 Using the option
 .B \-mec
 (which loads the file
-.BR ec.tmac )
+.IR ec.tmac )
 provides the EC and TC fonts.
 .
 The design of the EC family is very similar to that of the CM fonts;
 additionally, they give a much better coverage of groff symbols.
 .
 Note that
-.B ec.tmac
+.I ec.tmac
 must be called before any language-specific files; it doesn't take
 care of hcode values.
 .
@@ -396,7 +396,7 @@ care of hcode values.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -411,21 +411,21 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devdvi/DESC
+.I @FONTDIR@/devdvi/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devdvi/ F
+.IR @FONTDIR@/devdvi/ F
 Font description file for font
 .IR F .
 .
 .TP
-.B @MACRODIR@/dvi.tmac
+.I @MACRODIR@/dvi.tmac
 Macros for use with
 .BR grodvi .
 .
 .TP
-.B @MACRODIR@/ec.tmac
+.I @MACRODIR@/ec.tmac
 Macros to switch to EC fonts.
 .
 .
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 15828f2..a54ae98 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -182,7 +182,7 @@ is specified).
 .TP
 .BI \-F dir
 Prepend directory
-.IB dir /dev name
+.RI dir /dev name
 to the search path for font and device description files;
 .I name
 is the name of the device, usually
@@ -401,7 +401,7 @@ man page for details where such files are created.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index 684f6cc..bdd1c0f 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -130,7 +130,7 @@ copies of each page.
 .TQ
 .BI \-\-fontdir= font-directory
 Prepend directory
-.IB font-directory /dev name
+.RI font-directory /dev name
 to the search path for font and device description files;
 .I name
 is the name of the device, usually
@@ -225,12 +225,12 @@ Elite | ER | EB | EI |
 .\" ====================================================================
 .
 The paper size can be set in the
-.B DESC
+.I DESC
 file or with command-line options to
 .BR grolbp .
 If the paper size is specified both ways, the command-line options take
 precedence over the contents of the
-.B DESC
+.I DESC
 file (this applies to the page orientation too).
 .
 .
@@ -238,7 +238,7 @@ file (this applies to the page orientation too).
 See
 .BR groff_font (@MAN5EXT@)
 how to set the paper dimensions in the
-.B DESC
+.I DESC
 file.
 .
 .
@@ -260,13 +260,13 @@ to the other
 options, where
 .I paper-size
 is in the same format as in the
-.B DESC
+.I DESC
 file.
 .
 .
 .PP
 If no paper size is specified in the
-.B DESC
+.I DESC
 file or the command line, a default size of A4 is used.
 .
 .
@@ -279,7 +279,7 @@ As with the page size, the orientation of the printed page
 or
 .BR landscape )
 can be set in the
-.B DESC
+.I DESC
 file or with command-line options.
 .
 It is also case insensitive.
@@ -287,7 +287,7 @@ It is also case insensitive.
 .
 .PP
 To set the orientation in the
-.B DESC
+.I DESC
 file, insert a line with the following content:
 .sp 1
 .in +2m
@@ -297,7 +297,7 @@ file, insert a line with the following content:
 .sp 1
 .
 Only the first valid orientation command in the
-.B DESC
+.I DESC
 file is used.
 .
 .
@@ -311,7 +311,7 @@ option with the same parameters
 or
 .BR landscape )
 as in the
-.B DESC
+.I DESC
 file.
 Or you can use the
 .B \-l
@@ -405,7 +405,7 @@ is case sensitive.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -420,16 +420,16 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devlbp/DESC
+.I @FONTDIR@/devlbp/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devlbp/ F
+.IR @FONTDIR@/devlbp/ F
 Font description file for font
 .IR F .
 .
 .TP
-.B @MACRODIR@/lbp.tmac
+.I @MACRODIR@/lbp.tmac
 Macros for use with
 .BR grolbp .
 .
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index 87fcbea..079f9c0 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -136,7 +136,7 @@ If this option isn't specified, the line thickness defaults 
to
 .TP
 .BI \-F " font-directory"
 Prepend directory
-.IB font-directory /dev name
+.IR font-directory /dev name
 to the search path for font and device description files;
 .I name
 is the name of the device, usually
@@ -181,7 +181,7 @@ must be in the range 0 to 65535; default is\~0.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -196,16 +196,16 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devlj4/DESC
+.I @FONTDIR@/devlj4/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devlj4/ F
+.IR @FONTDIR@/devlj4/ F
 Font description file for font
 .IR F .
 .
 .TP
-.B @MACRODIR@/lj4.tmac
+.I @MACRODIR@/lj4.tmac
 Macros for use with
 .BR grolj4 .
 .
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index eb7458c..8b6e959 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -130,7 +130,7 @@ fonts (even the 14 base PDF fonts).
 .TP
 .BI \-F " dir"
 Prepend directory
-.IB dir /dev name
+.IR dir /dev name
 to the search path for font, and device description files;
 .I name
 is the name of the device, usually
@@ -165,7 +165,7 @@ This overrides the
 and
 .B paperwidth
 commands in the
-.B DESC
+.I DESC
 file; it accepts the same arguments as the
 .B papersize
 command.
@@ -190,7 +190,7 @@ complains about this line if it is included, but works 
anyway.
 .RI " [" cmapfile ]
 .B Gropdf
 normally includes a ToUnicode CMap with any font created using
-.B text.enc
+.I text.enc
 as the encoding file,
 this makes it easier to search for words which contain ligatures.
 .
@@ -273,7 +273,7 @@ supports the concept of foundries, that is different 
versions of basically
 the same font.
 .
 During install a
-.B Foundry
+.I Foundry
 file controls where fonts are found and builds
 .B groff
 fonts from the files it discovers on your system.
@@ -338,7 +338,7 @@ Fonts may be in PFA or PFB format.
 Any downloadable fonts which should, when required, be included by
 .B gropdf
 must be listed in the file
-.BR @FONTDIR@/devpdf/download ;
+.IR @FONTDIR@/devpdf/download ;
 this should consist of lines of the form
 .
 .IP
@@ -367,7 +367,7 @@ is searched for using the same mechanism that is used
 for groff font metric files.
 .
 The
-.B download
+.I download
 file itself is also searched for using this mechanism;
 currently, only the first found file in the font path is used.
 .
@@ -695,7 +695,8 @@ macros installed by using
 .I \-m pdfmark
 or
 .I \-m mspdf
-(see documentation in \[oq]pdfmark.pdf\[cq]).
+(see documentation in
+.IR pdfmark.pdf ).
 .
 A subset of these macros are installed automatically when you use
 .B \-Tpdf
@@ -1216,19 +1217,24 @@ store them anyway).
 .
 .LI
 Register all fonts which must be downloaded to the printer in the
-\[oq]devpdf/download\[cq] file.
+.I devpdf/download
+file.
 .
 Only the first occurrence of this file in the font path is read.
 .
-This means that you should copy the default \[oq]download\[cq] file to
-the first directory in your font path and add your fonts there.
+This means that you should copy the default
+.I download
+file to the first directory in your font path and add your fonts there.
 .
 To continue the above example we assume that the PS font name for
 Foo\-Bar\-Bold.pfa is \[oq]XY\-Foo\-Bar\-Bold\[cq] (the PS font name is
 stored in the
 .B internalname
-field in the \[oq]FBB\[cq] file) and belongs to foundry \[oq]F\[cq]
-thus the following line should be added to \[oq]download\[cq]:
+field in the
+.I FBB
+file) and belongs to foundry \[oq]F\[cq]
+thus the following line should be added to
+.IR download :
 .
 .RS
 .IP
@@ -1248,11 +1254,14 @@ field should be null for the default foundry.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
-If, in the \[oq]download\[cq] file, the
-font file has been specified with a full path, no directories are searched.
+If, in the
+.I download
+file,
+the font file has been specified with a full path,
+no directories are searched.
 .
 See
 .BR @address@hidden (@MAN1EXT@)
@@ -1278,16 +1287,16 @@ creation timestamp in place of the current time.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devpdf/DESC
+.I @FONTDIR@/devpdf/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devpdf/ F
+.IR @FONTDIR@/devpdf/ F
 Font description file for font\~\c
 .IR F .
 .
 .TP
-.BI @FONTDIR@/devpdf/ U\-F
+.IR @FONTDIR@/devpdf/ U\-F
 Font description file for font\~\c
 .I F
 (using foundry\~\c
@@ -1295,19 +1304,19 @@ Font description file for font\~\c
 rather than the default foundry).
 .
 .TP
-.B @FONTDIR@/devpdf/download
+.I @FONTDIR@/devpdf/download
 List of downloadable fonts.
 .
 .TP
-.B @FONTDIR@/devpdf/Foundry
+.I @FONTDIR@/devpdf/Foundry
 A Perl script used during install to locate suitable fonts.
 .
 .TP
-.B @FONTDIR@/devpdf/enc/text.enc
+.I @FONTDIR@/devpdf/enc/text.enc
 Encoding used for text fonts.
 .
 .TP
-.B @MACRODIR@/pdf.tmac
+.I @MACRODIR@/pdf.tmac
 Macros for use with
 .BR gropdf ;
 automatically loaded by
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index 2d47da8..8d730ba 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -200,7 +200,9 @@ The default value can be specified by a
 .BI broken\  n
 .
 .LP
-command in the DESC file.
+command in the
+.I DESC
+file.
 .
 Otherwise the default value is\~0.
 .RE
@@ -214,7 +216,7 @@ copies of each page.
 .TP
 .BI \-F dir
 Prepend directory
-.IB dir /dev name
+.RI dir /dev name
 to the search path for prologue, font, and device description files;
 .I name
 is the name of the device, usually
@@ -272,7 +274,7 @@ This overrides the
 and
 .B paperwidth
 commands in the
-.B DESC
+.I DESC
 file; it accepts the same arguments as the
 .B papersize
 command.
@@ -415,7 +417,7 @@ to convert a Type\~1 font in PFB format.
 Any downloadable fonts which should, when required, be included by
 .B grops
 must be listed in the file
-.BR @FONTDIR@/devps/download ;
+.IR @FONTDIR@/devps/download ;
 this should consist of lines of the form
 .
 .IP
@@ -439,7 +441,7 @@ is searched for using the same mechanism that is used
 for groff font metric files.
 .
 The
-.B download
+.I download
 file itself is also searched for using this mechanism;
 currently, only the first found file in the font path is used.
 .
@@ -453,7 +455,7 @@ interprets any comments in the files sufficiently to ensure 
that its
 own output is conforming.
 .
 It also supplies any needed font resources that are listed in the
-.B download
+.I download
 file
 as well as any needed file resources.
 .
@@ -489,7 +491,7 @@ the following lines
 .LP
 In this case both Garamond and Garamond-Outline would need to be listed
 in the
-.B download
+.I download
 file.
 .
 A downloadable font should not include its own name in a
@@ -1196,7 +1198,7 @@ the
 script to create appropriate metric files.
 .
 The resulting font wrappers should be added to the
-.B download
+.I download
 file.
 .B ttftot42
 source code can be downloaded from
@@ -1260,7 +1262,8 @@ Old PS printers might not support it (this is, they don't 
have a
 built-in TrueType font interpreter).
 .
 .IP
-If your font is in PFB format (such fonts normally have \[oq].pfb\[cq]
+If your font is in PFB format (such fonts normally have
+.I .pfb
 as the file extension), you might use groff's
 .BR \%pfbtops (@MAN1EXT@)
 program to convert it to PFA.
@@ -1286,8 +1289,11 @@ afmtodit Foo-Bar-Bold.afm textmap FBB
 .RE
 .
 .IP
-which converts the metric file \[oq]Foo-Bar-Bold.afm\[cq] to the groff
-font \[oq]FBB\[cq].
+which converts the metric file
+.I Foo-Bar-Bold.afm
+to the groff
+font
+.IR FBB .
 .
 If you have a font family which comes with normal, bold, italic,
 and bold italic faces, it is recommended to use the letters
@@ -1311,7 +1317,8 @@ and
 .
 .LI
 Install both the groff font description files and the fonts in a
-\[oq]devps\[cq] subdirectory of the font path which groff finds.
+.I devps
+subdirectory of the font path which groff finds.
 .
 See section \[lq]Environment\[rq] in
 .BR troff (@MAN1EXT@)
@@ -1322,19 +1329,24 @@ to store them anyway).
 .
 .LI
 Register all fonts which must be downloaded to the printer in the
-\[oq]devps/download\[cq] file.
+.I devps/download
+file.
 .
 Only the first occurrence of this file in the font path is read.
 .
-This means that you should copy the default \[oq]download\[cq] file to
-the first directory in your font path and add your fonts there.
+This means that you should copy the default
+.I download
+file to the first directory in your font path and add your fonts there.
 .
 To continue the above example we assume that the PS font name for
-Foo-Bar-Bold.pfa is \[oq]XY-Foo-Bar-Bold\[cq] (the PS font name is
-stored in the
+.I Foo-Bar-Bold.pfa
+is \[oq]XY-Foo-Bar-Bold\[cq] (the PS font name is stored in the
 .B internalname
-field in the \[oq]FBB\[cq] file), thus the following line should be
-added to \[cq]download\[cq].
+field in the
+.I FBB
+file),
+thus the following line should be added to
+.IR download .
 .
 .RS
 .IP
@@ -1354,7 +1366,7 @@ the 35 Adobe core fonts; the difference is mainly the 
lack of the
 For backwards compatibility, these old fonts are installed also in the
 .
 .IP
-.B @OLDFONTDIR@/devps
+.I @OLDFONTDIR@/devps
 .
 .LP
 directory.
@@ -1402,7 +1414,7 @@ overrides this environment variable.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -1423,44 +1435,44 @@ creation timestamp in place of the current time.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devps/DESC
+.I @FONTDIR@/devps/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devps/ F
+.IR @FONTDIR@/devps/ F
 Font description file for font
 .IR F .
 .
 .TP
-.B @FONTDIR@/devps/download
+.I @FONTDIR@/devps/download
 List of downloadable fonts.
 .
 .TP
-.B @FONTDIR@/devps/text.enc
+.I @FONTDIR@/devps/text.enc
 Encoding used for text fonts.
 .
 .TP
-.B @MACRODIR@/ps.tmac
+.I @MACRODIR@/ps.tmac
 Macros for use with
 .BR grops ;
 automatically loaded by
 .B troffrc
 .
 .TP
-.B @MACRODIR@/pspic.tmac
+.I @MACRODIR@/pspic.tmac
 Definition of
 .B PSPIC
 macro,
 automatically loaded by
-.BR ps.tmac .
+.IR ps.tmac .
 .
 .TP
-.B @MACRODIR@/psold.tmac
+.I @MACRODIR@/psold.tmac
 Macros to disable use of characters not present in older
 PostScript printers (e.g., \[oq]eth\[cq] or \[oq]thorn\[cq]).
 .
 .TP
-.BI /tmp/grops XXXXXX
+.IR /tmp/grops XXXXXX
 Temporary file.
 See
 .BR groff (@MAN1EXT@)
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.1.man
index 14ff660..1d9b5f8 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -224,7 +224,7 @@ escape sequence in
 .
 .LP
 If the
-.B DESC
+.I DESC
 file contains the keyword
 .BR unicode ,
 .B grotty
@@ -303,7 +303,7 @@ its last line.
 .TP
 .BI \-F dir
 Prepend directory
-.IB dir /dev name
+.RI dir /dev name
 to the search path for font and device description files;
 .I name
 is the name of the device, usually
@@ -399,7 +399,7 @@ Colors are disabled.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -414,69 +414,69 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devascii/DESC
-Device description file for
+.I @FONTDIR@/devascii/DESC
+Device description file for the
 .B ascii
 device.
 .
 .TP
-.BI @FONTDIR@/devascii/ F
+.IR @FONTDIR@/devascii/ F
 Font description file for font
 .I F
-of
+of the
 .B ascii
 device.
 .
 .TP
-.B @FONTDIR@/devlatin1/DESC
-Device description file for
+.I @FONTDIR@/devlatin1/DESC
+Device description file for the
 .B latin1
 device.
 .
 .TP
-.BI @FONTDIR@/devlatin1/ F
+.IR @FONTDIR@/devlatin1/ F
 Font description file for font
 .I F
-of
+of the
 .B latin1
 device.
 .
 .TP
-.B @FONTDIR@/devutf8/DESC
-Device description file for
+.I @FONTDIR@/devutf8/DESC
+Device description file for the
 .B utf8
 device.
 .
 .TP
-.BI @FONTDIR@/devutf8/ F
+.IR @FONTDIR@/devutf8/ F
 Font description file for font
 .I F
-of
+of the
 .B utf8
 device.
 .
 .TP
-.B @FONTDIR@/devcp1047/DESC
-Device description file for
+.I @FONTDIR@/devcp1047/DESC
+Device description file for the
 .B cp1047
 device.
 .
 .TP
-.BI @FONTDIR@/devcp1047/ F
+.IR @FONTDIR@/devcp1047/ F
 Font description file for font
 .I F
-of
+of the
 .B cp1047
 device.
 .
 .TP
-.B @MACRODIR@/tty.tmac
+.I @MACRODIR@/tty.tmac
 Macros for use with
 .BR grotty .
 .
 .TP
-.B @MACRODIR@/tty\-char.tmac
-Additional kludgy character definitions for use with
+.I @MACRODIR@/tty\-char.tmac
+Additional character definitions for use with
 .BR grotty .
 .
 .LP
diff --git a/src/devices/xditview/gxditview.1.man 
b/src/devices/xditview/gxditview.1.man
index d3bd80f..a44de7d 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -284,8 +284,10 @@ The
 .B paperlength
 and
 .B paperwidth
-commands in the DESC file specify the length and width in machine units
-of the virtual page displayed by
+commands in the
+.I DESC
+file specify the length and width in machine units of the virtual page
+displayed by
 .BR \%gxditview .
 .
 .
@@ -335,7 +337,9 @@ The
 .I groff intermediate output
 file will be displayed at a resolution of
 .I res
-dpi, unless the DESC file contains the
+dpi, unless the
+.I DESC
+file contains the
 .B X11
 command, in which case the device resolution will be used.
 .
@@ -480,7 +484,7 @@ SS  
-adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\en\e
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -495,14 +499,14 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.B @APPRESDIR@/GXditview
+.I @APPRESDIR@/GXditview
 .TQ
-.B @APPRESDIR@/GXditview\-color
+.I @APPRESDIR@/GXditview\-color
 The default resource files of
 .BR \%gxditview .
 .
 Users should override these values in the
-.B .Xdefaults
+.I .Xdefaults
 file, normally located in the user's home directory.
 .
 See
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index bb6b6e4..022de4f 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -91,14 +91,14 @@ causes the standard input to be read.
 .LP
 .B eqn
 searches for the file
-.B eqnrc
+.I eqnrc
 in the directories given with the
 .B \-M
 option first, then in
-.BR @SYSTEMMACRODIR@ ,
-.BR @LOCALMACRODIR@ ,
+.IR @SYSTEMMACRODIR@ ,
+.IR @LOCALMACRODIR@ ,
 and finally in the standard macro directory
-.BR @MACRODIR@ .
+.IR @MACRODIR@ .
 .
 If it exists,
 .B eqn
@@ -183,12 +183,12 @@ Normally, the only effect of this is to define a macro
 .I name
 with a value of\~\c
 .BR 1 ;
-.B eqnrc
+.I eqnrc
 uses this to provide definitions appropriate for the output device.
 .
 However, if the specified device is \[lq]MathML\[rq], the output is
 MathML markup rather than troff commands, and
-.B eqnrc
+.I eqnrc
 is not loaded at all.
 .
 The default output device is
@@ -199,13 +199,13 @@ The default output device is
 Search
 .I dir
 for
-.B eqnrc
+.I eqnrc
 before the default directories.
 .
 .TP
 .B \-R
 Don't load
-.BR eqnrc .
+.IR eqnrc .
 .
 .TP
 .BI \-f F
@@ -1075,7 +1075,7 @@ and
 is ignored.
 .
 The default value is\~0 (This is typically changed to\~1 by the
-.B eqnrc
+.I eqnrc
 file for the
 .BR ascii ,
 .BR latin1 ,
@@ -1260,7 +1260,7 @@ causes a character to be set in roman type.
 .\" ====================================================================
 .
 .TP
-.B @MACRODIR@/eqnrc
+.I @MACRODIR@/eqnrc
 Initialization file.
 .
 .
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index d463f11..8464711 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -132,25 +132,25 @@ files.
 .
 The default path is (in that order) the current directory, the home
 directory,
-.BR @SYSTEMMACRODIR@ ,
-.BR @LOCALMACRODIR@ ,
+.IR @SYSTEMMACRODIR@ ,
+.IR @LOCALMACRODIR@ ,
 and
-.BR @MACRODIR@ .
+.IR @MACRODIR@ .
 .
 .TP
 .BI \-F dir
 Search
 .I dir
 for subdirectories
-.BI dev name
+.IR dev name
 .RI ( name
 is the name of the device) for the
-.B DESC
+.I DESC
 file before the default font directories
-.BR @LOCALFONTDIR@ ,
-.BR @FONTDIR@ ,
+.IR @LOCALFONTDIR@ ,
+.IR @FONTDIR@ ,
 and
-.BR @LEGACYFONTDIR@ .
+.IR @LEGACYFONTDIR@ .
 .
 .TP
 .B \-C
@@ -748,7 +748,7 @@ cause problems if displayed on the
 .\" ====================================================================
 .
 .TP
-.BI @FONTDIR@/dev name /DESC
+.IR @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
 .
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 848a153..847bbe3 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -252,7 +252,7 @@ A complete documentation is available in the file
 .
 .LP
 .RS
-.B @DOCDIR@/pic.ms
+.I @DOCDIR@/pic.ms
 .RE
 .
 .
@@ -1241,8 +1241,7 @@ package.
 .\" ====================================================================
 .
 .TP
-.B
address@hidden@/pic.tmac
+.I @MACRODIR@/pic.tmac
 Example definitions of the
 .B PS
 and
@@ -1268,7 +1267,8 @@ macros.
 Eric S.\& Raymond,
 .I Making Pictures With GNU PIC.
 .br
address@hidden@/pic.ps (this file, together with its source file, pic.ms, is 
part
+.I @DOCDIR@/pic.ps
+(this file, together with its source file, pic.ms, is part
 of the groff documentation)
 .
 .
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.man
index 170e3cc..54279e5 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -1715,12 +1715,12 @@ macro.
 .\" ====================================================================
 .
 .TP
-.B @DEFAULT_INDEX@
+.I @DEFAULT_INDEX@
 Default database.
 .
 .
 .TP
-.IB file @INDEX_SUFFIX@
+.RI file @INDEX_SUFFIX@
 Index files.
 .
 .
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 3c98076..f370b09 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -690,7 +690,9 @@ Set default font family.
 .
 .TP
 .BI \-F\  dir
-Set path for font DESC files.
+Set path for font
+.I DESC
+files.
 .
 .TP
 .B \-i
@@ -699,10 +701,10 @@ Process standard input after the specified input files.
 .TP
 .BI \-m\  name
 Include macro file
-.IB name .tmac
+.RI name .tmac
 (or
-.BI tmac. name\/\c
-); see also
+.IR tmac. name);
+see also
 .BR \%groff_tmac (@MAN5EXT@).
 .
 .TP
@@ -1482,7 +1484,7 @@ for details.
 .TP
 .I GROFF_FONT_PATH
 A list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory in addition to the default ones.
 .
 See
@@ -1523,7 +1525,7 @@ and
 .IR \%TMPDIR .
 .
 Otherwise, temporary files are created in
-.BR /tmp .
+.IR /tmp .
 .
 The
 .BR address@hidden@refer (@MAN1EXT@),
@@ -1752,7 +1754,7 @@ have a special meaning:
 .
 .
 .TP
-.B troffrc
+.I troffrc
 Initialization file for
 .IR troff .
 .
@@ -1762,7 +1764,7 @@ before reading the macro sets and any input.
 .
 .
 .TP
-.B troffrc\-end
+.I troffrc\-end
 Final startup file for
 .IR troff .
 .
@@ -1770,9 +1772,9 @@ It is parsed after all macro sets have been read.
 .
 .
 .TP
-.IB name .tmac
+.RI name .tmac
 .TQ
-.BI tmac. name
+.IR tmac. name
 Macro file for macro package
 .IR name .
 .
@@ -1797,7 +1799,7 @@ have a special meaning:
 .
 .
 .TP
-.BI dev name /DESC
+.IR dev name /DESC
 Device description file for device
 .IR name ,
 see
@@ -1805,7 +1807,7 @@ see
 .
 .
 .TP
-.BI dev name / F
+.IR dev name / F
 Font file for font
 .I F
 of device
@@ -1845,7 +1847,7 @@ a read-only list showing logs of commitments to the groff 
repository.
 .
 .P
 Details on repository access and much more can be found in the file
-.B README
+.I README
 at the top directory of the
 .I groff
 source package.
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 8f53c10..72f74be 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -135,10 +135,10 @@ as the default font family.
 Search in directory (or directory path)
 .I dir
 for subdirectories
-.BI dev name
+.IR dev name
 .RI ( name
 is the name of the device) and there for the
-.B DESC
+.I DESC
 file and font files.
 .
 .I dir
@@ -172,10 +172,10 @@ No directory search is performed for files with an 
absolute file name.
 .TP
 .BI \-m name
 Read in the file
-.IB name .tmac\fR.
+.RI name .tmac .
 .
 If it isn't found, try
-.BI tmac. name
+.IR tmac. name
 instead.
 .
 It will be first searched for in directories given with the
@@ -183,8 +183,11 @@ It will be first searched for in directories given with the
 command-line option, then in directories given in the
 .I GROFF_TMAC_PATH
 environment variable, then in the current directory (only if in unsafe
-mode), the home directory, @SYSTEMMACRODIR@, @LOCALMACRODIR@, and
address@hidden@.
+mode), the home directory,
+.IR @SYSTEMMACRODIR@ ,
+.IR @LOCALMACRODIR@ ,
+and
+.IR @MACRODIR@ .
 .
 .TP
 .BI \-M dir
@@ -240,9 +243,9 @@ can be any troff numeric expression.
 .TP
 .B \-R
 Don't load
-.B troffrc
+.I troffrc
 and
-.BR troffrc-end .
+.IR troffrc-end .
 .
 .TP
 .BI \-T name
@@ -521,9 +524,9 @@ will scan directories given in the
 .B \-M
 option before these, and in standard directories (current directory if
 in unsafe mode, home directory,
-.BR @SYSTEMMACRODIR@ ,
-.BR @LOCALMACRODIR@ ,
-.BR @MACRODIR@ )
+.IR @SYSTEMMACRODIR@ ,
+.IR @LOCALMACRODIR@ ,
+.IR @MACRODIR@ )
 after these.
 .
 .TP
@@ -533,16 +536,16 @@ Default device.
 .TP
 .I GROFF_FONT_PATH
 A colon separated list of directories in which to search for the
-.BI dev name
+.IR dev name
 directory.
 .
 .B @address@hidden
 will scan directories given in the
 .B \-F
 option before these, and in standard directories
-.RB ( @LOCALFONTDIR@ ,
-.BR @FONTDIR@ ,
-.BR @LEGACYFONTDIR@ )
+.RI ( @LOCALFONTDIR@ ,
+.IR @FONTDIR@ ,
+.IR @LEGACYFONTDIR@ )
 after these.
 .
 .
@@ -551,26 +554,26 @@ after these.
 .\" ====================================================================
 .
 .TP
-.B @MACRODIR@/troffrc
+.I @MACRODIR@/troffrc
 Initialization file (called before any other macro package).
 .
 .TP
-.B @MACRODIR@/troffrc\-end
+.I @MACRODIR@/troffrc\-end
 Initialization file (called after any other macro package).
 .
 .TP
-.BI @MACRODIR@/ name .tmac
+.IR @MACRODIR@/ name .tmac
 .TQ
-.BI @MACRODIR@/tmac. name
+.IR @MACRODIR@/tmac. name
 Macro files
 .
 .TP
-.BI @FONTDIR@/dev name /DESC
+.IR @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
 .
 .TP
-.BI @FONTDIR@/dev name / F
+.IR @FONTDIR@/dev name / F
 Font file for font
 .I F
 of device
@@ -579,9 +582,9 @@ of device
 .
 .P
 Note that
-.B troffrc
+.I troffrc
 and
-.B troffrc\-end
+.I troffrc\-end
 are neither searched in the current nor in the home directory by
 default for security reasons (even if the
 .B \-U
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.1.man
index 719aca5..25a6aab 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -69,7 +69,7 @@ and
 .BR lkbib (@MAN1EXT@).
 .
 The index will be named
-.IB filename @address@hidden;
+.RI filename @INDEX_SUFFIX@ ;
 the index is written to a temporary file which is then renamed to
 this.
 .
@@ -78,7 +78,7 @@ If no filenames are given on the command line because the
 option has been used, and no
 .B \-o
 option is given, the index will be named
-.BR @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@ .
+.IR @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@ .
 .
 .
 .LP
@@ -140,7 +140,7 @@ Each file is a separate record.
 Read the list of common words from
 .I file
 instead of
-.BR @COMMON_WORDS_FILE@ .
+.IR @COMMON_WORDS_FILE@ .
 .
 .TP
 .BI \-d dir
@@ -229,7 +229,7 @@ is 100.
 .TP
 .BI \-o basename
 The index should be named
-.IB basename @address@hidden
+.RI basename @INDEX_SUFFIX@ .
 .
 .TP
 .BI \-t n
@@ -246,19 +246,19 @@ is 6.
 .\" ====================================================================
 .
 .TP
-.IB filename @INDEX_SUFFIX@
+.RI filename @INDEX_SUFFIX@
 Index.
 .
 .TP
-.B @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@
+.I @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@
 Default index name.
 .
 .TP
-.B @COMMON_WORDS_FILE@
+.I @COMMON_WORDS_FILE@
 List of common words.
 .
 .TP
-.BI indxbib XXXXXX
+.IR indxbib XXXXXX
 Temporary file.
 .
 .
diff --git a/src/utils/tfmtodit/tfmtodit.1.man 
b/src/utils/tfmtodit/tfmtodit.1.man
index 7ddf30e..605942d 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -136,7 +136,7 @@ Metafont can be made to put this information in the gf file 
by loading
 the following definition after
 .B cmbase
 when creating
-.BR cm.base :
+.IR cm.base :
 .IP
 .nf
 .ft B
@@ -151,7 +151,7 @@ def ignore_math_fit(expr left_adjustment,right_adjustment) =
 For the EC font family, load the following definition after
 .B exbase
 (it is probably easiest to patch
-.B exbase.mf
+.I exbase.mf
 locally):
 .IP
 .nf
@@ -165,9 +165,9 @@ def ignore_math_fit(expr left_adjustment,right_adjustment) =
 .ft R
 .LP
 The gf file created using this modified
-.B cm.base
+.I cm.base
 or
-.B exbase
+.I exbase
 should be specified with the
 .B \-g
 option.
@@ -228,11 +228,11 @@ commands giving additional font metric information.
 .\" ====================================================================
 .
 .TP
-.B @FONTDIR@/devdvi/DESC
+.I @FONTDIR@/devdvi/DESC
 Device description file.
 .
 .TP
-.BI @FONTDIR@/devdvi/ F
+.IR @FONTDIR@/devdvi/ F
 Font description file for font
 .IR F .
 .
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index ca71280..a9f1e94 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -977,7 +977,8 @@ X11 documents which actually use
 .B Ds
 and
 .B De
-always load a specific macro file from the X11 distribution (macros.t)
+always load a specific macro file from the X11 distribution
+.RI ( macros.t )
 which provides proper definitions for the two macros.
 .
 .PP
@@ -1779,11 +1780,11 @@ Names containing only uppercase letters and digits.
 .SH FILES
 .\" ====================================================================
 .
-.B @MACRODIR@/ms.tmac
+.I @MACRODIR@/ms.tmac
 (a wrapper file for
-.BR s.tmac )
+.IR s.tmac )
 .br
-.B @MACRODIR@/s.tmac
+.I @MACRODIR@/s.tmac
 .
 .
 .
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index db0726c..9c2f204 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -68,7 +68,7 @@ It has been included into the distribution so that a lot of 
people have a
 chance to test it.
 .
 Note that this macro file is automatically called (via the
-.B troffrc
+.I troffrc
 file) if you use
 .B \-Thtml
 or
@@ -688,7 +688,8 @@ information is currently rendered as a PNG image.
 .\" ====================================================================
 .SH FILES
 .\" ====================================================================
address@hidden@/www.tmac
+.
+.I @MACRODIR@/www.tmac
 .
 .
 .\" ====================================================================



reply via email to

[Prev in Thread] Current Thread [Next in Thread]