groff-commit
[Top][All Lists]
Advanced

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

[groff] 03/122: [man pages]: Update man page cross-references.


From: G. Branden Robinson
Subject: [groff] 03/122: [man pages]: Update man page cross-references.
Date: Wed, 11 Nov 2020 02:59:01 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit a69b5d07f04007e4bb76ec6b4af2bd84372dc783
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 6 20:41:24 2020 +1100

    [man pages]: Update man page cross-references.
    
    * contrib/chem/chem.1.man:
    * contrib/eqn2graph/eqn2graph.1.man:
    * contrib/gdiffmk/gdiffmk.1.man:
    * contrib/glilypond/glilypond.1.man:
    * contrib/gperl/gperl.1.man:
    * contrib/grap2graph/grap2graph.1.man:
    * contrib/hdtbl/groff_hdtbl.7.man:
    * contrib/mm/groff_mm.7.man:
    * contrib/mm/groff_mmse.7.man:
    * contrib/mm/mmroff.1.man:
    * contrib/pic2graph/pic2graph.1.man:
    * man/ditroff.7.man:
    * man/groff.7.man:
    * man/groff_char.7.man:
    * man/groff_diff.7.man:
    * man/groff_font.5.man:
    * src/devices/grohtml/grohtml.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/eqn/neqn.1.man:
    * src/preproc/grn/grn.1.man:
    * src/preproc/pic/pic.1.man:
    * src/preproc/refer/refer.1.man:
    * src/preproc/soelim/soelim.1.man:
    * src/preproc/tbl/tbl.1.man:
    * src/roff/groff/groff.1.man:
    * src/roff/grog/grog.1.man:
    * src/roff/nroff/nroff.1.man:
    * src/roff/troff/troff.1.man:
    * src/utils/afmtodit/afmtodit.1.man:
    * src/utils/hpftodit/hpftodit.1.man:
    * src/utils/indxbib/indxbib.1.man:
    * src/utils/lkbib/lkbib.1.man:
    * src/utils/lookbib/lookbib.1.man:
    * src/utils/pfbtops/pfbtops.1.man:
    * tmac/groff_man.7.man.in:
    * tmac/groff_me.7.man:
    * tmac/groff_ms.7.man:
    * tmac/groff_trace.7.man:
    * tmac/groff_www.7.man:
      + Set page topics in italics, not bold.
      + Add section number to first occurrence in page of non-groff man
        page cross-references.
      + Where they are command-prefixed at build time, lead them with a
        hyphenation suppression escape since we cannot know whether the
        user's choice for the prefix will cause a hyphenation event.  Also
        suppress hyphenation if the page topic could otherwise experience
        it, and stop suppressing hyphenation if it couldn't.  Going ahead
        and implementing .MR is looking better and better...
---
 contrib/chem/chem.1.man              |  38 +++++-----
 contrib/eqn2graph/eqn2graph.1.man    |   4 +-
 contrib/gdiffmk/gdiffmk.1.man        |  10 +--
 contrib/glilypond/glilypond.1.man    |  52 +++++++-------
 contrib/gperl/gperl.1.man            |  30 ++++----
 contrib/grap2graph/grap2graph.1.man  |   2 +-
 contrib/hdtbl/groff_hdtbl.7.man      |   6 +-
 contrib/mm/groff_mm.7.man            |  39 ++++++-----
 contrib/mm/groff_mmse.7.man          |  14 ++--
 contrib/mm/mmroff.1.man              |   8 +--
 contrib/pic2graph/pic2graph.1.man    |  12 ++--
 man/ditroff.7.man                    |   2 +-
 man/groff.7.man                      |  18 +++--
 man/groff_char.7.man                 |  14 ++--
 man/groff_diff.7.man                 |   8 +--
 man/groff_font.5.man                 |  20 +++---
 src/devices/grohtml/grohtml.1.man    |   6 +-
 src/devices/grolj4/grolj4.1.man      |  16 ++---
 src/devices/gropdf/gropdf.1.man      |  22 +++---
 src/devices/grops/grops.1.man        |  26 +++----
 src/devices/grotty/grotty.1.man      |   6 +-
 src/devices/xditview/gxditview.1.man |  14 ++--
 src/preproc/eqn/eqn.1.man            |  50 ++++++-------
 src/preproc/eqn/neqn.1.man           |   8 +--
 src/preproc/grn/grn.1.man            |  52 +++++++-------
 src/preproc/pic/pic.1.man            | 132 ++++++++++++++++++++---------------
 src/preproc/refer/refer.1.man        |  36 +++++-----
 src/preproc/soelim/soelim.1.man      |  20 +++---
 src/preproc/tbl/tbl.1.man            |  40 +++++------
 src/roff/groff/groff.1.man           |  94 ++++++++++++-------------
 src/roff/grog/grog.1.man             |  62 ++++++++--------
 src/roff/nroff/nroff.1.man           |  12 ++--
 src/roff/troff/troff.1.man           |  18 ++---
 src/utils/afmtodit/afmtodit.1.man    |   5 +-
 src/utils/hpftodit/hpftodit.1.man    |  19 ++---
 src/utils/indxbib/indxbib.1.man      |  21 +++---
 src/utils/lkbib/lkbib.1.man          |   8 +--
 src/utils/lookbib/lookbib.1.man      |   8 +--
 src/utils/pfbtops/pfbtops.1.man      |   1 +
 tmac/groff_man.7.man.in              |  20 +++---
 tmac/groff_me.7.man                  |  16 ++---
 tmac/groff_ms.7.man                  |  12 ++--
 tmac/groff_trace.7.man               |   7 +-
 tmac/groff_www.7.man                 |   2 +-
 44 files changed, 518 insertions(+), 492 deletions(-)

diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index 5755a12..cdcbe42 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -62,13 +62,13 @@ produces chemical structure diagrams.
 Today's version is best suited for organic chemistry (bonds, rings).
 .
 The
-.B @g@chem
+.I \%@g@chem
 program is a
-.B groff
+.I groff
 preprocessor like
-.BR @g@eqn ,
-.BR @g@pic ,
-.BR @g@tbl ,
+.IR \%@g@eqn ,
+.IR \%@g@pic ,
+.IR \%@g@tbl ,
 etc.
 .
 It generates
@@ -86,7 +86,7 @@ or if
 .I file
 is
 .RB \[lq] \- \[rq],
-.I @g@chem
+.I \%@g@chem
 reads the standard input stream.
 .
 .B \-h
@@ -103,12 +103,12 @@ all exit.
 .
 .P
 The program
-.B @g@chem
+.I \%@g@chem
 originates from the Perl source file
 .IR chem.pl .
 .
 It tells
-.B @g@pic
+.I \%@g@pic
 to include a copy of the macro file
 .IR chem.pic .
 .
@@ -149,7 +149,7 @@ Lines containing the keywords
 and
 .B .cend
 start and end the input for
-.BR @g@chem ,
+.IR \%@g@chem ,
 respectively.
 .
 In
@@ -193,17 +193,17 @@ groups with a bond between them.
 .
 .P
 If you want to create just
-.B groff
+.I groff
 output, you must run
-.B @g@chem
+.I \%@g@chem
 followed by
-.B groff
+.I groff
 with the option
 .B \-p
 for the activation of
-.BR @g@pic :
+.IR \%@g@pic :
 .IP
-.B @g@chem
+.I \%@g@chem
 .RI [ file \~.\|.\|.\&]
 .BR "| groff \-p\~" .\|.\|.
 .
@@ -700,9 +700,9 @@ code, which is copied through with a label.
 .
 .P
 Since
-.B @g@chem
+.I \%@g@chem
 is a
-.B @g@pic
+.I \%@g@pic
 preprocessor, it is possible to include
 .I pic
 statements in the middle of a diagram to draw things not provided for
@@ -830,7 +830,7 @@ A squiggle bond is needed.
 A collection of
 .I pic
 macros needed by
-.BR @g@chem .
+.IR \%@g@chem .
 .
 .TP
 .I @MACRODIR@/pic.tmac
@@ -889,8 +889,8 @@ AT&T Bell Laboratories Computing Science Techical Report 
No.\& 122
 .
 .
 .P
-.BR groff (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@)
+.IR groff (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/eqn2graph/eqn2graph.1.man 
b/contrib/eqn2graph/eqn2graph.1.man
index 0959b3e..8ba00e4 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -44,7 +44,7 @@ eqn2graph \- convert an eqn equation into a cropped image
 .
 .I eqn2graph
 reads a one-line
-.IR @g@eqn (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
 equation from the standard input and writes an image file,
 by default in Portable Network Graphics (PNG) format,
 to the standard output.
@@ -155,7 +155,7 @@ by W.\& Richard Stevens.
 .
 .IR pic2graph (@MAN1EXT@),
 .IR grap2graph (@MAN1EXT@),
-.IR @g@eqn (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
 .IR groff (@MAN1EXT@),
 .IR \%convert (1)
 .
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.man
index 4203d1b..3dc48db 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -254,11 +254,11 @@ Mike Bianchi
 .SH "See Also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR nroff (@MAN1EXT@),
-.BR gtroff (@MAN1EXT@),
-.BR roff (@MAN7EXT@),
-.BR diff (@MAN1EXT@)
+.IR groff (@MAN1EXT@),
+.IR nroff (@MAN1EXT@),
+.IR gtroff (@MAN1EXT@),
+.IR roff (@MAN7EXT@),
+.IR diff (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/glilypond/glilypond.1.man 
b/contrib/glilypond/glilypond.1.man
index c094f71..9d83d39 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -95,15 +95,15 @@ glilypond \- embed LilyPond musical notation in groff 
documents
 .SH Description
 .\" ====================================================================
 .
-.B glilypond
+.I glilypond
 transforms sheet music written in the
 .I lilypond
 language into the
-.BR groff (@MAN7EXT@)
+.IR groff (@MAN7EXT@)
 language using the
 .B .PSPIC
 request, such that
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 can transform it into a format that can be displayed directly.
 .
 .B .PDFPIC
@@ -133,7 +133,7 @@ even if their names start with a dash.
 .
 Together with
 .BR .PSPIC ,
-.B glilypond can work only for
+.I glilypond can work only for
 .I troff
 devices without
 .I PDF
@@ -144,7 +144,7 @@ devices.
 .
 .P
 I.e., the following
-.B groff
+.I groff
 devices work,
 .BR \-Tps ,
 .BR \-Tdvi ,
@@ -163,7 +163,7 @@ devices.
 .
 .P
 Unfortunately, the
-.B groff
+.I groff
 option
 .B \-Tpdf
 does not work.
@@ -194,7 +194,7 @@ Display copyright license information and exit.
 .TP
 .OP \-\-ly2eps
 Here the
-.B lilypond
+.I lilypond
 program creates
 .I eps
 files directly.
@@ -205,18 +205,18 @@ This is the default.
 .TP
 .OP \-\-pdf2eps
 The program
-.B glilypond
+.I glilypond
 generates a
 .I PDF
 file using
-.BR lilypond .
+.IR lilypond .
 .
 Then the
 .I eps
 file is generated by
-.B pdf2ps
+.I pdf2ps
 and
-.BR ps2eps R .
+.IR ps2eps R .
 .
 .
 .\" ====================================================================
@@ -254,7 +254,7 @@ Normally all temporary files without the
 files are deleted.
 .
 With this option, all generated files either by the
-.B lilypond
+.I lilypond
 program or other format transposers are kept.
 .
 .
@@ -678,7 +678,7 @@ files into a
 file.
 .
 This is done by the
-.BR pdf2ps (1)
+.IR pdf2ps (1)
 program using
 .RS
 .EX
@@ -697,7 +697,7 @@ file from the
 file.
 .
 This is done by the
-.BR ps2eps (1)
+.IR ps2eps (1)
 program using
 .RS
 .EX
@@ -736,10 +736,10 @@ command
 In earlier time, this mode was the default.
 .
 But now it does not work any more, so accept the new default
-.BR pdf2eps .
+.IR pdf2eps .
 .
 For testing, this mode can also be chosen by the
-.B glilypond
+.I glilypond
 option
 .BR \-\-ly2eps .
 .
@@ -748,7 +748,7 @@ option
 In this mode, the
 .B .ly
 files are transformed by the
-.B lilypond
+.I lilypond
 program into many files of different formats, including
 .I eps
 files, using
@@ -806,15 +806,15 @@ commands
 .\" ====================================================================
 .
 The new
-.BR groff (@MAN7EXT@)
+.IR groff (@MAN7EXT@)
 structure generated by
-.B glilypond
+.I glilypond
 is either
 .
 .TP
 1)
 sent to standard output and can there be saved into a file or piped into
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 or
 .
 .TP
@@ -840,7 +840,7 @@ Bernd Warken
 .\" ====================================================================
 .
 .TP
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 describes the usage of the
 .I groff
 command and contains pointers to further documentation of the
@@ -849,21 +849,21 @@ system.
 .
 .
 .TP
-.BR groff_tmac (@MAN5EXT@)
+.IR groff_tmac (@MAN5EXT@)
 describes the
 .B .PSPIC
 request.
 .
 .
 .TP
-.BR lilypond (1)
+.IR lilypond (1)
 briefly describes the
-.B lilypond
+.I lilypond
 command and contains pointers to further documentation.
 .
 .
 .TP
-.BR pdf2ps (1)
+.IR pdf2ps (1)
 transforms a
 .I PDF
 file into a
@@ -872,7 +872,7 @@ format.
 .
 .
 .TP
-.BR ps2eps (1)
+.IR ps2eps (1)
 transforms a
 .I PS
 file into an
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index 27fc48b..391190f 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -55,12 +55,12 @@ gperl \- execute Perl commands in groff documents
 .\" ====================================================================
 .
 This is a preprocessor for
-.BR \%groff (@MAN1EXT@).
+.IR groff (@MAN1EXT@).
 .
 It allows the use of
-.BR perl (7)
+.IR perl (7)
 code in
-.BR groff (@MAN7EXT@)
+.IR groff (@MAN7EXT@)
 files.
 .
 The result of a
@@ -168,7 +168,7 @@ string variable name for storage \(em see next section.
 .\" ====================================================================
 .
 A useful feature of
-.B gperl
+.I gperl
 is to store one or more results from the
 .IR "Perl mode" .
 .
@@ -196,7 +196,7 @@ with a single line for each array member.
 .
 .P
 This Perl array output can be stored by
-.B gperl
+.I gperl
 in either
 .TP
 .I groff strings
@@ -233,7 +233,7 @@ is not really needed before the first
 command.
 .
 That suits to
-.BR \%groff (@MAN7EXT@),
+.IR groff (@MAN7EXT@),
 because every output can be saved as
 .I groff
 string, but the number registers can be very restrictive.
@@ -242,7 +242,7 @@ string, but the number registers can be very restrictive.
 .P
 In
 .IR "string mode" ,
-.B gperl
+.I gperl
 generates a
 .I groff string
 storage line
@@ -331,7 +331,7 @@ and
 .BI ".Perl .nr" " var_name1 varname2"
 stores both variables as number register variables.
 .
-.B gperl
+.I gperl
 generates
 .RS
 .EX
@@ -404,9 +404,9 @@ such that the following line is printed:
 .EE
 .RE
 by
-.B gperl
+.I gperl
 as food for the coming
-.B groff
+.I groff
 run.
 .
 .
@@ -460,18 +460,18 @@ Bernd Warken
 Man pages related to
 .I groff
 are
-.BR groff (@MAN1EXT@),
-.BR groff (@MAN7EXT@),
+.IR groff (@MAN1EXT@),
+.IR groff (@MAN7EXT@),
 and
-.BR grog (@MAN1EXT@).
+.IR grog (@MAN1EXT@).
 .
 .
 .P
 Documents related to
 .I Perl
 are
-.BR perl (1),
-.BR perl (7).
+.IR perl (1),
+.IR perl (7).
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/grap2graph/grap2graph.1.man 
b/contrib/grap2graph/grap2graph.1.man
index 6a20f56..ace7c3d 100644
--- a/contrib/grap2graph/grap2graph.1.man
+++ b/contrib/grap2graph/grap2graph.1.man
@@ -172,7 +172,7 @@ by W.\& Richard Stevens.
 .IR pic2graph (@MAN1EXT@),
 .IR eqn2graph (@MAN1EXT@),
 .IR grap (1),
-.IR @g@pic (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
 .IR groff (@MAN1EXT@),
 .IR \%convert (1)
 .
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.7.man
index 3a13aa3..ea9c647 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -181,7 +181,7 @@ An advantage of
 .I hdtbl
 is that the tables are constructed without calling a preprocessor;
 this means that
-.IR groff 's
+.IR groff (@MAN7EXT@)'s
 full macro capabilities are available.
 .
 On the other hand,
@@ -538,7 +538,7 @@ and not already enclosed in double quotes.
 Argument values specified below as\~\c
 .CI c
 are colors predefined by
-.B groff
+.I groff
 or colors defined by the user with the
 .CR .defcolor
 request.
@@ -554,7 +554,7 @@ are natural numbers.
 Argument values\~\c
 .CI n
 are numerical values with the usual
-.B groff
+.I groff
 scaling indicators.
 .
 Some of the arguments are specific to one or two macros, but most of
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 280d875..f90acd6 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -53,8 +53,10 @@ groff_mm \- memorandum macros for GNU roff
 .SH Description
 .\" ====================================================================
 .
-The groff mm macros are intended to be compatible with the DWB mm macros
-with the following limitations:
+The
+.IR groff (@MAN7EXT@)
+mm macros are intended to be compatible with the DWB mm macros with the
+following limitations.
 .
 .TP
 .B \(bu
@@ -66,7 +68,8 @@ The macros OK and PM are not implemented.
 .
 .TP
 .B \(bu
-groff mm does not support cut marks.
+.I groff
+mm does not support cut marks.
 .
 .
 .LP
@@ -935,7 +938,7 @@ Equation start.
 .
 .BR EQ / EN
 are the delimiters for equations written for
-.BR @g@eqn (@MAN1EXT@).
+.IR \%@g@eqn (@MAN1EXT@).
 .
 .BR EQ / EN
 must be inside of a
@@ -943,7 +946,7 @@ must be inside of a
 pair, except if
 .B EQ
 is used to set options for
-.B @g@eqn
+.I \%@g@eqn
 only.
 .
 The
@@ -1707,10 +1710,10 @@ redirected into file
 .
 Requires two passes with groff;
 this is handled by a separate program called
-.BR mmroff (@MAN1EXT@).
+.IR mmroff (@MAN1EXT@).
 .
 This program exists because
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 by default deactivates the unsafe operations that are required by
 .BR INITR .
 .
@@ -2399,7 +2402,7 @@ on the first page.
 Include a PostScript file in the document.
 .
 The macro depends on
-.BR mmroff (@MAN1EXT@)
+.IR mmroff (@MAN1EXT@)
 and
 .BR INITR .
 .
@@ -2428,7 +2431,7 @@ can also be given to resize the picture.
 Picture end.
 .
 Ends a picture for
-.BR @g@pic (@MAN1EXT@).
+.IR \%@g@pic (@MAN1EXT@).
 .
 .TP
 .BI PF\  \fR[\fParg\fR]\fP
@@ -2488,7 +2491,7 @@ This macro defines string
 Picture start (from pic).
 .
 Begins a picture for
-.BR @g@pic (@MAN1EXT@).
+.IR \%@g@pic (@MAN1EXT@).
 .
 .TP
 .B PX
@@ -2955,7 +2958,7 @@ TPoh@argument of \fBOH\fP
 Table start.
 .
 This is the start of a table specification to
-.BR @g@tbl (@MAN1EXT@).
+.IR \%@g@tbl (@MAN1EXT@).
 .
 .B TS
 ends with
@@ -3025,7 +3028,7 @@ This adds four digit-sized spaces in the beginning of 
each line.
 Finer control is available with the string variable
 .BR Verbnm .
 It contains all arguments to the
-.BR troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 command
 .BR .nm ,
 normally \[oq]1\[cq].
@@ -3996,13 +3999,13 @@ of Lund, Sweden.
 .SH "See Also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR @g@tbl (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@),
-.BR @g@eqn (@MAN1EXT@)
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%@g@tbl (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@)
 .br
-.BR groff_mmse (@MAN7EXT@)
+.IR groff_mmse (@MAN7EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/mm/groff_mmse.7.man b/contrib/mm/groff_mmse.7.man
index ac13a25..0ed18e5 100644
--- a/contrib/mm/groff_mmse.7.man
+++ b/contrib/mm/groff_mmse.7.man
@@ -71,7 +71,7 @@ kan anv
 som argument.
 Detta ger ett svenskt f�rs�ttsblad.
 Se
-.BR groff_mm (@MAN7EXT@)
+.IR groff_mm (@MAN7EXT@)
 f�r �vriga detaljer.
 .
 .
@@ -156,12 +156,12 @@ J
 .SH "SE OCKS�"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR @g@tbl (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@),
-.BR @g@eqn (@MAN1EXT@),
-.BR groff_mm (@MAN7EXT@)
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%@g@tbl (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
+.IR groff_mm (@MAN7EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/mm/mmroff.1.man b/contrib/mm/mmroff.1.man
index a06e996..12a3832 100644
--- a/contrib/mm/mmroff.1.man
+++ b/contrib/mm/mmroff.1.man
@@ -97,10 +97,10 @@ Sweden.
 .IR groff_mm (@MAN7EXT@),
 .IR groff_mmse (@MAN7EXT@),
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
-.IR @g@tbl (@MAN1EXT@),
-.IR @g@pic (@MAN1EXT@),
-.IR @g@eqn (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%@g@tbl (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/pic2graph/pic2graph.1.man 
b/contrib/pic2graph/pic2graph.1.man
index 1f3e37c..49ad426 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -46,13 +46,13 @@ pic2graph \- convert a PIC diagram into a cropped image
 .
 .I pic2graph
 reads a
-.IR @g@pic (@MAN1EXT@)
+.IR \%@g@pic (@MAN1EXT@)
 program from the standard input and writes an image file,
 by default in Portable Network Graphics (PNG) format,
 to the standard output.
 .
 It furthermore translates
-.IR @g@eqn (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
 constructs, so it can be used for generating images of mathematical
 formulae.
 .
@@ -107,7 +107,7 @@ Use
 .I delimiters
 as the opening and closing
 characters that delimit
-.I @g@eqn
+.I \%@g@eqn
 directives;
 the default is \(lq$$\(rq.
 .
@@ -115,7 +115,7 @@ The option argument
 .I delimiters
 should be a two-character string,
 but an empty string (\(dq\(dq) is accepted as a directive to disable
-.I @g@eqn
+.I \%@g@eqn
 processing.
 .
 .
@@ -200,8 +200,8 @@ W.\& Richard Stevens,
 .PP
 .IR eqn2graph (@MAN1EXT@),
 .IR grap2graph (@MAN1EXT@),
-.IR @g@pic (@MAN1EXT@),
-.IR @g@eqn (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
 .IR groff (@MAN1EXT@),
 .IR \%convert (1)
 .
diff --git a/man/ditroff.7.man b/man/ditroff.7.man
index dedb08c..7079f2d 100644
--- a/man/ditroff.7.man
+++ b/man/ditroff.7.man
@@ -146,7 +146,7 @@ systems.
 .
 .
 .TP
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 describes the GNU implementation of
 .IR (di)troff .
 .
diff --git a/man/groff.7.man b/man/groff.7.man
index 4b7ae4b..2e7c9d9 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -2846,7 +2846,8 @@ gpinyin^.pinyin start^.pinyin stop
 .
 .
 .P
-Note that the \[oq]@g@ideal\[cq] preprocessor is not available in groff
+The \%\[oq]@g@ideal\[cq] preprocessor is not available in
+.I groff
 yet.
 .
 .
@@ -5050,17 +5051,22 @@ t after
 .SH Compatibility
 .\" ====================================================================
 .
-The differences between the groff language and classical troff as
+The differences between the
+.I groff
+language and classical
+.I troff
+as
 defined by
 [CSTR\~#54]
 are documented in
-.BR groff_diff (@MAN7EXT@).
+.IR groff_diff (@MAN7EXT@).
 .
 .
 .P
-The groff system provides a compatibility mode, see
-.BR groff (@MAN1EXT@)
-on how to invoke this.
+.I groff
+provides an AT&T compatibility mode;
+see
+.IR groff (@MAN1EXT@).
 .
 .
 .\" ====================================================================
diff --git a/man/groff_char.7.man b/man/groff_char.7.man
index 10651fb..d2431f8 100644
--- a/man/groff_char.7.man
+++ b/man/groff_char.7.man
@@ -460,9 +460,9 @@ vertical lines;
 see subsection \[lq]Rules and lines\[rq] below.
 .
 Preprocessors like
-.IR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 and
-.IR @g@pic (@MAN1EXT@)
+.IR \%@g@pic (@MAN1EXT@)
 draw boxes and will produce the best possible output for the device,
 falling back to basic Latin glyphs only when necessary.
 .
@@ -487,7 +487,7 @@ input.
 .P
 Two characters in the Latin-1 supplement are handled specially.
 .
-.I @g@troff
+.I \%@g@troff
 never produces them as output.
 .
 .
@@ -702,7 +702,7 @@ producing \[lq]\[u02DA]\[rq].
 .P
 Unicode code points can be composed as well;
 when they are,
-.I @g@troff
+.I \%@g@troff
 requires NFD
 (Normalization Form D),
 where all Unicode glyphs are maximally decomposed.
@@ -712,12 +712,12 @@ precomposed characters in the Latin-1 supplement 
described above are
 also accepted.
 .
 Do not count on this exception remaining in a future
-.I @g@troff
+.I \%@g@troff
 that accepts UTF-8 input directly.)
 .
 .
 Thus,
-.I @g@troff
+.I \%@g@troff
 accepts
 .RB \[lq]caf \[rs][\[aq]e] \[rq],
 .RB \[lq]caf \[rs][e\~aa] \[rq],
@@ -1676,7 +1676,7 @@ and
 Bernd Warken
 .ME ,
 revised to use
-.IR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 by
 .MT esr@\:thyrsus\:.com
 Eric S.\& Raymond
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index d3e3e1a..c837121 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -2898,7 +2898,7 @@ causes a warning if
 .B break
 warnings are not suppressed and
 .
-.I @g@troff
+.I \%@g@troff
 must add 0.2\~m or more for each interword space in a line.
 .
 See
@@ -3973,7 +3973,7 @@ is the current year minus 1900.
 .SS Miscellaneous
 .\" ====================================================================
 .
-.I @g@troff
+.I \%@g@troff
 predefines a string,
 .BR \[rs]*[.T] ;
 it contains the argument given to the
@@ -3988,7 +3988,7 @@ or
 This is not the same as the (read-only) register
 .BR \[rs]n[.T] ,
 which is defined to be\~1 if
-.I @g@troff
+.I \%@g@troff
 is called with the
 .B \-T
 command-line option,
@@ -4012,7 +4012,7 @@ which can be found in the
 .B \[rs]n[.fp]
 register;
 although
-.I @g@troff
+.I \%@g@troff
 does not enforce that strictly.
 .
 Rather,
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 8f80f95..6cf3fb3 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -120,7 +120,7 @@ It specifies the program to generate PNG images from
 PostScript input.
 .
 Under GNU/Linux this is usually
-.I gs
+.IR gs (1)
 but under other systems (notably cygwin) it might be set to another
 name.
 .
@@ -129,7 +129,7 @@ name.
 The physical vertical dimension of the output medium in machine units.
 .
 This isn't used by
-.I @g@troff
+.I \%@g@troff
 itself but by output devices.
 .
 Deprecated.
@@ -158,7 +158,7 @@ Alternatively,
 can be a file name (e.g.,
 .IR /etc/papersize );
 if the file can be opened,
-.B groff
+.I groff
 reads the first line and tests for the above paper sizes.
 .
 Finally,
@@ -186,7 +186,7 @@ sets both the vertical and horizontal dimension of the 
output medium.
 .
 .IP
 More than one argument can be specified;
-.B groff
+.I groff
 scans from left to right and uses the first valid paper specification.
 .
 .TP
@@ -200,7 +200,7 @@ Use
 instead.
 .
 This isn't used by
-.B troff
+.I \%@g@troff
 itself but by output devices.
 .
 .TP
@@ -234,7 +234,7 @@ If omitted, the
 and
 .B \-L
 options of
-.B groff
+.I groff
 are ignored.
 .
 .TP
@@ -310,7 +310,7 @@ is present, no
 .B charset
 section is required in the font description files since the Unicode
 handling built into
-.B groff
+.I groff
 is used.
 .
 However, if there are entries in a
@@ -364,13 +364,13 @@ lines are compulsory.
 Not all commands in the
 .I DESC
 file are used by
-.B troff
+.I \%@g@troff
 itself; some of the keywords (or even additional ones) are used by
 postprocessors to store arbitrary information about the device.
 .
 .LP
 Here a list of obsolete keywords which are recognized by
-.B groff
+.I groff
 but completely ignored:
 .BR spare1 ,
 .BR spare2 ,
@@ -435,7 +435,7 @@ mounted.
 .
 .LP
 Other commands are ignored by
-.B troff
+.I \%@g@troff
 but may be used by postprocessors to store arbitrary information
 about the font in the font file.
 .
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 901f638..1be0a00 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -469,7 +469,7 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
 .IR groff_font (@MAN5EXT@)
 for more details.
@@ -504,8 +504,8 @@ space but no line break.
 .
 .\" IR afmtodit (@MAN1EXT@),
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
-.\" IR psbb (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.\" IR psbb (1), \" XXX: what is this?
 .\" IR groff_out (@MAN5EXT@),
 .\" IR groff_char (@MAN7EXT@),
 .IR groff_font (@MAN5EXT@)
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index 82d64e9..b72cc93 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -193,9 +193,9 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
-.BR \%groff_font (@MAN5EXT@)
+.IR groff_font (@MAN5EXT@)
 for more details.
 .
 .
@@ -229,12 +229,12 @@ Small dots.
 .SH "See Also"
 .\" ====================================================================
 .
-.BR lj4_font (@MAN5EXT@),
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR groff_out (@MAN5EXT@),
-.BR groff_font (@MAN5EXT@),
-.BR groff_char (@MAN7EXT@)
+.IR lj4_font (@MAN5EXT@),
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR groff_out (@MAN5EXT@),
+.IR groff_font (@MAN5EXT@),
+.IR groff_char (@MAN7EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index 765e812..62ae91b 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -230,12 +230,12 @@ Set the foundry to use for selecting fonts of the same 
name.
 .\" ====================================================================
 .
 The input to
-.B gropdf
+.I gropdf
 must be in the format output by
-.BR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 This is described in
-.BR groff_out (@MAN5EXT@).
+.IR groff_out (@MAN5EXT@).
 .
 .
 .LP
@@ -1267,7 +1267,7 @@ Install both the groff font description files and the 
fonts in a
 \[oq]devpdf\[cq] subdirectory of the font path which groff finds.
 .
 See section \[lq]Environment\[rq] in
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 for the actual value of the font path.
 .
 Note that groff doesn't use the AFM files (but it is a good idea to
@@ -1322,9 +1322,9 @@ the font file has been specified with a full path,
 no directories are searched.
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
-.BR \%groff_font (@MAN5EXT@)
+.IR groff_font (@MAN5EXT@)
 for more details.
 .
 .
@@ -1394,11 +1394,11 @@ automatically loaded by
 .SH "See Also"
 .\" ====================================================================
 .
-.BR \%afmtodit (@MAN1EXT@),
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR \%groff_font (@MAN5EXT@),
-.BR \%groff_out (@MAN5EXT@)
+.IR \%afmtodit (@MAN1EXT@),
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR groff_font (@MAN5EXT@),
+.IR groff_out (@MAN5EXT@)
 .\" Not actually referenced in above discussion.
 .\" .BR \%pfbtops (@MAN1EXT@),
 .\" .BR \%groff_tmac (@MAN5EXT@),
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index f89ba51..32b47c1 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -334,10 +334,10 @@ If this option is not given, the line thickness defaults 
to 0.04\~em.
 The input to
 .B grops
 must be in the format output by
-.BR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 This is described in
-.BR groff_out (@MAN5EXT@).
+.IR groff_out (@MAN5EXT@).
 .
 .LP
 In addition, the device and font description files for the device used
@@ -1480,9 +1480,9 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
-.BR \%groff_font (@MAN5EXT@)
+.IR groff_font (@MAN5EXT@)
 for more details.
 .
 .
@@ -1537,7 +1537,7 @@ PostScript printers (e.g., \[oq]eth\[cq] or 
\[oq]thorn\[cq]).
 .IR /tmp/grops XXXXXX
 Temporary file.
 See
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 for details on the location of temporary files.
 .
 .
@@ -1552,14 +1552,14 @@ PostScript Language Document Structuring Conventions 
Specification
 .
 .
 .LP
-.BR \%afmtodit (@MAN1EXT@),
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR \%pfbtops (@MAN1EXT@),
-.BR \%groff_out (@MAN5EXT@),
-.BR \%groff_font (@MAN5EXT@),
-.BR \%groff_char (@MAN7EXT@),
-.BR \%groff_tmac (@MAN5EXT@)
+.IR \%afmtodit (@MAN1EXT@),
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%pfbtops (@MAN1EXT@),
+.IR groff_char (@MAN7EXT@),
+.IR groff_font (@MAN5EXT@),
+.IR groff_out (@MAN5EXT@),
+.IR groff_tmac (@MAN5EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.1.man
index c2cd6d3..fe19b80 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -482,9 +482,9 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
-.IR \%groff_font (@MAN5EXT@)
+.IR groff_font (@MAN5EXT@)
 for more details.
 .
 .
@@ -706,7 +706,7 @@ ECMA\-ST/\:Ecma\-048\:.pdf
 .
 .LP
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
 .IR groff_out (@MAN5EXT@),
 .IR groff_font (@MAN5EXT@),
 .IR groff_char (@MAN7EXT@),
diff --git a/src/devices/xditview/gxditview.1.man 
b/src/devices/xditview/gxditview.1.man
index 83b080b..0d2c059 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -80,7 +80,7 @@ intermediate output format of
 documented in
 .IR groff_out (@MAN5EXT@),
 is produced by
-.IR @g@troff
+.IR \%@g@troff
 or the
 .B \-Z
 option to
@@ -565,7 +565,7 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
 .IR groff_font (@MAN5EXT@)
 for more details.
@@ -634,11 +634,11 @@ by Jim Flowers and Stephen Gildea.
 .
 .
 .PP
-.BR X (7),
-.BR xrdb (1),
-.BR xditview (1),
-.BR groff (@MAN1EXT@),
-.BR groff_out (@MAN5EXT@)
+.IR X (7),
+.IR xrdb (1),
+.IR xditview (1),
+.IR groff (@MAN1EXT@),
+.IR groff_out (@MAN5EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index f026a0f..797fc28 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -85,11 +85,11 @@ is part of the
 .IR groff (@MAN7EXT@)
 document formatting system.
 .
-.I @g@eqn
+.I \%@g@eqn
 compiles descriptions of equations embedded in
 .IR roff (@MAN7EXT@)
 input files into commands that are understood by
-.IR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 Normally,
 it should be invoked using the
@@ -119,7 +119,7 @@ the standard input stream is read.
 Unless the
 .B \-R
 option is given,
-.I @g@eqn
+.I \%@g@eqn
 searches for the file
 .I eqnrc
 in the directories given with the
@@ -132,7 +132,7 @@ and finally in the standard macro directory
 .IR @MACRODIR@ .
 .
 If it exists,
-.I @g@eqn
+.I \%@g@eqn
 processes it before the other input files.
 .
 .
@@ -329,7 +329,7 @@ intended to have semantics like
 CSS \[lq]large\[rq].
 .
 In
-.I @g@troff
+.I \%@g@troff
 output,
 the point size is increased by\~5;
 in MathML output,
@@ -546,7 +546,7 @@ that is not the first character on the input line is 
treated like
 This constructs a new object
 .RI from\~ e
 using a
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 macro named
 .IR text .
 .
@@ -735,7 +735,9 @@ the biggest one is used.
 .
 When
 .I eqn
-is generating troff markup,
+is generating
+.I troff \" generic
+markup,
 the appearance of equations is controlled by a large number of
 parameters.
 .
@@ -771,7 +773,7 @@ set x_height 45
 .
 .IP
 says that
-.I @g@eqn
+.I \%@g@eqn
 should assume an x\~height of 0.45\~ems.
 .
 .
@@ -787,7 +789,7 @@ definitive.
 .
 .TP
 .B minimum_size
-.I @g@eqn
+.I \%@g@eqn
 won't set anything at a smaller point size than this.
 .
 The value is in points.
@@ -1227,7 +1229,7 @@ and
 .SS Fonts
 .\" ====================================================================
 .
-.I @g@eqn
+.I \%@g@eqn
 normally uses at least two fonts to set an equation:
 an italic font for letters,
 and a roman font for everything else.
@@ -1351,7 +1353,7 @@ command.
 Set the minimum point size
 .RI to\~ n .
 .
-.I @g@eqn
+.I \%@g@eqn
 will not reduce the size of subscripts or superscripts to
 a smaller size
 .RI than\~ n .
@@ -1371,7 +1373,7 @@ before the default directories.
 Don't allow newlines within delimiters.
 .
 This option allows
-.I @g@eqn
+.I \%@g@eqn
 to recover better from missing closing delimiters.
 .
 .
@@ -1384,7 +1386,7 @@ smaller than the surrounding text.
 This option is deprecated.
 .
 Normally,
-.I @g@eqn
+.I \%@g@eqn
 sets subscripts and superscripts at 70% of the size of the surrounding
 text.
 .
@@ -1408,7 +1410,7 @@ This is equivalent to a
 command.
 .
 This option is deprecated.
-.I @g@eqn
+.I \%@g@eqn
 normally sets equations at whatever the current point size is when the
 equation is encountered.
 .
@@ -1429,7 +1431,7 @@ 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
-.I @g@troff
+.I \%@g@troff
 commands,
 and
 .I eqnrc
@@ -1458,13 +1460,13 @@ be rendered.
 .
 It does not support fine control of motions and sizes to the same
 degree
-.I @g@troff
+.I \%@g@troff
 does.
 .
 Thus:
 .
 .IP \[bu]
-.I @g@eqn
+.I \%@g@eqn
 parameters have no effect on the generated MathML.
 .
 .IP \[bu]
@@ -1486,7 +1488,7 @@ as centering on the math axis is the MathML default.
 .
 .IP \[bu]
 Characters that
-.I @g@eqn
+.I \%@g@eqn
 sets extra large in
 .I troff \" mode
 mode\[em]notably the integral sign\[em]may appear too small and need to
@@ -1497,7 +1499,7 @@ have their \[lq]<mstyle>\[rq] wrappers adjusted by hand.
 As in its
 .I troff \" mode
 mode,
-.I @g@eqn
+.I \%@g@eqn
 in MathML mode leaves the
 .B .EQ
 and
@@ -1513,7 +1515,7 @@ be recognized as strings that begin with \[lq]<math>\[rq] 
and end with
 .
 .LP
 See section \[lq]Bugs\[rq] below for translation limits specific to
-.IR @g@eqn .
+.IR \%@g@eqn .
 .
 .
 .\" ====================================================================
@@ -1568,10 +1570,10 @@ Addison-Wesley Professional;
 .
 .
 .LP
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@),
-.BR groff_font (@MAN5EXT@)
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR groff_font (@MAN5EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/eqn/neqn.1.man b/src/preproc/eqn/neqn.1.man
index 0c29cf8..00edbf9 100644
--- a/src/preproc/eqn/neqn.1.man
+++ b/src/preproc/eqn/neqn.1.man
@@ -38,16 +38,16 @@
 .SH Description
 .\" ====================================================================
 .
-.I @g@neqn
+.I \%@g@neqn
 invokes the
-.IR @g@eqn (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
 command with the
 .B ascii
 output device.
 .
 .
 .LP
-.I @g@eqn
+.I \%@g@eqn
 does not support low-resolution,
 typewriter-like devices,
 although it may work adequately for very simple input.
@@ -57,7 +57,7 @@ although it may work adequately for very simple input.
 .SH "See Also"
 .\" ====================================================================
 .
-.IR @g@eqn (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index f011203..6540c46 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -65,14 +65,14 @@
 .SH Description
 .\" ====================================================================
 .
-.I @g@grn
+.I \%@g@grn
 is a preprocessor for including
 .I gremlin
 pictures in
 .I groff
 input.
 .
-.I @g@grn
+.I \%@g@grn
 writes to standard output,
 processing only input lines between two that start with
 .B .GS
@@ -80,7 +80,7 @@ and
 .BR .GE .
 .
 Those lines must contain
-.I @g@grn
+.I \%@g@grn
 commands
 (see below).
 .
@@ -88,7 +88,7 @@ These macros request a
 .I gremlin
 file;
 the picture in that file is converted and placed in the
-.I @g@troff
+.I \%@g@troff
 input stream.
 .
 The
@@ -113,7 +113,7 @@ the position on the page is the bottom of the
 picture.
 .
 If the
-.I @g@grn
+.I \%@g@grn
 entry is ended with
 .B .GF
 instead of
@@ -215,7 +215,7 @@ Each input line between
 and
 .B .GE
 may have one
-.I @g@grn
+.I \%@g@grn
 command.
 .
 Commands consist of one or two strings separated by white space,
@@ -260,7 +260,7 @@ The default is 12 (16, 24, and 36, respectively).
 .TQ
 .BI special\  f
 Set the roman (italics, bold, or special) font to
-.IR @g@troff 's
+.IR \%@g@troff 's
 font
 .I f
 (either a name or number).
@@ -272,7 +272,7 @@ The default is R (I, B, and S, respectively).
 .TQ
 .BI stipple\  f
 Set the stipple font to
-.IR @g@troff 's
+.IR \%@g@troff 's
 stipple font
 .I f
 (name or number).
@@ -343,7 +343,7 @@ regardless of any scaling factors in the picture.
 Setting
 .B pointscale
 will cause the point sizes to scale with the picture (within
-.IR @g@troff 's
+.IR \%@g@troff 's
 limitations, of course).
 .
 An operand of anything but
@@ -357,7 +357,7 @@ picture.
 .
 This is meant to be used as a global parameter setting mechanism at
 the beginning of the
-.I @g@troff
+.I \%@g@troff
 input file, but can be used at any time to reset the
 default settings.
 .
@@ -416,7 +416,7 @@ line.
 .\" ====================================================================
 .
 Since
-.I @g@grn
+.I \%@g@grn
 is a preprocessor,
 it doesn't know about current indentation,
 point sizes,
@@ -426,7 +426,7 @@ and so on.
 .
 Consequently,
 no
-.I @g@troff
+.I \%@g@troff
 input can be placed between the
 .B .GS
 and
@@ -436,9 +436,9 @@ macros.
 However,
 .I gremlin
 text is now processed by
-.IR @g@troff ,
+.IR \%@g@troff ,
 so anything valid in a single line of
-.I @g@troff
+.I \%@g@troff
 input is valid in a line of
 .I gremlin
 text (barring \[oq].\[cq] directives at the beginning of a line).
@@ -455,11 +455,11 @@ expressions enclosed by previously defined delimiters 
(e.g.,
 .
 .PP
 When using
-.I @g@grn
+.I \%@g@grn
 along with other preprocessors, it is best to run
 .I tbl
 before
-.IR @g@grn ,
+.IR \%@g@grn ,
 .IR pic ,
 and/or
 .I ideal
@@ -472,7 +472,7 @@ should always be run last.
 .
 .PP
 A picture is considered an entity, but that doesn't stop
-.I @g@troff
+.I \%@g@troff
 from trying to break it up if it falls off the end of a page.
 .
 Placing the picture between \[oq]keeps\[cq] in \-me macros will ensure
@@ -480,9 +480,9 @@ proper placement.
 .
 .
 .PP
-.I @g@grn
+.I \%@g@grn
 uses
-.IR @g@troff 's
+.IR \%@g@troff 's
 number registers
 .B g1
 through
@@ -529,7 +529,7 @@ file does not contain negative coordinates, either format 
will be read
 correctly by either version of
 .I gremlin
 or
-.IR @g@grn .
+.IR \%@g@grn .
 .
 The other difference from
 .IR SUN / X11
@@ -711,7 +711,7 @@ ncw(0.1i)l.
 .TE
 .sp
 If you're using
-.I @g@grn
+.I \%@g@grn
 to run your pictures through
 .IR groff ,
 the font is really just a starting font:
@@ -772,7 +772,7 @@ shouldn't ever use negative coordinates.
 .I gremlin
 writes out coordinates using format \[lq]%f1.2\[rq]; it's probably
 a good idea to use the same format if you want to modify the
-.I @g@grn
+.I \%@g@grn
 code.
 .
 .
@@ -817,10 +817,10 @@ Daniel Senderowicz and Werner Lemberg modified it for
 .SH "See Also"
 .\" ====================================================================
 .
-.BR gremlin (1),
-.BR groff (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@),
-.BR ideal (1)
+.IR \%gremlin (1),
+.IR groff (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR ideal (1)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index aaadd95..f218f89 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -88,14 +88,16 @@
 .\" ====================================================================
 .
 This manual page describes the GNU version of
-.BR pic ,
-which is part of the groff document formatting system.
+.IR pic , \" GNU
+which is part of the
+.I groff
+document formatting system.
 .
-.B pic
+.I \%@g@pic
 compiles descriptions of pictures embedded within
-.B troff
+.I troff \" generic
 or \*(tx input files into commands that are understood by \*(tx or
-.BR troff .
+.IR troff .
 .
 Each picture starts with a line beginning with
 .B .PS
@@ -184,19 +186,25 @@ even when followed by a character other than space or 
newline.
 .
 .TP
 .B \-n
-Don't use the groff extensions to the troff drawing commands.
+Don't use
+.I groff
+extensions to the
+.I troff \" generic
+drawing commands.
 .
 You should use this if you are using a postprocessor that doesn't
 support these extensions.
 .
 The extensions are described in
-.BR groff_out (@MAN5EXT@).
+.IR groff_out (@MAN5EXT@).
 .
 The
 .B \-n
 option also causes
-.B pic
-not to use zero-length lines to draw dots in troff mode.
+.I \%@g@pic
+not to use zero-length lines to draw dots in
+.I troff \" generic
+mode.
 .
 .
 .TP
@@ -227,26 +235,26 @@ In \*(tx mode draw dots using zero-length lines.
 .
 .LP
 The following options supported by other versions of
-.B pic
+.I pic \" generic
 are ignored:
 .
 .TP
 .B \-D
 Draw all lines using the \eD escape sequence.
-.B pic
+.I \%@g@pic
 always does this.
 .
 .TP
 .BI \-T \ dev
 Generate output for the
-.B troff
+.I troff \" generic
 device
 .IR dev .
 .
 This is unnecessary because the
-.B troff
+.I troff \" generic
 output generated by
-.B pic
+.I \%@g@pic
 is device-independent.
 .
 .
@@ -255,9 +263,9 @@ is device-independent.
 .\" ====================================================================
 .
 This section describes only the differences between GNU
-.B pic
+.I pic \" GNU
 and the original version of
-.BR pic .
+.IR pic . \" AT&T
 .
 Many of these differences also apply to newer versions of Unix
 .BR pic .
@@ -280,7 +288,7 @@ A complete documentation is available in the file
 option.
 .
 In \*(tx mode,
-.B pic
+.I \%@g@pic
 will define a vbox called
 .B \egraph
 for each picture.
@@ -449,7 +457,9 @@ This is useful for debugging.
 .TP
 \fBcommand\fR \fIarg\fR\|.\|.\|.
 Concatenate the arguments
-and pass them through as a line to troff or \*(tx.
+and pass them through as a line to
+.I troff
+or \*(tx.
 .
 Each
 .I arg
@@ -630,7 +640,7 @@ is used.
 Attributes can be specified in the same way as for a normal text
 object.
 Be very careful that you specify an appropriate format string;
-.B pic
+.I \%@g@pic
 does only very limited checking of the string.
 This is deprecated in favour of
 .BR sprintf .
@@ -912,14 +922,13 @@ the picture.
 If the width of zero is specified the width will be ignored in computing
 the scaling factor for the picture.
 .
-Note that GNU
-.B pic
+GNU
+.I pic \" GNU
 will always scale a picture by the same amount vertically as well as
 horizontally.
 .
-This is different from the DWB
-2.0
-.B pic
+This is different from DWB 2.0
+.I pic \" foreign
 which may scale a picture by a different amount vertically than
 horizontally if a height is specified.
 .
@@ -958,7 +967,7 @@ can also be used;
 this will produce the arguments formatted according to
 .IR format ,
 which should be a string as described in
-.BR printf (3)
+.IR printf (3)
 appropriate for the number of arguments supplied.
 Only the flags
 .RB \(oq # \(cq,
@@ -990,8 +999,10 @@ in \*(tx output mode with the
 option, this means use the line thickness specified by
 .B .ps
 lines;
-in troff output mode, this means use a thickness proportional
-to the pointsize.
+in
+.I troff
+output mode,
+this means use a thickness proportional to the pointsize.
 .
 A zero value means draw the thinnest possible line supported by
 the output device.
@@ -1067,13 +1078,13 @@ All three keywords expect a suffix specifying the 
color, for example
 Currently, color support isn't available in \*(tx mode.
 .
 Predefined color names for
-.B groff
+.I groff
 are in the device macro files, for example
 .BR ps.tmac ;
 additional colors can be defined with the
 .B .defcolor
 request (see the manual page of
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 for more details).
 .
 .
@@ -1101,7 +1112,7 @@ The picture is then available in the box
 .
 .
 .LP
-.B pic
+.I \%@g@pic
 assumes that at the beginning of a picture both glyph and fill color are
 set to the default value.
 .
@@ -1122,8 +1133,10 @@ color.
 .
 .
 .LP
-The troff output of
-.B pic
+The
+.I troff
+output of
+.I \%@g@pic
 is device-independent.
 .
 The
@@ -1131,7 +1144,9 @@ The
 option is therefore redundant.
 .
 All numbers are taken to be in inches; numbers are never interpreted
-to be in troff machine units.
+to be in
+.I troff
+machine units.
 .
 .
 .LP
@@ -1140,9 +1155,9 @@ Objects can have an
 attribute.
 .
 This will only work if the postprocessor is
-.BR grops ,
+.IR grops (@MAN1EXT@)
 or
-.BR gropdf .
+.IR gropdf (@MAN1EXT@).
 .
 Any text associated with an object having the
 .B aligned
@@ -1183,23 +1198,23 @@ for i = 1 to 4 do {
 .\" ====================================================================
 .
 To obtain a stand-alone picture from a
-.B pic
+.I \%@g@pic
 file, enclose your
-.B pic
+.I pic \" language
 code with
 .B .PS
 and
 .B .PE
 requests;
-.B roff
+.I roff
 configuration commands may be added at the beginning of the file, but no
-.B roff
+.I roff
 text.
 .
 .
 .LP
 It is necessary to feed this file into
-.B groff
+.I groff
 without adding any page information, so you must check which
 .B .PS
 and
@@ -1210,7 +1225,7 @@ For example, the mm macro package adds a page number, 
which is very
 annoying.
 .
 At the moment, calling standard
-.B groff
+.I groff
 without any macro package works.
 .
 Alternatively, you can define your own requests, e.g., to do nothing:
@@ -1228,13 +1243,13 @@ Alternatively, you can define your own requests, e.g., 
to do nothing:
 .
 .
 .LP
-.B groff
+.I groff
 itself does not provide direct conversion into other graphics file
 formats.
 .
 But there are lots of possibilities if you first transform your
 picture into PostScript\*R format using the
-.B groff
+.I groff
 option
 .BR \-Tps .
 .
@@ -1249,7 +1264,7 @@ or the like.
 .
 Moreover, the PostScript interpreter
 .B ghostscript
-.RB ( gs )
+.RI ( gs (1))
 has built-in graphics conversion devices that are called with the option
 .LP
 .RS
@@ -1274,7 +1289,8 @@ format.
 .
 The MediaBox of the file produced can be controlled by passing a
 .B \-P\-p
-papersize to groff.
+papersize to
+.IR groff .
 .
 .
 .LP
@@ -1283,20 +1299,20 @@ As the Encapsulated PostScript File Format
 is getting more and more important, and the conversion wasn't
 regarded trivial in the past you might be interested to know that
 there is a conversion tool named
-.B ps2eps
+.I ps2eps
 which does the right job.
 .
 It is much better than the tool
-.B ps2epsi
+.I ps2epsi
 packaged with
-.BR gs .
+.IR gs .
 .
 .
 .LP
 For bitmapped graphic formats, you should use
-.BR pstopnm ;
+.IR pstopnm ;
 the resulting (intermediate)
-.B PNM
+.IR pnm (5)
 file can be then converted to virtually any graphics format using the
 tools of the
 .B netpbm
@@ -1386,14 +1402,14 @@ W.\& Richard Stevens,
 .
 .
 .LP
-.BR @g@troff (@MAN1EXT@),
-.BR groff_out (@MAN5EXT@),
-.BR tex (1),
-.BR gs (1),
-.BR ps2eps (1),
-.BR pstopnm (1),
-.BR ps2epsi (1),
-.BR pnm (5)
+.IR \%@g@troff (@MAN1EXT@),
+.IR groff_out (@MAN5EXT@),
+.IR tex (1),
+.IR gs (1),
+.IR ps2eps (1),
+.IR pstopnm (1),
+.IR ps2epsi (1),
+.IR pnm (5)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.man
index d8bda54..b41ff60 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -71,12 +71,12 @@
 .\" ====================================================================
 .
 This file documents the GNU version of
-.IR refer , \" generic
+.IR \%refer , \" generic
 which is part of the
 .I groff (@MAN1EXT@)
 document formatting system.
 .
-.I @g@refer
+.I \%@g@refer
 copies the contents of
 .I file
 \&.\|.\|.\& to the standard output stream,
@@ -107,7 +107,7 @@ A combination of these alternatives is also possible.
 .
 .LP
 For each citation,
-.I @g@refer
+.I \%@g@refer
 can produce a mark in the text.
 .
 This mark consists of some label which can be separated from the text
@@ -119,7 +119,7 @@ language commands that can be used by a macro package to 
produce a
 formatted reference for each citation.
 .
 The output of
-.I @g@refer
+.I \%@g@refer
 must therefore be processed using a suitable macro package,
 such as
 .IR ms ,
@@ -144,10 +144,10 @@ The interpretation of lines between
 and
 .B .R2
 as commands is a new feature of GNU
-.IR refer . \" GNU
+.IR \%refer . \" GNU
 .
 Documents making use of this feature can still be processed by AT&T
-.I refer \" AT&T
+.I \%refer \" AT&T
 just by adding the lines
 .
 .RS
@@ -161,7 +161,7 @@ just by adding the lines
 to the beginning of the document.
 .
 This will cause
-.I @g@troff (@MAN1EXT@)
+.I \%@g@troff (@MAN1EXT@)
 to ignore everything between
 .B .R1
 and
@@ -170,18 +170,18 @@ and
 The effect of some commands can also be achieved by options.
 .
 These options are supported mainly for compatibility with AT&T
-.IR refer . \" AT&T
+.IR \%refer . \" AT&T
 .
 It is usually more convenient to use commands.
 .
 .
 .LP
-.I @g@refer
+.I \%@g@refer
 generates
 .B .lf
 requests so that file names and line numbers in messages produced by
 commands that read
-.I @g@refer
+.I \%@g@refer
 output will be correct;
 it also interprets lines beginning with
 .B .lf
@@ -189,7 +189,7 @@ so that file names and line numbers in the messages and
 .B .lf
 lines that it produces will be accurate even if the input has been
 preprocessed by a command such as
-.IR @g@soelim (@MAN1EXT@).
+.IR \%@g@soelim (@MAN1EXT@).
 .
 .
 .\" ====================================================================
@@ -647,7 +647,7 @@ component is a list of non-alphanumeric characters each of 
which
 modifies the treatment of this particular citation.
 .
 AT&T
-.I refer .\" AT&T
+.I \%refer \" AT&T
 will treat these flags as part of the keywords and so will ignore them
 since they are non-alphanumeric.
 .
@@ -1042,7 +1042,7 @@ For each
 if an index
 .IB file @INDEX_SUFFIX@
 created by
-.IR @g@indxbib (@MAN1EXT@)
+.IR \%@g@indxbib (@MAN1EXT@)
 exists,
 then it will be searched instead;
 each index can cover multiple databases.
@@ -1090,7 +1090,7 @@ The default database should be searched.
 This is the default behavior,
 so the negative version of this command is more useful.
 .
-.I @g@refer
+.I \%@g@refer
 determines whether the default database should be searched
 on the first occasion that it needs to do a search.
 .
@@ -1792,7 +1792,7 @@ Index files.
 .
 .
 .LP
-.I @g@refer
+.I \%@g@refer
 uses temporary files.
 .
 See the
@@ -1823,9 +1823,9 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.BR @g@indxbib (@MAN1EXT@),
-.BR @g@lookbib (@MAN1EXT@),
-.BR lkbib (@MAN1EXT@)
+.IR \%@g@indxbib (@MAN1EXT@),
+.IR \%@g@lookbib (@MAN1EXT@),
+.IR \%lkbib (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.1.man
index c72696e..4238fb6 100644
--- a/src/preproc/soelim/soelim.1.man
+++ b/src/preproc/soelim/soelim.1.man
@@ -71,7 +71,7 @@
 .SH Description
 .\" ====================================================================
 .
-.I @g@soelim
+.I \%@g@soelim
 replaces lines of the form
 .RB \[lq] .so
 .IR macro-file \[rq]
@@ -88,7 +88,7 @@ need to be preprocessed.
 Output is written to the standard output stream.
 .
 Normally,
-.I @g@soelim
+.I \%@g@soelim
 should be invoked with
 .IR groff 's
 .B \-s
@@ -121,7 +121,7 @@ Any other escape sequence in
 including
 .RB \[lq] \[rs][rs] \[rq],
 makes
-.I @g@soelim
+.I \%@g@soelim
 ignore the whole line.
 .
 .
@@ -135,7 +135,7 @@ only
 will interpret the
 .B .so
 request;
-.I @g@soelim
+.I \%@g@soelim
 will ignore it
 (but see the
 .B \-C
@@ -162,9 +162,9 @@ and
 are used;
 on this system,
 the GNU versions are installed as
-.I @g@soelim
+.I \%@g@soelim
 and
-.IR @g@troff .
+.IR \%@g@troff .
 .\}
 .
 .
@@ -219,14 +219,14 @@ files sourced with
 are normally read
 .I only
 by
-.I @g@troff
+.I \%@g@troff
 (the actual formatter).
 .
-.I @g@soelim
+.I \%@g@soelim
 is
 .I not
 required for
-.I @g@troff
+.I \%@g@troff
 to source files.
 .
 .
@@ -236,7 +236,7 @@ it must already be read
 .I before
 the input file passes through the preprocessor.
 .
-.I @g@soelim
+.I \%@g@soelim
 handles this.
 .
 .PP
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index 56a60eb..0a95586 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -198,7 +198,7 @@ Use
 .I x
 .RI and\~ y
 as start and end delimiters for
-.BR @g@eqn (@MAN1EXT@).
+.IR \%@g@eqn (@MAN1EXT@).
 .
 .TP
 .B doublebox
@@ -253,7 +253,7 @@ Don't use diversions to prevent page breaks
 only).
 .
 Normally
-.I @g@tbl
+.I \%@g@tbl
 attempts to prevent undesirable breaks in boxed tables by using
 diversions.
 .
@@ -456,11 +456,11 @@ there is no extra indentation.
 .IP
 Using equations
 (to be processed with
-.IR @g@eqn )
+.IR \%@g@eqn )
 within columns which use the
 .BR N \~specifier
 is problematic in most cases due to
-.IR @g@tbl 's
+.IR \%@g@tbl 's
 algorithm for finding the vertical alignment,
 as described above.
 .
@@ -469,7 +469,7 @@ Using the global
 option,
 however,
 it is possible to make
-.I @g@tbl
+.I \%@g@tbl
 ignore the data within
 .I eqn
 delimiters for that purpose.
@@ -721,7 +721,7 @@ No effect if the corresponding table entry isn't a text 
block.
 .BR w , W
 Minimum column width value.
 Must be followed either by a
-.IR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 width expression in parentheses or a unitless integer.
 .
 If no unit is given, en units are used.
@@ -805,7 +805,7 @@ concatenation).
 .
 .LP
 Note that
-.I @g@tbl
+.I \%@g@tbl
 computes the column widths line by line, applying \[rs]w on each entry
 which isn't a text block.
 .
@@ -952,13 +952,13 @@ macro.
 .
 .
 .\" ====================================================================
-.SS "Interaction with @g@eqn"
+.SS "Interaction with \%@g@eqn"
 .\" ====================================================================
 .
-.BR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 should always be called before
-.BR @g@eqn (@MAN1EXT@)
-.RB ( groff (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
+.RI ( groff (@MAN1EXT@)
 automatically takes care of the correct order of preprocessors).
 .
 .
@@ -986,14 +986,14 @@ Numeric and alphabetic items may span horizontally.
 .
 .
 .LP
-.B @g@tbl
+.I \%@g@tbl
 uses register,
 string,
 macro and diversion names beginning with the
 .RB digit\~ 3 .
 .
 When using
-.B @g@tbl
+.I \%@g@tbl
 you should avoid using any names beginning with
 .RB a\~ 3 .
 .
@@ -1003,7 +1003,7 @@ you should avoid using any names beginning with
 .\" ====================================================================
 .
 Since
-.B @g@tbl
+.I \%@g@tbl
 defines its own macros (right before each table) it is necessary to use
 an \[oq]end-of-macro\[cq] macro.
 .
@@ -1029,17 +1029,17 @@ Here an example.
 .
 .LP
 Note, however, that not all features of
-.I @g@tbl
+.I \%@g@tbl
 can be wrapped into a macro because
-.I @g@tbl
+.I \%@g@tbl
 sees the input earlier than
-.IR @g@troff .
+.IR \%@g@troff .
 .
 For example,
 number formatting with vertically aligned decimal points fails if those
 numbers are passed on as macro parameters because decimal point
 alignment is handled by
-.I @g@tbl
+.I \%@g@tbl
 itself:
 it only sees
 .BR \[rs]$1 ,
@@ -1294,8 +1294,8 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@)
+.IR groff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 3d86b2e..eb1e64b 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -122,18 +122,18 @@ displays a usage message and exits.
 As
 .B groff
 is a wrapper program for
-.B @g@troff
+.I \%@g@troff
 both programs share a set of options.
 .
 But the
 .B groff
 program has some additional, native options and gives a new meaning to
 some
-.B @g@troff
+.I \%@g@troff
 options.
 .
 On the other hand, not all
-.B @g@troff
+.I \%@g@troff
 options can be fed into
 .BR groff .
 .
@@ -143,7 +143,7 @@ options can be fed into
 .\" ====================================================================
 .
 The following options either do not exist for
-.B @g@troff
+.I \%@g@troff
 or are differently interpreted by
 .BR groff .
 .
@@ -162,13 +162,13 @@ Implies
 .TP
 .B \-e
 Preprocess with
-.BR @g@eqn .
+.IR \%@g@eqn .
 .
 .
 .TP
 .B \-g
 Preprocess with
-.BR @g@grn .
+.IR \%@g@grn .
 .
 .
 .TP
@@ -183,7 +183,7 @@ Implies
 .TP
 .B \-I\~ dir
 Works as
-.IR @g@troff 's
+.IR \%@g@troff 's
 option
 (see below),
 but also implies
@@ -197,7 +197,7 @@ options to
 .TP
 .B \-j
 Preprocess with
-.BR @g@chem .
+.IR \%@g@chem .
 .
 Implies
 .BR \-p .
@@ -277,13 +277,13 @@ delimiters.
 This is the same as the
 .B \-N
 option in
-.BR @g@eqn .
+.IR \%@g@eqn .
 .
 .
 .TP
 .B \-p
 Preprocess with
-.BR @g@pic .
+.IR \%@g@pic .
 .
 .
 .TP
@@ -335,12 +335,12 @@ is equivalent to
 .TP
 .B \-R
 Preprocess with
-.BR @g@refer .
+.IR \%@g@refer .
 .
 No mechanism is provided for passing arguments to
-.B @g@refer
+.I \%@g@refer
 because most
-.B @g@refer
+.I \%@g@refer
 options have equivalent language elements that can be specified within
 the document.
 .
@@ -352,7 +352,7 @@ for more details.
 .TP
 .B \-s
 Preprocess with
-.BR @g@soelim .
+.IR \%@g@soelim .
 .
 .
 .TP
@@ -362,9 +362,9 @@ Safer mode.
 Pass the
 .B \-S
 option to
-.B @g@pic
+.I \%@g@pic
 and disable the following
-.B @g@troff
+.I \%@g@troff
 requests:
 .BR .open ,
 .BR .opena ,
@@ -379,7 +379,7 @@ For security reasons, safer mode is enabled by default.
 .TP
 .B \-t
 Preprocess with
-.BR @g@tbl .
+.IR \%@g@tbl .
 .
 .
 .TP
@@ -388,7 +388,7 @@ Set output device to
 .IR dev .
 .
 For this device,
-.B @g@troff
+.I \%@g@troff
 generates the
 .I intermediate
 .IR output ;
@@ -398,7 +398,7 @@ see
 Then
 .B groff
 calls a postprocessor to convert
-.BR @g@troff 's
+.IR \%@g@troff 's
 .I intermediate output
 to its final format.
 .
@@ -418,7 +418,7 @@ html
 .TQ
 xhtml
 HTML and XHTML output (preprocessors are
-.B @g@soelim
+.I \%@g@soelim
 and
 .BR \%pre-grohtml ,
 postprocessor is
@@ -588,7 +588,7 @@ groff \-X \-P\-resolution \-P100 \-man foo.1
 .TP
 .B \-z
 Suppress output generated by
-.BR @g@troff .
+.IR \%@g@troff .
 .
 Only error messages are printed.
 .
@@ -600,7 +600,7 @@ Do not automatically postprocess
 in the usual manner.
 .
 This will cause the
-.B @g@troff
+.I \%@g@troff
 .I output
 to appear on standard output,
 replacing the usual postprocessor output; see
@@ -613,13 +613,13 @@ replacing the usual postprocessor output; see
 .
 The following options are transparently handed over to the formatter
 program
-.B @g@troff
+.I \%@g@troff
 that is called by
 .B groff
 subsequently.
 .
 These options are described in more detail in
-.BR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 .TP
 .B \-a
@@ -725,7 +725,7 @@ Enable warning
 .IR name .
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 for names.
 .
 .TP
@@ -734,7 +734,7 @@ disable warning
 .IR name .
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 for names.
 .
 .
@@ -827,7 +827,7 @@ groff \-Tps \-P\-pa4 \-P\-l ...
 The
 .B groff
 program is a wrapper around the
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 program.
 .
 It allows one to specify the preprocessors by command-line options and
@@ -861,21 +861,21 @@ The standard preprocessors distributed with the
 package are
 .
 .TP
-.BR @g@eqn (@MAN1EXT@)
+.IR \%@g@eqn (@MAN1EXT@)
 for mathematical formulae,
 .
 .TP
-.BR @g@grn (@MAN1EXT@)
+.IR \%@g@grn (@MAN1EXT@)
 for including
 .BR gremlin (1)
 pictures,
 .
 .TP
-.BR @g@pic (@MAN1EXT@)
+.IR \%@g@pic (@MAN1EXT@)
 for drawing diagrams,
 .
 .TP
-.BR @g@chem (@MAN1EXT@)
+.IR \%@g@chem (@MAN1EXT@)
 for chemical structure diagrams,
 .
 .TP
@@ -890,7 +890,7 @@ for including macro files from standard locations,
 and
 .
 .TP
-.BR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 for tables.
 .
 .P
@@ -1104,7 +1104,7 @@ The central
 formatter within the
 .I groff
 system is
-.BR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 It provides the features of both the classical
 .I troff
@@ -1117,7 +1117,7 @@ extensions.
 The command-line option
 .B \-C
 switches
-.B @g@troff
+.I \%@g@troff
 into
 .I "compatibility mode"
 which tries to emulate classical
@@ -1127,7 +1127,7 @@ as much as possible.
 .
 .P
 There is a shell script
-.BR @g@nroff (@MAN1EXT@)
+.IR \%@g@nroff (@MAN1EXT@)
 that emulates the behavior of classical
 .BR nroff .
 .
@@ -1527,7 +1527,7 @@ A list of directories in which to search for the
 directory in addition to the default ones.
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
 .BR \%groff_font (@MAN5EXT@)
 for more details.
@@ -1539,7 +1539,7 @@ A list of directories in which to search for macro files 
in addition
 to the default directories.
 .
 See
-.BR @g@troff (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@)
 and
 .BR \%groff_tmac (@MAN5EXT@)
 for more details.
@@ -1593,7 +1593,7 @@ This device name is overwritten by the option
 The following example illustrates the power of the
 .I groff
 program as a wrapper around
-.IR @g@troff .
+.IR \%@g@troff .
 .
 .
 .P
@@ -1812,7 +1812,7 @@ Initialization file for
 .IR troff .
 .
 This is interpreted by
-.B @g@troff
+.I \%@g@troff
 before reading the macro sets and any input.
 .
 .
@@ -1839,7 +1839,7 @@ Macro file for macro package
 This contains all information related to output devices.
 .
 Note that more than a single directory is searched for those files; see
-.BR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 For the
 .I groff
@@ -1976,21 +1976,21 @@ Introduction, history, and further reading:
 .
 .
 .TP
-.RI "Viewer for\~" groff "\~(and AT&T device-independent\~" troff \
+.RI "Viewer for\~" groff "\~(and AT&T device-independent)\~" troff \
 \~documents:
 .IR gxditview (@MAN1EXT@) \" #33
 .
 .
 .TP
 Preprocessors:
-.IR @g@chem (@MAN1EXT@), \" #1
-.IR @g@eqn (@MAN1EXT@), \" #34
-.IR @g@neqn (@MAN1EXT@), \" #35
+.IR \%@g@chem (@MAN1EXT@), \" #1
+.IR \%@g@eqn (@MAN1EXT@), \" #34
+.IR \%@g@neqn (@MAN1EXT@), \" #35
 .IR \%glilypond (@MAN1EXT@), \" #4
-.IR @g@grn (@MAN1EXT@), \" #36
+.IR \%@g@grn (@MAN1EXT@), \" #36
 .IR \%preconv (@MAN1EXT@), \" #38
 .IR gperl (@MAN1EXT@), \" #5
-.IR @g@pic (@MAN1EXT@), \" #37
+.IR \%@g@pic (@MAN1EXT@), \" #37
 .IR gpinyin (@MAN1EXT@), \" #6
 .IR \%@g@refer (@MAN1EXT@), \" #39
 .IR \%@g@soelim (@MAN1EXT@), \" #40
@@ -2038,7 +2038,7 @@ Intermediate output language:
 .
 .TP
 Formatter program:
-.IR @g@troff (@MAN1EXT@) \" #45
+.IR \%@g@troff (@MAN1EXT@) \" #45
 .
 .
 .TP
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.1.man
index d64e2a2..44d1497 100644
--- a/src/roff/grog/grog.1.man
+++ b/src/roff/grog/grog.1.man
@@ -67,12 +67,12 @@ grog \- \(lqgroff guess\(rq\(eminfer a document's groff 
command
 .SH Description
 .\" ====================================================================
 .
-.B grog
+.I grog
 reads the input (file names or standard input) and guesses which of
 the
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 options are needed to perform the input with the
-.B groff
+.I groff
 program.
 .
 .
@@ -89,19 +89,21 @@ reads the standard input stream.
 .P
 A suitable device is now always written as
 .BI \-T device
-including the groff default as
+including the
+.I groff
+default of
 .BR "\-T ps" .
 .
 .
 .P
 The corresponding
-.B groff
+.I groff
 command is usually displayed in standard output.
 .
 With the option
 .BR \-\-run ,
 the generated line is output into standard error and the generated
-.B groff
+.I groff
 command is run on the
 .IR "standard output" .
 .
@@ -127,7 +129,7 @@ all exit afterward.
 this option means enabling the
 .I groff
 compatibility mode, which is also transfered to the generated
-.B groff
+.I groff
 command line.
 .
 .TP
@@ -153,7 +155,7 @@ All other specified short options (words starting with one 
minus
 character
 .BR \- )
 are interpreted as
-.B groff
+.I groff
 options or option clusters with or without argument.
 .
 No space is allowed between options and their argument.
@@ -162,22 +164,22 @@ Except from the
 .BI \-m arg
 options, all options will be passed on, i.e.\& they are included
 unchanged in the command for the output without effecting the work of
-.BR grog .
+.IR grog .
 .
 .
 .\" ====================================================================
 .SH Details
 .\" ====================================================================
 .
-.B grog
+.I grog
 reads all
 .I file
 parameters as a whole.
 .
 It tries to guess which of the following
-.B groff
+.I groff
 options are required for running the input under
-.BR groff :
+.IR groff :
 .BR \-e ,
 .BR \-g ,
 .BR \-G ,
@@ -202,7 +204,7 @@ and
 .
 .P
 The guessed
-.B groff
+.I groff
 command including those options and the found
 .I file
 parameters is put on the standard output.
@@ -210,7 +212,7 @@ parameters is put on the standard output.
 .
 .P
 It is possible to specify arbitrary
-.B groff
+.I groff
 options on the command line.
 .
 These are passed on the output without change, except for the
@@ -220,13 +222,13 @@ options.
 .
 .P
 The
-.B groff
+.I groff
 program has trouble when the wrong
 .BI \-m arg
 option or several of these options are specified.
 .
 In these cases,
-.B grog
+.I grog
 will print an error message and exit with an error code.
 .
 It is better to specify no
@@ -242,7 +244,7 @@ does not find any of these options or the same option is 
found.
 If several different
 .BI \-m arg
 options are found by
-.B grog
+.I grog
 an error message is produced and the program is terminated with an
 error code.
 .
@@ -258,7 +260,7 @@ file can also be written in the
 .I groff
 language without any macro package.
 .
-.B grog
+.I grog
 will produce an output without an
 .BI \-m arg
 option.
@@ -266,7 +268,7 @@ option.
 .
 .P
 As
-.B groff
+.I groff
 also works with pure text files without any
 .I roff
 requests,
@@ -295,7 +297,7 @@ groff \-me meintro.me
 .RE
 .
 So
-.B grog
+.I grog
 recognized that the file
 .B meintro.me
 is written with the
@@ -321,7 +323,7 @@ groff \-p \-t \-e \-ms pic.ms
 .
 Besides determining the macro package
 .BR \-ms ,
-.B grog
+.I grog
 recognized that the file
 .B pic.ms
 additionally needs
@@ -349,7 +351,7 @@ grog meintro.me pic.ms
 .RE
 .
 an error message is sent to standard error because
-.B groff
+.I groff
 cannot work with two different macro packages:
 .
 .RS
@@ -379,9 +381,9 @@ grog \-ksS \-Tdvi grnexmpl.g
 .RE
 .
 contains several
-.B groff
+.I groff
 options that are just passed on the output without any interface to
-.BR grog .
+.IR grog .
 These are the option cluster
 .B \-ksS
 consisting of
@@ -402,11 +404,11 @@ groff \-k \-s \-S \-Tdvi grnexmpl.g
 .RE
 .
 so no additional option was added by
-.BR grog .
+.IR grog .
 As no option
 .BI \-m arg
 was found by
-.B grog
+.I grog
 this file does not use a macro package.
 .
 .
@@ -421,18 +423,14 @@ The current Perl implementation was written by
 .MT groff\-bernd\:.warken\-72@\:web\:.de
 Bernd Warken
 .ME
-with contributions from Ralph Corderoy,
-and is maintained by
-.MT wl@\:gnu\:.org
-Werner Lemberg
-.ME .
+with contributions from Ralph Corderoy.
 .
 .
 .\" ====================================================================
 .SH "See Also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@)
+.IR groff (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index ac773ce..84f5fe3 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -88,7 +88,7 @@
 .SH Description
 .\" ====================================================================
 .
-.I @g@nroff
+.I \%@g@nroff
 formats documents written in the
 .IR roff (@MAN7EXT@)
 language for typewriter-like devices such as terminal emulators.
@@ -102,7 +102,7 @@ emulates the AT&T
 command using
 .IR groff (@MAN1EXT@).
 .
-.I @g@nroff
+.I \%@g@nroff
 generates output via
 .IR grotty (@MAN1EXT@),
 .IR groff 's
@@ -127,7 +127,7 @@ environment variable nor the
 command-line option
 (which overrides the environment variable)
 specifies a (valid) device,
-.I @g@nroff
+.I \%@g@nroff
 consults the locale to select an appropriate output device.
 .
 It first tries the
@@ -161,7 +161,7 @@ The
 and
 .B \-W
 options have the effect described in
-.IR @g@troff (@MAN1EXT@).
+.IR \%@g@troff (@MAN1EXT@).
 .
 .B \-c
 and
@@ -196,7 +196,7 @@ The options
 .
 .B \-V
 causes
-.I @g@nroff
+.I \%@g@nroff
 to display the constructed
 .I groff
 command on the standard output,
@@ -278,7 +278,7 @@ are loaded to replace unrepresentable glyphs.
 .\" ====================================================================
 .
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
 .IR grotty (@MAN1EXT@),
 .IR locale (1),
 .IR roff (@MAN7EXT@)
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 36dd3ae..1a9c640 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -120,7 +120,7 @@ Print a backtrace with each warning or error message.
 This backtrace should help track down the cause of the error.
 .
 The line numbers given in the backtrace may not always be correct, for
-.IR @g@troff 's
+.IR \%@g@troff 's
 idea of line numbers gets confused by
 .B .as
 or
@@ -158,7 +158,7 @@ must be a one letter name.
 .TP
 .B \-E
 Inhibit
-.I @g@troff
+.I \%@g@troff
 error messages;
 implies
 .B \-Ww.
@@ -286,7 +286,7 @@ means print every page up to
 means print every page from
 .IR n .
 .
-.B @g@troff
+.I \%@g@troff
 will exit after printing the last page in the list.
 .
 .TP
@@ -382,7 +382,7 @@ Suppress formatted output.
 .\" ====================================================================
 .
 The warnings that can be given by
-.B @g@troff
+.I \%@g@troff
 are divided into the following categories.
 .
 The name associated with each warning is used by the
@@ -588,7 +588,7 @@ All warnings.
 A colon separated list of directories in which to search for
 macro files.
 .
-.B @g@troff
+.I \%@g@troff
 will scan directories given in the
 .B \-M
 option before these, and in standard directories (current directory if
@@ -608,7 +608,7 @@ A colon separated list of directories in which to search 
for the
 .IR dev name
 directory.
 .
-.B @g@troff
+.I \%@g@troff
 will scan directories given in the
 .B \-F
 option before these, and in standard directories
@@ -672,7 +672,7 @@ necessary.
 .\" ====================================================================
 .
 The GNU version of
-.I troff
+.I troff \" generic
 was originally written by James Clark;
 he also wrote the original version of this document,
 which was modified by
@@ -711,7 +711,7 @@ From the command line, this is called by
 .RE
 .
 .TP
-.BR \%groff_diff (@MAN7EXT@)
+.IR groff_diff (@MAN7EXT@)
 The differences of the
 .I groff
 language and the
@@ -723,7 +723,7 @@ Currently, this is the most actual document of the
 system.
 .
 .TP
-.BR roff (@MAN7EXT@)
+.IR roff (@MAN7EXT@)
 An overview over
 .I groff
 and other
diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index d6780c1..ec7c23b 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -375,7 +375,7 @@ Roman font files distributed with
 were created with
 .B \-i0\ \-m
 to improve spacing with
-.IR @g@eqn (@MAN1EXT@).
+.IR \%@g@eqn (@MAN1EXT@).
 .
 .
 .TP
@@ -455,8 +455,7 @@ You can browse it interactively with \[lq]info 
\[aq](groff)Using
 .IR groff (@MAN1EXT@),
 .IR gropdf (@MAN1EXT@),
 .IR grops (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR perl (1)
+.IR groff_font (@MAN5EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/hpftodit/hpftodit.1.man 
b/src/utils/hpftodit/hpftodit.1.man
index 89e7758..ea751b6 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -67,7 +67,7 @@ hpftodit \- create font description files for use with groff 
\-Tlj4
 .SH Description
 .\" ====================================================================
 .
-.B hpftodit
+.I hpftodit
 creates a font file for use with a Hewlett-Packard LaserJet\~\%4-series
 (or newer) printer with
 .BR "groff \-Tlj4" ,
@@ -101,7 +101,7 @@ are the
 .I groff
 names of the character
 (see
-.BR groff_char (@MAN7EXT@)
+.IR groff_char (@MAN7EXT@)
 for a list).
 .
 The values can be separated by any whitespace;
@@ -130,7 +130,7 @@ If the given Unicode value is in the Private Use Area
 the glyph is included as an unnamed glyph.
 .
 Refer to
-.BR groff_diff (@MAN1EXT@)
+.IR groff_diff (@MAN1EXT@)
 for additional information about unnamed glyphs and how to access them.
 .
 .
@@ -357,9 +357,10 @@ Warnings never are given for unnamed glyphs or by glyphs 
named by their
 Unicode values.
 .
 This option is useful when sending the output of
-.B hpftodit
+.I hpftodit
 to the standard output.
 .
+.
 .TP
 .B \-s
 The font is special.
@@ -411,11 +412,11 @@ symbol mapping files
 .SH "See Also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR groff_diff (@MAN1EXT@),
-.BR grolj4 (@MAN1EXT@),
-.BR groff_font (@MAN5EXT@),
-.BR lj4_font (@MAN5EXT@)
+.IR groff (@MAN1EXT@),
+.IR groff_diff (@MAN1EXT@),
+.IR grolj4 (@MAN1EXT@),
+.IR groff_font (@MAN5EXT@),
+.IR lj4_font (@MAN5EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.1.man
index 070adea..fa1c11e 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -68,14 +68,14 @@
 .SH Description
 .\" ====================================================================
 .
-.B @g@indxbib
+.I \%@g@indxbib
 makes an inverted index for the bibliographic databases in
 .IR filename \|.\|.\|.
 for use with
-.BR @g@refer (@MAN1EXT@),
-.BR @g@lookbib (@MAN1EXT@),
+.IR \%@g@refer (@MAN1EXT@),
+.IR \%@g@lookbib (@MAN1EXT@),
 and
-.BR lkbib (@MAN1EXT@).
+.IR \%lkbib (@MAN1EXT@).
 .
 The index will be named
 .RI filename @INDEX_SUFFIX@ ;
@@ -153,12 +153,13 @@ Use
 .I dir
 as the pathname of the current working directory to store in the index,
 instead of the path printed by
-.BR pwd (1).
+.IR pwd (1).
 .
 Usually
 .I dir
 will be a symbolic link that points to the directory printed by
-.BR pwd (1).
+.IR pwd (1).
+.
 .
 .TP
 .BI \-f file
@@ -195,7 +196,7 @@ Larger values of
 will usually make searching faster,
 but will make the index larger
 and
-.B @g@indxbib
+.I \%@g@indxbib
 use more memory.
 .
 Initially
@@ -286,9 +287,9 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.BR @g@refer (@MAN1EXT@),
-.BR lkbib (@MAN1EXT@),
-.BR @g@lookbib (@MAN1EXT@)
+.IR \%@g@refer (@MAN1EXT@),
+.IR \%lkbib (@MAN1EXT@),
+.IR \%@g@lookbib (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index 5432e3f..dbe13a6 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -83,7 +83,7 @@ to be searched,
 if an index
 .RI filename @INDEX_SUFFIX@
 created by
-.IR @g@indxbib (@MAN1EXT@)
+.IR \%@g@indxbib (@MAN1EXT@)
 exists, then it will be searched instead;
 each index can cover multiple databases.
 .
@@ -167,9 +167,9 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.IR @g@refer (@MAN1EXT@),
-.IR @g@lookbib (@MAN1EXT@),
-.IR @g@indxbib (@MAN1EXT@)
+.IR \%@g@refer (@MAN1EXT@),
+.IR \%@g@lookbib (@MAN1EXT@),
+.IR \%@g@indxbib (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.1.man
index 4b2ab4f..2654060 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -59,7 +59,7 @@
 .SH Description
 .\" ====================================================================
 .
-.I @g@lookbib
+.I \%@g@lookbib
 prints a prompt on the standard error (unless the standard input is not
 a terminal),
 reads from the standard input a line containing a set of keywords,
@@ -75,7 +75,7 @@ to be searched,
 if an index
 .RI filename @INDEX_SUFFIX@
 created by
-.IR @g@indxbib (@MAN1EXT@)
+.IR \%@g@indxbib (@MAN1EXT@)
 exists, then it will be searched instead;
 each index can cover multiple databases.
 .
@@ -132,9 +132,9 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.IR @g@refer (@MAN1EXT@),
+.IR \%@g@refer (@MAN1EXT@),
 .IR lkbib (@MAN1EXT@),
-.IR @g@indxbib (@MAN1EXT@)
+.IR \%@g@indxbib (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.1.man
index e6f93cf..a025e91 100644
--- a/src/utils/pfbtops/pfbtops.1.man
+++ b/src/utils/pfbtops/pfbtops.1.man
@@ -71,6 +71,7 @@ PostScript fonts for MS-DOS are normally supplied in PFB 
format.
 .
 .LP
 The resulting ASCII format PostScript font can be used with groff,
+.IR groff (@MAN1EXT@)
 if it is first listed in
 .I \%@FONTDIR@/\:devps/\:download
 and
diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in
index 8b45f7c..8a7b10d 100644
--- a/tmac/groff_man.7.man.in
+++ b/tmac/groff_man.7.man.in
@@ -1857,7 +1857,7 @@ check,
 or which is developed in the future.
 .
 The table preprocessor
-.IR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 can likely meet your needs.
 _endif()dnl
 .
@@ -2006,9 +2006,9 @@ _endif()dnl
 .\" ====================================================================
 .
 When a preprocessor like
-.I @g@tbl
+.I \%@g@tbl
 or
-.I @g@eqn
+.I \%@g@eqn
 is needed,
 a hint can be given to the man page formatter by making the first line
 of a man page look like this:
@@ -2031,12 +2031,12 @@ The
 .I word
 consists of one letter for each needed preprocessor:
 \(lqe\(rq for
-.IR @g@eqn ,
+.IR \%@g@eqn ,
 \(lqr\(rq for
-.IR @g@refer ,
+.IR \%@g@refer ,
 and
 \(lqt\(rq for
-.IR @g@tbl .
+.IR \%@g@tbl .
 .
 Modern implementations of the
 .I man
@@ -2684,7 +2684,7 @@ to express are likely to be lost.
 .
 If you feel tempted to use it,
 you should probably be composing a table using
-.IR @g@tbl (@MAN1EXT@)
+.IR \%@g@tbl (@MAN1EXT@)
 markup instead.
 .
 .
@@ -3464,10 +3464,10 @@ You can browse it interactively with \(lqinfo groff\(rq.
 .
 .
 .PP
-.IR @g@tbl (@MAN1EXT@),
-.IR @g@eqn (@MAN1EXT@),
+.IR \%@g@tbl (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
 and
-.IR @g@refer (@MAN1EXT@)
+.IR \%@g@refer (@MAN1EXT@)
 are preprocessors used with man pages.
 .
 .
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.7.man
index 0634147..940bcf5 100644
--- a/tmac/groff_me.7.man
+++ b/tmac/groff_me.7.man
@@ -483,11 +483,9 @@ documenting it while an undergraduate at the University of 
California.
 .SH "See Also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR troff (@MAN1EXT@)
+.IR groff (@MAN1EXT@),
+.IR troff (@MAN1EXT@)
 .
-.
-.PP
 Two manuals are available in source and rendered form.
 .
 On your system,
@@ -516,12 +514,12 @@ by Eric P.\& Allman and James Clark.
 For preprocessors supported by
 .IR me ,
 see
-.BR eqn (@MAN1EXT@),
-.BR grn (@MAN1EXT@),
-.BR pic (@MAN1EXT@),
-.BR refer (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
+.IR \%@g@grn (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@refer (@MAN1EXT@),
 and
-.BR tbl (@MAN1EXT@).
+.IR \%@g@tbl (@MAN1EXT@).
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 294d149..8e7856d 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -1120,7 +1120,7 @@ Denote a reference to be processed by the
 preprocessor.
 .
 The GNU
-.IR @g@refer (@MAN1EXT@)
+.IR \%@g@refer (@MAN1EXT@)
 manual page provides a comprehensive reference
 to the preprocessor and the format of the
 bibliographic database.
@@ -1831,11 +1831,11 @@ by Trent A.\& Fisher and Werner Lemberg
 .
 .PP
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
-.IR @g@tbl (@MAN1EXT@),
-.IR @g@pic (@MAN1EXT@),
-.IR @g@eqn (@MAN1EXT@),
-.IR @g@refer (@MAN1EXT@)
+.IR \%@g@troff (@MAN1EXT@),
+.IR \%@g@tbl (@MAN1EXT@),
+.IR \%@g@pic (@MAN1EXT@),
+.IR \%@g@eqn (@MAN1EXT@),
+.IR \%@g@refer (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index 7eb6019..3882c3b 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -45,8 +45,9 @@ groff_trace \- GNU roff macros for debugging groff documents
 The
 .I trace
 macro package of
-.BR groff (@MAN1EXT@)
-can be a valuable tool for debugging documents written in the roff
+.IR groff (@MAN1EXT@)
+can be a valuable tool for debugging documents written in the
+.I roff
 formatting language.
 .
 A call stack trace is protocolled on standard error, this is, a
@@ -258,7 +259,7 @@ macros are kept in the file
 located in the
 .IR "tmac directory" ;
 see
-.BR groff_tmac (@MAN5EXT@)
+.IR groff_tmac (@MAN5EXT@)
 for details.
 .
 .
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index 6ebe764..3ac5be5 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -739,7 +739,7 @@ Bernd Warken
 .\" ====================================================================
 .
 .IR groff (@MAN1EXT@),
-.IR @g@troff (@MAN1EXT@),
+.IR \%@g@troff (@MAN1EXT@),
 .IR \%grohtml (@MAN1EXT@),
 .IR netpbm (1)
 .



reply via email to

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