groff-commit
[Top][All Lists]
Advanced

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

[groff] 02/02: [man pages]: Migrate man(7) cross refs to `MR`.


From: G. Branden Robinson
Subject: [groff] 02/02: [man pages]: Migrate man(7) cross refs to `MR`.
Date: Thu, 7 Oct 2021 10:02:14 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 2ab0dacb95863a2e347d06cf970676c74c784ce2
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Oct 8 00:46:41 2021 +1100

    [man pages]: Migrate man(7) cross refs to `MR`.
    
     # Handle simplest case: ".IR foo (1)".
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) (\(@MAN[157]EXT@\))$/.MR \2 \3/
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) (\([1-8a-z]\+\))$/.MR \2 \3/
     # Handle case: trailing puncutation, e.g., ".IR foo (1),".
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) 
(\(@MAN[157]EXT@\))\([^[:space:]]\+\)/.MR \2 \3 \4/
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) 
(\([1-8a-z]\+\))\([^[:space:]]\+\)/.MR \2 \3 \4/
     # Handle case: 3rd+ arguments or trailing comments.  This case is rare
     # and will require manual fixup if there are 4+ arguments to MR.  Use
     # groff -man -rCHECKSTYLE=1 to have them automatically reported.
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) (\(@MAN[157]EXT@\))\( .*\)/.MR \2 
\3\4/
    s/^.[BI]R \(\\%\)*\([@_[:alnum:]\\-]\+\) (\([1-8a-z]\+\))\( .*\)/.MR \2 
\3\4/
---
 contrib/chem/chem.1.man                       |   4 +-
 contrib/eqn2graph/eqn2graph.1.man             |  18 +-
 contrib/gdiffmk/gdiffmk.1.man                 |  14 +-
 contrib/glilypond/glilypond.1.man             |  24 +-
 contrib/gperl/gperl.1.man                     |  18 +-
 contrib/gpinyin/gpinyin.1.man                 |  12 +-
 contrib/grap2graph/grap2graph.1.man           |  20 +-
 contrib/groff_filenames/groff_filenames.5.man |  22 +-
 contrib/hdtbl/groff_hdtbl.7.man               |  10 +-
 contrib/mm/groff_mm.7.man                     |  32 +--
 contrib/mm/groff_mmse.7.man                   |   4 +-
 contrib/mm/mmroff.1.man                       |  16 +-
 contrib/mom/groff_mom.7.man                   |   8 +-
 contrib/pdfmark/pdfroff.1.man                 |  18 +-
 contrib/pic2graph/pic2graph.1.man             |  20 +-
 contrib/rfc1345/groff_rfc1345.7.man           |  10 +-
 man/ditroff.7.man                             |  12 +-
 man/groff.7.man                               |  44 ++--
 man/groff_char.7.man                          |  26 +-
 man/groff_diff.7.man                          |  36 +--
 man/groff_font.5.man                          |  14 +-
 man/groff_out.5.man                           |  64 ++---
 man/groff_tmac.5.man                          |  82 +++---
 man/roff.7.man                                |  48 ++--
 src/devices/grodvi/grodvi.1.man               |  24 +-
 src/devices/grohtml/grohtml.1.man             |  22 +-
 src/devices/grolbp/grolbp.1.man               |  20 +-
 src/devices/grolj4/grolj4.1.man               |  16 +-
 src/devices/grolj4/lj4_font.5.man             |  14 +-
 src/devices/gropdf/gropdf.1.man               |  38 +--
 src/devices/gropdf/pdfmom.1.man               |  14 +-
 src/devices/grops/grops.1.man                 |  48 ++--
 src/devices/grotty/grotty.1.man               |  46 ++--
 src/devices/xditview/gxditview.1.man          |  24 +-
 src/preproc/eqn/eqn.1.man                     |  22 +-
 src/preproc/eqn/neqn.1.man                    |   4 +-
 src/preproc/grn/grn.1.man                     |  20 +-
 src/preproc/pic/pic.1.man                     |  36 +--
 src/preproc/preconv/preconv.1.man             |   8 +-
 src/preproc/refer/refer.1.man                 |  26 +-
 src/preproc/soelim/soelim.1.man               |  16 +-
 src/preproc/tbl/tbl.1.man                     |  22 +-
 src/roff/groff/groff.1.man                    | 346 +++++++++++++-------------
 src/roff/nroff/nroff.1.man                    |  28 +--
 src/roff/troff/troff.1.man                    |  28 +--
 src/utils/addftinfo/addftinfo.1.man           |   6 +-
 src/utils/afmtodit/afmtodit.1.man             |  18 +-
 src/utils/grog/grog.1.man                     |  16 +-
 src/utils/hpftodit/hpftodit.1.man             |  20 +-
 src/utils/indxbib/indxbib.1.man               |  16 +-
 src/utils/lkbib/lkbib.1.man                   |   8 +-
 src/utils/lookbib/lookbib.1.man               |   8 +-
 src/utils/pfbtops/pfbtops.1.man               |   6 +-
 src/utils/tfmtodit/tfmtodit.1.man             |   8 +-
 src/utils/xtotroff/xtotroff.1.man             |  12 +-
 tmac/groff_man.7.man.in                       |  54 ++--
 tmac/groff_me.7.man                           |  14 +-
 tmac/groff_ms.7.man                           |  22 +-
 tmac/groff_trace.7.man                        |  12 +-
 tmac/groff_www.7.man                          |   8 +-
 60 files changed, 813 insertions(+), 813 deletions(-)

diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index 7b6f1d5..45f21b4 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -888,8 +888,8 @@ AT&T Bell Laboratories Computing Science Techical Report 
No.\& 122
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @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 7ad7bf5..767c1e7 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -45,7 +45,7 @@ eqn2graph \- convert an eqn equation into a cropped image
 .
 .I eqn2graph
 reads a one-line
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @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.
@@ -57,7 +57,7 @@ The input EQN code should
 be preceded by the
 .B \&.EQ
 macro that normally precedes it within
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 macros;
 nor do you need to have dollar-sign or other delimiters around the
 equation.
@@ -73,7 +73,7 @@ equation.
 Arguments not recognized by
 .I eqn2graph
 are passed to the ImageMagick or GraphicsMagick program
-.IR \%convert (1).
+.MR convert 1 .
 .
 .
 By specifying these, you can give your image a border,
@@ -144,7 +144,7 @@ was written by
 Eric S.\& Raymond
 .ME ,
 based on a recipe for
-.IR pic2graph (@MAN1EXT@),
+.MR pic2graph @MAN1EXT@ ,
 by W.\& Richard Stevens.
 .
 .
@@ -152,11 +152,11 @@ by W.\& Richard Stevens.
 .SH "See also"
 .\" ====================================================================
 .
-.IR pic2graph (@MAN1EXT@),
-.IR grap2graph (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%convert (1)
+.MR pic2graph @MAN1EXT@ ,
+.MR grap2graph @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR convert 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.man
index f613319..9c9d1f9 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -72,7 +72,7 @@ gdiffmk \- mark differences between groff/nroff/troff files
 .
 .I gdiffmk
 compares two
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 documents,
 .I file1
 and
@@ -199,7 +199,7 @@ and
 In particular,
 .I diff-command
 should accept the GNU
-.IR diff (1)
+.MR diff 1
 .B \-D
 option.
 .
@@ -258,11 +258,11 @@ Mike Bianchi
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR nroff (@MAN1EXT@),
-.IR gtroff (@MAN1EXT@),
-.IR roff (@MAN7EXT@),
-.IR diff (@MAN1EXT@)
+.MR groff @MAN1EXT@ ,
+.MR nroff @MAN1EXT@ ,
+.MR gtroff @MAN1EXT@ ,
+.MR roff @MAN7EXT@ ,
+.MR 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 befd509..ed3c22e 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -95,11 +95,11 @@ glilypond \- embed LilyPond musical notation in groff 
documents
 transforms sheet music written in the
 .I lilypond
 language into the
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 language using the
 .B .PSPIC
 request, such that
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 can transform it into a format that can be displayed directly.
 .
 .B .PDFPIC
@@ -646,7 +646,7 @@ This mode is the actual default and can also be chosen by 
the option
 In this mode, the
 .B .ly
 files are transformed by the
-.BR lilypond (1)
+.MR lilypond 1
 program into
 .I PDF
 files, using
@@ -677,7 +677,7 @@ files into a
 file.
 .
 This is done by the
-.IR pdf2ps (1)
+.MR pdf2ps 1
 program using
 .RS
 .EX
@@ -696,7 +696,7 @@ file from the
 file.
 .
 This is done by the
-.IR ps2eps (1)
+.MR ps2eps 1
 program using
 .RS
 .EX
@@ -805,7 +805,7 @@ commands
 .\" ====================================================================
 .
 The new
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 structure generated by
 .I glilypond
 is either
@@ -813,7 +813,7 @@ is either
 .TP
 1)
 sent to standard output and can there be saved into a file or piped into
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 or
 .
 .TP
@@ -839,7 +839,7 @@ Bernd Warken
 .\" ====================================================================
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 describes the usage of the
 .I groff
 command and contains pointers to further documentation of the
@@ -848,21 +848,21 @@ system.
 .
 .
 .TP
-.IR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 describes the
 .B .PSPIC
 request.
 .
 .
 .TP
-.IR lilypond (1)
+.MR lilypond 1
 briefly describes the
 .I lilypond
 command and contains pointers to further documentation.
 .
 .
 .TP
-.IR pdf2ps (1)
+.MR pdf2ps 1
 transforms a
 .I PDF
 file into a
@@ -871,7 +871,7 @@ format.
 .
 .
 .TP
-.IR ps2eps (1)
+.MR ps2eps 1
 transforms a
 .I PS
 file into an
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index 72767ad..ad90420 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -54,12 +54,12 @@ gperl \- execute Perl commands in groff documents
 .\" ====================================================================
 .
 This is a preprocessor for
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 It allows the use of
-.IR perl (7)
+.MR perl 7
 code in
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 files.
 .
 The result of a
@@ -232,7 +232,7 @@ is not really needed before the first
 command.
 .
 That suits to
-.IR groff (@MAN7EXT@),
+.MR groff @MAN7EXT@ ,
 because every output can be saved as
 .I groff
 string, but the number registers can be very restrictive.
@@ -446,18 +446,18 @@ Bernd Warken
 Man pages related to
 .I groff
 are
-.IR groff (@MAN1EXT@),
-.IR groff (@MAN7EXT@),
+.MR groff @MAN1EXT@ ,
+.MR groff @MAN7EXT@ ,
 and
-.IR grog (@MAN1EXT@).
+.MR grog @MAN1EXT@ .
 .
 .
 .P
 Documents related to
 .I Perl
 are
-.IR perl (1),
-.IR perl (7).
+.MR perl 1 ,
+.MR perl 7 .
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.1.man
index 8de7051..5d0477c 100644
--- a/contrib/gpinyin/gpinyin.1.man
+++ b/contrib/gpinyin/gpinyin.1.man
@@ -65,9 +65,9 @@ gpinyin \- use Hanyu Pinyin Chinese in groff documents
 .
 .I gpinyin
 is a preprocessor for
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 that facilitates use of Hanyu Pinyin in
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 files.
 .
 Pinyin is a method for writing the Mandarin Chinese language with the
@@ -320,18 +320,18 @@ from the CJK macro package for \*[TeX]
 .
 .
 .P
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 and
-.IR grog (@MAN1EXT@)
+.MR grog @MAN1EXT@
 explain how to view
 .I roff
 documents.
 .
 .
 .P
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 and
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 are comprehensive references covering the language elements of GNU
 .I troff \" GNU
 and the available glyph repertoire,
diff --git a/contrib/grap2graph/grap2graph.1.man 
b/contrib/grap2graph/grap2graph.1.man
index ee92454..c054aab 100644
--- a/contrib/grap2graph/grap2graph.1.man
+++ b/contrib/grap2graph/grap2graph.1.man
@@ -46,7 +46,7 @@ grap2graph \- convert a GRAP diagram into a cropped image
 .
 .I grap2graph
 reads a
-.IR grap (1)
+.MR grap 1
 program from the standard input and writes an image file,
 by default in Portable Network Graphics (PNG) format,
 to the standard output.
@@ -60,7 +60,7 @@ be wrapped with the
 and
 .B \&.G2
 macros that normally guard it within
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 documents.
 .
 .
@@ -74,7 +74,7 @@ documents.
 Arguments not recognized by
 .I grap2graph
 are passed to the ImageMagick or GraphicsMagick program
-.IR \%convert (1).
+.MR convert 1 .
 .
 .
 By specifying these, you can give your image a border,
@@ -160,7 +160,7 @@ was written by
 Eric S.\& Raymond
 .ME ,
 based on a recipe for
-.IR pic2graph (@MAN1EXT@),
+.MR pic2graph @MAN1EXT@ ,
 by W.\& Richard Stevens.
 .
 .
@@ -168,12 +168,12 @@ by W.\& Richard Stevens.
 .SH "See also"
 .\" ====================================================================
 .
-.IR pic2graph (@MAN1EXT@),
-.IR eqn2graph (@MAN1EXT@),
-.IR grap (1),
-.IR \%@g@pic (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%convert (1)
+.MR pic2graph @MAN1EXT@ ,
+.MR eqn2graph @MAN1EXT@ ,
+.MR grap 1 ,
+.MR @g@pic @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR convert 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/groff_filenames/groff_filenames.5.man 
b/contrib/groff_filenames/groff_filenames.5.man
index e8cb88e..b3dc2ec 100644
--- a/contrib/groff_filenames/groff_filenames.5.man
+++ b/contrib/groff_filenames/groff_filenames.5.man
@@ -551,7 +551,7 @@ Heidelberger tables, an alternative to the preprocessor
 .IR tbl .
 .
 See
-.BR groff_hdtbl (@MAN7EXT@).
+.MR groff_hdtbl @MAN7EXT@ .
 .
 .
 .TP
@@ -564,9 +564,9 @@ processor.
 .TP
 .IB <name> .grn
 for including
-.BR gremlin (@MAN1EXT@),
+.MR gremlin @MAN1EXT@ ,
 pictures, see
-.BR grn (@MAN1EXT@).
+.MR grn @MAN1EXT@ .
 .
 .
 .TP
@@ -595,18 +595,18 @@ Bernd Warken
 .
 .TP
 History and future
-.BR roff (@MAN7EXT@),
-.BR man\-pages (7),
-.BR groff_diff (@MAN7EXT@),
-.BR groff (@MAN7EXT@)
+.MR roff @MAN7EXT@ ,
+.MR man\-pages 7 ,
+.MR groff_diff @MAN7EXT@ ,
+.MR groff @MAN7EXT@
 .
 .
 .TP
 .I Compression
-.BR uncompress (1posix),
-.BR gzip2 (1),
-.BR bzip2 (1),
-.BR xz (1)
+.MR uncompress 1posix ,
+.MR gzip2 1 ,
+.MR bzip2 1 ,
+.MR xz 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.7.man
index 2a0a532..27d146c 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -186,14 +186,14 @@ An advantage of
 .I hdtbl
 is that the tables are constructed without calling a preprocessor;
 this means that
-.IR groff (@MAN7EXT@)'s
+.MR groff @MAN7EXT@ 's
 full macro capabilities are available.
 .
 On the other hand,
 table processing with
 .I hdtbl
 is much slower than using the
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 preprocessor.
 .
 A further advantage is that the HTML-like syntax of
@@ -1273,7 +1273,7 @@ Joachim Walsdorff
 .\" ====================================================================
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 provides an overview of GNU
 .I roff
 and details how to invoke
@@ -1282,14 +1282,14 @@ at the command line.
 .
 .
 .TP
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 summarizes the
 .I roff
 language and GNU extensions to it.
 .
 .
 .TP
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 describes the traditional
 .I roff
 preprocessor for tables.
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 22cfec6..5b9a03c 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -341,7 +341,7 @@ replacing the font at position\~2 with
 Because the cover sheet,
 memorandum type,
 and
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 integration macros explicitly request fonts named
 .BR B ,
 .BR I ,
@@ -1141,7 +1141,7 @@ Equation start.
 .
 .BR EQ / EN
 are the delimiters for equations written for
-.IR \%@g@eqn (@MAN1EXT@).
+.MR @g@eqn @MAN1EXT@ .
 .
 .BR EQ / EN
 must be inside of a
@@ -1924,10 +1924,10 @@ redirected into file
 .
 Requires two passes with groff;
 this is handled by a separate program called
-.IR mmroff (@MAN1EXT@).
+.MR mmroff @MAN1EXT@ .
 .
 This program exists because
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 by default deactivates the unsafe operations that are required by
 .BR INITR .
 .
@@ -2644,7 +2644,7 @@ on the first page.
 Include a PostScript file in the document.
 .
 The macro depends on
-.IR mmroff (@MAN1EXT@)
+.MR mmroff @MAN1EXT@
 and
 .BR INITR .
 .
@@ -2673,7 +2673,7 @@ can also be given to resize the picture.
 Picture end.
 .
 Ends a picture for
-.IR \%@g@pic (@MAN1EXT@).
+.MR @g@pic @MAN1EXT@ .
 .
 .TP
 .BI PF\  \fR[\fParg\fR]\fP
@@ -2733,7 +2733,7 @@ This macro defines string
 Picture start (from pic).
 .
 Begins a picture for
-.IR \%@g@pic (@MAN1EXT@).
+.MR @g@pic @MAN1EXT@ .
 .
 .TP
 .B PX
@@ -3229,7 +3229,7 @@ TPoh@argument of \fBOH\fP
 Table start.
 .
 This is the start of a table specification to
-.IR \%@g@tbl (@MAN1EXT@).
+.MR @g@tbl @MAN1EXT@ .
 .
 .B TS
 ends with
@@ -3299,7 +3299,7 @@ This adds four digit-sized spaces in the beginning of 
each line.
 Finer control is available through the string
 .BR Verbnm .
 It contains all arguments to the
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 command
 .BR .nm ,
 normally \[lq]1\[rq].
@@ -4365,13 +4365,13 @@ You can browse it interactively with \[lq]info 
groff\[rq].
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR \%@g@tbl (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
-.IR \%@g@refer (@MAN1EXT@),
-.IR groff_mmse (@MAN7EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR @g@tbl @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
+.MR @g@refer @MAN1EXT@ ,
+.MR 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 b16cb2c..e36ea2e 100644
--- a/contrib/mm/groff_mmse.7.man
+++ b/contrib/mm/groff_mmse.7.man
@@ -67,7 +67,7 @@ kan anv
 som argument.
 Detta ger ett svenskt f�rs�ttsblad.
 Se
-.IR groff_mm (@MAN7EXT@)
+.MR groff_mm @MAN7EXT@
 f�r �vriga detaljer.
 .
 .
@@ -152,7 +152,7 @@ J
 .SH "Se ocks�"
 .\" ====================================================================
 .
-.IR groff_mm (@MAN7EXT@)
+.MR 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 6365b35..a99df77 100644
--- a/contrib/mm/mmroff.1.man
+++ b/contrib/mm/mmroff.1.man
@@ -50,7 +50,7 @@ is a simple preprocessor for
 used for expanding cross references in
 .IR m@TMAC_M_PREFIX@m ;
 see
-.IR groff_mm (@MAN7EXT@).
+.MR groff_mm @MAN7EXT@ .
 .
 .I groff
 is executed twice,
@@ -94,13 +94,13 @@ Sweden.
 .SH "See also"
 .\" ====================================================================
 .
-.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@)
+.MR groff_mm @MAN7EXT@ ,
+.MR groff_mmse @MAN7EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR @g@tbl @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index a1cbee0..65a0428 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -109,7 +109,7 @@ documents with a minimum of typesetting intervention.
 .
 .P
 Files processed with
-.BR pdfmom (@MAN1EXT@)
+.MR pdfmom @MAN1EXT@
 with or without the
 .RI \-T ps
 option, produce
@@ -3397,9 +3397,9 @@ You can browse it interactively with \[lq]info groff\[rq].
 .
 .
 .P
-.IR pdfmom (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@)
+.MR pdfmom @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.man
index 0142c62..b92336e 100644
--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
@@ -82,7 +82,7 @@ pdfroff \- construct files in Portable Document Format using 
groff
 .P
 .I groff-option
 is any short option supported by
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 except for
 .BR \-h ,
 .BR \-T ,
@@ -121,7 +121,7 @@ For each invocation of
 the ultimate
 .I groff
 output stream is post-processed by the Ghostscript
-.IR gs (1)
+.MR gs 1
 interpreter to produce a finished PDF document.
 .
 .
@@ -216,7 +216,7 @@ Consequently,
 .I pdfroff
 accepts all options and arguments,
 as specified in
-.IR groff (@MAN1EXT@),
+.MR groff @MAN1EXT@ ,
 which may also be considered as the definitive reference for all
 standard
 .I pdfroff
@@ -293,7 +293,7 @@ see below.
 .
 .P
 See
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 for a description of all other short form options,
 which are
 transparently passed through
@@ -505,7 +505,7 @@ are not encouraged to do so).
 If unspecified,
 .I pdfroff
 uses
-.IR sed (@MAN1EXT@)
+.MR sed @MAN1EXT@
 by default,
 which normally suffices.
 .
@@ -552,7 +552,7 @@ It should not normally be necessary to specify
 .IR \%PDFROFF_KILL_NULL_PAGES .
 .
 The internal default is a
-.IR sed (@MAN1EXT@)
+.MR sed @MAN1EXT@
 script,
 which is intended to remove completely blank pages
 from the collated output stream,
@@ -561,7 +561,7 @@ and which should be appropriate in most applications of
 .
 However,
 if any alternative to
-.IR sed (@MAN1EXT@)
+.MR sed @MAN1EXT@
 is specified for
 .IR \%PDFROFF_COLLATE ,
 then it is likely that a corresponding alternative specification for
@@ -762,7 +762,7 @@ in or below the directory specified by environment variables
 (see section \[lq]Environment\[rq] above).
 .
 If
-.IR mktemp (@MAN1EXT@)
+.MR mktemp @MAN1EXT@
 is available,
 it is invoked to create a private subdirectory of
 the nominated temporary files directory,
@@ -912,7 +912,7 @@ provides a superset of all
 capabilities,
 the above manual,
 or its terser reference page,
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 may also be considered definitive references to all
 .I standard
 capabilities of
diff --git a/contrib/pic2graph/pic2graph.1.man 
b/contrib/pic2graph/pic2graph.1.man
index 128d48a..1c47a57 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -48,13 +48,13 @@ pic2graph \- convert a PIC diagram into a cropped image
 .
 .I pic2graph
 reads a
-.IR \%@g@pic (@MAN1EXT@)
+.MR @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@)
+.MR @g@eqn @MAN1EXT@
 constructs, so it can be used for generating images of mathematical
 formulae.
 .
@@ -67,7 +67,7 @@ be wrapped with the
 and
 .B \&.PE
 macros that normally guard it within
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 documents.
 .
 .
@@ -81,7 +81,7 @@ documents.
 Arguments not recognized by
 .I pic2graph
 are passed to the ImageMagick or GraphicsMagick program
-.IR \%convert (1).
+.MR convert 1 .
 .
 .
 By specifying these, you can give your image a border,
@@ -197,12 +197,12 @@ W.\& Richard Stevens,
 .
 .
 .PP
-.IR eqn2graph (@MAN1EXT@),
-.IR grap2graph (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%convert (1)
+.MR eqn2graph @MAN1EXT@ ,
+.MR grap2graph @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR convert 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/contrib/rfc1345/groff_rfc1345.7.man 
b/contrib/rfc1345/groff_rfc1345.7.man
index 97aaa48..7b54021 100644
--- a/contrib/rfc1345/groff_rfc1345.7.man
+++ b/contrib/rfc1345/groff_rfc1345.7.man
@@ -43,7 +43,7 @@ groff_rfc1345 \- special character names from RFC 1345 and 
Vim digraphs
 The file
 .I rfc1345.tmac
 defines special character escape sequences for
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 based on the glyph mnemonics specified in RFC 1345 and the digraph table
 of the text editor Vim.
 .
@@ -150,7 +150,7 @@ redefines
 to the \[lq]left-pointing double angle quotation mark\[rq] (U+00AB).
 .
 See
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 for the full list of predefined special character escapes.
 .
 .
@@ -167,7 +167,7 @@ This can be done by either adding
 to your document before the first use of any of the glyph names the
 macro file defines,
 or by using the
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 option
 .RB \[lq] "\-m rfc1345" \[rq]
 from the shell.
@@ -229,13 +229,13 @@ June 1992.
 .
 .PP
 The Vim digraph table can be listed using the
-.IR vim (1)
+.MR vim 1
 command
 .RB \[lq] ":help \%digraph\-table" \[rq].
 .
 .
 .PP
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/man/ditroff.7.man b/man/ditroff.7.man
index d58b7e8..60f8a0e 100644
--- a/man/ditroff.7.man
+++ b/man/ditroff.7.man
@@ -33,7 +33,7 @@ ditroff \- device-independent typesetter roff
 The name
 .I ditroff
 refers to a historical development stage of the
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 text processing system.
 .
 In
@@ -101,7 +101,7 @@ system,
 .IR groff .
 .
 The
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 program is a wrapper around
 .I (di)troff
 that automatically handles device postprocessing.
@@ -139,20 +139,20 @@ multi-device
 .
 .
 .TP
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 provides a history and conceptual overview of
 .I roff
 systems.
 .
 .
 .TP
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 describes the GNU implementation of
 .IR (di)troff .
 .
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 documents the GNU
 .I roff
 program and includes pointers to further documentation about
@@ -160,7 +160,7 @@ program and includes pointers to further documentation about
 .
 .
 .TP
-.IR groff_out (@MAN5EXT@)
+.MR groff_out @MAN5EXT@
 describes the
 .I groff
 version of the intermediate output language, the basis for
diff --git a/man/groff.7.man b/man/groff.7.man
index 13f01aa..9e3ec8d 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -235,7 +235,7 @@ stands for
 and is the free implementation of the roff type-setting system.
 .
 See
-.BR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 for a survey and the background of the groff system.
 .
 .
@@ -492,7 +492,7 @@ and the tilde
 .
 All are available if required;
 see
-.IR groff_char (@MAN7EXT@).
+.MR groff_char @MAN7EXT@ .
 .
 .
 .P
@@ -502,7 +502,7 @@ A
 .B diversion
 stores (formatted) information into a macro for later usage.
 See
-.BR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 for more details.
 .
 A
@@ -1278,7 +1278,7 @@ Not all details of request behavior are outlined here.
 Refer to the
 .I groff
 Texinfo manual or
-.IR groff_diff (@MAN7EXT@).
+.MR groff_diff @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -1444,7 +1444,7 @@ Write a backtrace of the input stack to the standard 
error stream.
 Also see the
 .B \-b
 option of
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .TPx
 .REQ .bd "font N"
@@ -1796,7 +1796,7 @@ End current diversion.
 Divert to
 .IR macro .
 See
-.BR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 for more details.
 .
 .TPx
@@ -3123,7 +3123,7 @@ to the stream named
 Besides these standard groff requests, there might be further macro
 calls.
 They can originate from a macro package (see
-.BR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 for an overview) or from a preprocessor.
 .
 .
@@ -3628,7 +3628,7 @@ Send
 .I anything
 to the output device as a drawing command;
 see
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 .
 .TP
@@ -4046,7 +4046,7 @@ Send
 .I anything
 to the output device as a control command;
 see
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 .
 .TP
@@ -4125,7 +4125,7 @@ encounters one in an identifier,
 it produces a warning diagnostic of type
 .RB \[lq] input \[rq]
 (see section \[lq]Warnings\[rq] in
-.IR \%@g@troff (@MAN1EXT@)).
+.MR @g@troff @MAN1EXT@ ).
 .
 .
 .IP
@@ -5550,7 +5550,7 @@ So this request is not really useful.
 .\" ====================================================================
 .
 In the \[oq]ms\[cq] macro package in tmac/s.tmac
-.BR groff_ms (@MAN7EXT@),
+.MR groff_ms @MAN7EXT@ ,
 there is the macro
 .BR .UL .
 .
@@ -5588,7 +5588,7 @@ for writing a useful new macro, something like
 .RE
 .
 If
-.BR doclifter (1)
+.MR doclifter 1
 makes trouble, change the macro name
 .B UNDERLINE
 into some 2-letter word, like
@@ -5747,14 +5747,14 @@ as well as the device,
 font,
 and device-independent intermediate output formats described by
 CSTR\~#54 are documented in
-.IR groff_diff (@MAN7EXT@).
+.MR groff_diff @MAN7EXT@ .
 .
 .
 .P
 .I groff
 provides an AT&T compatibility mode;
 see
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .
 .\" ====================================================================
@@ -5786,13 +5786,13 @@ the output of these can be selectively suppressed with
 and
 .B \-W
 options of
-.IR \%@g@troff (@MAN1EXT@)).
+.MR @g@troff @MAN1EXT@ ).
 .
 Backtraces can be automatically produced when errors or warnings occur
 (the
 .B \-b
 option of
-.IR \%@g@troff (@MAN1EXT@))
+.MR @g@troff @MAN1EXT@ )
 or generated on demand
 .RB ( .backtrace ).
 .
@@ -5873,7 +5873,7 @@ and device-independent output format.
 .
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 is the preferred interface to the
 .I groff
 system;
@@ -5890,7 +5890,7 @@ system.
 .
 .
 .TP
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 discusses character encoding issues,
 escape sequences that produce glyphs,
 and enumerates
@@ -5899,7 +5899,7 @@ predefined special character escapes.
 .
 .
 .TP
-.IR groff_diff (@MAN7EXT@)
+.MR groff_diff @MAN7EXT@
 covers the differences between the
 GNU
 .I troff \" GNU
@@ -5912,14 +5912,14 @@ whose design it re-implements.
 .
 .
 .TP
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 describes the formats of the files that describe devices
 .RI ( DESC )
 and fonts.
 .
 .
 .TP
-.IR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 surveys macro packages provided with
 .IR groff ,
 describes how documents can take advantage of them,
@@ -5928,7 +5928,7 @@ and includes historical information on macro package 
naming conventions.
 .
 .
 .TP
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 presents a detailed history of
 .I roff
 systems and summarizes concepts common to them.
diff --git a/man/groff_char.7.man b/man/groff_char.7.man
index 6147a02..b503b32 100644
--- a/man/groff_char.7.man
+++ b/man/groff_char.7.man
@@ -111,7 +111,7 @@ depending on the output driver chosen when the page was 
rendered
 (with the
 .B \-T
 option to the
-.IR man (1)
+.MR man 1
 or
 .I roff
 programs).
@@ -145,7 +145,7 @@ Others include
 and
 .BR \ee ;
 see
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 A small number of special characters represent glyphs that are not
 encoded in Unicode;
@@ -478,9 +478,9 @@ vertical lines;
 see subsection \[lq]Rules and lines\[rq] below.
 .
 Preprocessors like
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 and
-.IR \%@g@pic (@MAN1EXT@)
+.MR @g@pic @MAN1EXT@
 draw boxes and will produce the best possible output for the device,
 falling back to basic Latin glyphs only when necessary.
 .
@@ -702,7 +702,7 @@ enabling the user to devise
 .I ad hoc
 names for them;
 see
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .
 .TP
@@ -785,7 +785,7 @@ This legacy numeric special character escape is used to map 
characters
 onto glyphs via the
 .B .trin
 request in macro files loaded by
-.IR grotty (@MAN1EXT@).
+.MR grotty @MAN1EXT@ .
 .
 .
 .\" ====================================================================
@@ -863,7 +863,7 @@ such glyphs are typically drawn from a
 .I special
 font
 (see
-.IR groff_font (@MAN5EXT@)).
+.MR groff_font @MAN5EXT@ ).
 .
 Often,
 such glyphs have metrics which look incongruous in normal text.
@@ -1232,7 +1232,7 @@ which provide the floor operator.
 .
 Some output drivers,
 such as
-.IR grodvi (@MAN1EXT@),
+.MR grodvi @MAN1EXT@ ,
 don't unify such glyphs.
 .
 For this reason,
@@ -1741,7 +1741,7 @@ and
 Bernd Warken
 .ME ,
 revised to use
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 by
 .MT esr@\:thyrsus\:.com
 Eric S.\& Raymond
@@ -1797,15 +1797,15 @@ of the ASCII encoding standard.
 .
 .
 .P
-.IR groff_rfc1345 (@MAN7EXT@)
+.MR groff_rfc1345 @MAN7EXT@
 describes an alternative set of special character glyph names,
 which extends and in some cases overrides the definitions listed above.
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR troff (@MAN1EXT@),
-.IR groff (@MAN7EXT@)
+.MR groff @MAN1EXT@ ,
+.MR troff @MAN1EXT@ ,
+.MR groff @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 5554a1f..482e3cc 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -680,7 +680,7 @@ is a numeric expression with a default scaling indicator
 Interpolate the contents of the environment variable
 .IR xxx ,
 as returned by
-.IR getenv (3).
+.MR getenv 3 .
 .
 .B \[rs]V
 is interpreted even in copy mode.
@@ -936,7 +936,7 @@ the
 Texinfo manual,
 for details of how a glyph name for a composite glyph is constructed,
 and
-.BR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 for a list of glyph name components used in composite glyph names.
 .
 .TP
@@ -956,7 +956,7 @@ and
 .B sy
 requests are disabled by default.
 .
-.IR \%@g@troff (@MAN1EXT@)'s
+.MR @g@troff @MAN1EXT@ 's
 .B \-U
 option enables the formatter's \[lq]unsafe mode\[rq],
 restoring their function
@@ -1161,7 +1161,7 @@ will remain nodes,
 so the result cannot be guaranteed to be a pure string.
 .
 See section \[lq]Copy mode\[rq] in
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 Glyph parameters such as the type face and size are not preserved;
 use
@@ -1176,7 +1176,7 @@ Write a backtrace of the input stack to the standard 
error stream.
 Also see the
 .B \-b
 option of
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 .
 .TP
@@ -2008,7 +2008,7 @@ selects font family \[lq]P\[rq] instead.
 .
 The initial font family is \[lq]T\[rq] (Times),
 but can be overridden by the output device\[em]see
-.IR groff_font (@MAN5EXT@)).
+.MR groff_font @MAN5EXT@ ).
 .
 The current font family is associated with the environment.
 .
@@ -2256,7 +2256,7 @@ This file is sought in the same way that macro files are 
with the
 request or the
 .BI \-m name
 command-line option to
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .
 .IP
@@ -3048,7 +3048,7 @@ warnings are not suppressed and
 must add 0.2\~m or more for each interword space in a line.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 for warning types and control.
 .
 .TP
@@ -3068,7 +3068,7 @@ version
 .I groff
 special characters
 (see
-.IR groff_char (@MAN7EXT@))
+.MR groff_char @MAN7EXT@ )
 can be used and the output will usually transform in the expected way
 due to the regular naming convention of the special character escapes.
 .
@@ -3375,7 +3375,7 @@ is the sum of the numbers associated with each warning 
that is to be
 enabled; all other warnings are disabled.
 .
 The number associated with each warning is listed in
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 For example,
 .B .warn 0
@@ -3562,7 +3562,7 @@ this amount is set to
 .
 The arguments' units are twelfths of the space width of the current font
 (see
-.IR groff_font (@MAN5EXT@))
+.MR groff_font @MAN5EXT@ )
 and default to\~12.
 .
 .
@@ -3940,7 +3940,7 @@ The sum of the numbers associated with each of the 
currently enabled
 warnings.
 .
 The number associated with each warning is listed in
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 .
 .TP
@@ -4643,13 +4643,13 @@ the output of these can be selectively suppressed with
 and
 .B \-W
 options of
-.IR \%@g@troff (@MAN1EXT@)).
+.MR @g@troff @MAN1EXT@ ).
 .
 Backtraces can be automatically produced when errors or warnings occur
 (the
 .B \-b
 option of
-.IR \%@g@troff (@MAN1EXT@))
+.MR @g@troff @MAN1EXT@ )
 or generated on demand
 .RB ( .backtrace ).
 .
@@ -4765,7 +4765,7 @@ which means that they are limited to one or two 
characters.
 See the
 .B \-C
 option in
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 and,
 above,
 the
@@ -5321,9 +5321,9 @@ and device-independent output format.
 .
 .
 .PP
-.IR groff (@MAN1EXT@),
-.IR groff (@MAN7EXT@),
-.IR roff (@MAN7EXT@)
+.MR groff @MAN1EXT@ ,
+.MR groff @MAN7EXT@ ,
+.MR roff @MAN7EXT@
 .
 .
 .\" Clean up.
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 39847a2..a54885e 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -161,13 +161,13 @@ to generate PNG images from PostScript input.
 .
 Under GNU/Linux,
 this is usually
-.IR gs (1),
+.MR gs 1 ,
 but under other systems
 (notably Cygwin)
 it might be set to another name.
 .
 The
-.IR \%grohtml (@MAN1EXT@)
+.MR grohtml @MAN1EXT@
 driver uses this directive.
 .
 .
@@ -838,7 +838,7 @@ escape sequence.
 The code can be any integer
 (that is,
 any integer parsable by the C standard library's
-.IR strtol (3)
+.MR strtol 3
 function).
 .
 .
@@ -980,7 +980,7 @@ and device-independent output format.
 .
 .P
 Section \[lq]See also\[rq] of
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 lists utilities available for preparing font files in a variety of
 formats for use with
 .I groff
@@ -988,9 +988,9 @@ output drivers.
 .
 .
 .P
-.IR groff_out (@MAN5EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR \%addftinfo (@MAN1EXT@)
+.MR groff_out @MAN5EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR addftinfo @MAN1EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index f055ce4..14a4485 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -101,9 +101,9 @@ after these commands, otherwise the position is not changed.
 .\" ====================================================================
 .
 The fundamental operation of the
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 formatter is the translation of the
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 input language into a device-independent form,
 described here,
 primarily concerned with what has to be written or drawn at specific
@@ -116,7 +116,7 @@ the term
 .I command
 always refers to this intermediate output language,
 and never to the
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 language intended for direct use by document authors.
 .
 Intermediate output commands comprise several categories:
@@ -139,7 +139,7 @@ or place URL hyperlinks in supported output formats.
 As the GNU
 .I roff
 processor
-.BR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 is a wrapper program around
 .B @g@troff
 that automatically calls a
@@ -176,7 +176,7 @@ This parser is smarter on whitespace and implements 
obsolete elements
 for compatibility, otherwise both formats are the same.
 .
 Both formats can be viewed directly with
-.BR \%gxditview (@MAN1EXT@).
+.MR gxditview @MAN1EXT@ .
 .
 .
 .P
@@ -186,7 +186,7 @@ concept is to facilitate the development of postprocessors 
by
 providing a common programming interface for all devices.
 .
 It has a language of its own that is completely different from the
-.BR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 language.
 .
 While the
@@ -347,7 +347,7 @@ values in a measurement unit, but the letter for the 
corresponding
 .I scaling indicator
 is not written with the output command arguments;
 see
-.BR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 and
 .IR "Groff: The GNU Implementation of troff" ,
 the
@@ -371,7 +371,7 @@ Note that these scaling indicators are relative to the 
chosen device.
 They are defined by the parameters specified in the device's
 .I DESC
 file; see
-.BR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .P
@@ -785,7 +785,7 @@ extension; it is only used for devices whose
 file contains the
 .B tcommand
 keyword; see
-.BR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -808,7 +808,7 @@ extension; it is only used for devices whose
 file contains the
 .B tcommand
 keyword; see
-.BR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -907,7 +907,7 @@ to a similar
 .I groff
 .B \*[@backslash]D
 escape sequence; see
-.BR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .
 .P
@@ -1280,7 +1280,7 @@ Mount font position\~\c
 .I s
 (a text word);
 see
-.BR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -1583,9 +1583,9 @@ x stop
 .
 .P
 This output can be fed into the postprocessor
-.BR grops (@MAN1EXT@)
+.MR grops @MAN1EXT@
 to get its representation as a PostScript file, or
-.BR gropdf (@MAN1EXT@)
+.MR gropdf @MAN1EXT@
 to output directly to PDF.
 .
 .
@@ -1644,7 +1644,7 @@ x stop
 .
 .P
 This output can be fed into the postprocessor
-.BR grotty (@MAN1EXT@)
+.MR grotty @MAN1EXT@
 to get a formatted text document.
 .
 .
@@ -1690,9 +1690,9 @@ x stop
 .
 .P
 This output can be fed into the postprocessor
-.BR \%xditview (1x)
+.MR xditview 1x
 or
-.BR \%gxditview (@MAN1EXT@)
+.MR gxditview @MAN1EXT@
 for displaying in\~X.
 .
 .
@@ -1825,7 +1825,7 @@ The differences between
 and
 .I classical troff
 are documented in
-.BR groff_diff (@MAN7EXT@).
+.MR groff_diff @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -1911,7 +1911,7 @@ and device-independent output format.
 .
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 documents the
 .B \-Z
 option and contains pointers to further
@@ -1920,7 +1920,7 @@ documentation.
 .
 .
 .TP
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 describes the
 .I groff
 language,
@@ -1928,26 +1928,26 @@ including its escape sequences and system of units.
 .
 .
 .TP
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 details the device scaling parameters of device
 .I DESC
 files.
 .
 .
 .TP
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 generates the device-independent intermediate output documented here.
 .
 .
 .TP
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 presents historical aspects and the general structure of
 .I roff
 systems.
 .
 .
 .TP
-.IR groff_diff (@MAN7EXT@)
+.MR groff_diff @MAN7EXT@
 enumerates differences between the intermediate output produced by AT&T
 .I troff \" AT&T
 and that of
@@ -1955,19 +1955,19 @@ and that of
 .
 .
 .TP
-.IR gxditview (@MAN1EXT@)
+.MR gxditview @MAN1EXT@
 is a viewer for intermediate output.
 .
 .
 .P
-.IR \%grodvi (@MAN1EXT@),
-.IR \%grohtml (@MAN1EXT@),
-.IR \%grolbp (@MAN1EXT@),
-.IR \%grolj4 (@MAN1EXT@),
-.IR \%gropdf (@MAN1EXT@),
-.IR \%grops (@MAN1EXT@),
+.MR grodvi @MAN1EXT@ ,
+.MR grohtml @MAN1EXT@ ,
+.MR grolbp @MAN1EXT@ ,
+.MR grolj4 @MAN1EXT@ ,
+.MR gropdf @MAN1EXT@ ,
+.MR grops @MAN1EXT@ ,
 and
-.IR \%grotty (@MAN1EXT@)
+.MR grotty @MAN1EXT@
 are
 .I groff
 postprocessors.
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 724d4a9..ed74f45 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -33,7 +33,7 @@ groff_tmac \- macro files in the GNU roff typesetting system
 Definitions of macros,
 strings,
 and registers for use in a
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 document can be collected into
 .IR "macro files" ,
 .I roff
@@ -55,9 +55,9 @@ it is often termed a
 Macro packages can be loaded by supplying the
 .B \-m
 option to
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 or
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 Alternatively,
 a
@@ -89,7 +89,7 @@ directory\[rq] to be loadable with the
 option.
 .
 Section \[lq]Environment\[rq] of
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 lists these directories.
 .
 Like any other
@@ -154,7 +154,7 @@ Unix (1979).
 .
 It has a small macro interface and is widely used;
 see
-.IR groff_man (@MAN7EXT@).
+.MR groff_man @MAN7EXT@ .
 .
 .
 .TP
@@ -171,7 +171,7 @@ but is also larger,
 more complex,
 and not as widely adopted;
 see
-.IR groff_mdoc (@MAN7EXT@).
+.MR groff_mdoc @MAN7EXT@ .
 .
 .
 .P
@@ -216,7 +216,7 @@ to use.
 The classical
 .I me
 macro package; see
-.IR groff_me (@MAN7EXT@).
+.MR groff_me @MAN7EXT@ .
 .
 .
 .TP
@@ -224,7 +224,7 @@ macro package; see
 The semi-classical
 .I mm
 macro package; see
-.IR groff_mm (@MAN7EXT@).
+.MR groff_mm @MAN7EXT@ .
 .
 .
 .TP
@@ -237,7 +237,7 @@ As this was not based on other packages, it was freely 
designed as
 quite a nice, modern macro package.
 .
 See
-.IR groff_mom (@MAN7EXT@).
+.MR groff_mom @MAN7EXT@ .
 .
 .
 .TP
@@ -245,7 +245,7 @@ See
 The classical
 .I ms
 macro package; see
-.IR groff_ms (@MAN7EXT@).
+.MR groff_ms @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -366,7 +366,7 @@ Some of the localization of the
 .I mm
 package is handled separately;
 see
-.IR groff_mmse (@MAN7EXT@).
+.MR groff_mmse @MAN7EXT@ .
 .
 .
 .TP
@@ -453,7 +453,7 @@ integers (allowing safe multiplication of 31-bit integers, 
for example).
 Switch to the EC and TC font families.
 .
 To be used with
-.IR \%grodvi (@MAN1EXT@)
+.MR grodvi @MAN1EXT@
 \[em] this man page also gives more details of how to use it.
 .
 .
@@ -466,7 +466,7 @@ model.
 Note that
 .I hdtbl
 is a macro package, not a preprocessor like
-.IR tbl (@MAN1EXT@).
+.MR tbl @MAN1EXT@ .
 .
 .I hdtbl
 works only with the
@@ -476,7 +476,7 @@ and
 output drivers.
 .
 See
-.IR groff_hdtbl (@MAN7EXT@).
+.MR groff_hdtbl @MAN7EXT@ .
 .
 .
 .TP
@@ -533,7 +533,7 @@ defined in its
 file;
 see subsection \[lq]Paper sizes\[rq]
 of
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .
 .TP
@@ -572,7 +572,7 @@ This file provides proper definitions for the macros
 and
 .BR PE ,
 needed for the
-.IR @g@pic (@MAN1EXT@)
+.MR @g@pic @MAN1EXT@
 preprocessor.
 .
 They center each picture.
@@ -686,7 +686,7 @@ image's width.
 A single macro is provided in this file,
 .BR xx ,
 for formatting permuted index entries as produced by the GNU
-.IR ptx (1)
+.MR ptx 1
 program.
 .
 If you need different formatting, copy the macro into your document and
@@ -699,7 +699,7 @@ defines special character escape sequences based on the 
glyph mnemonics
 specified in RFC 1345 and the digraph table of the text editor Vim.
 .
 See
-.IR groff_rfc1345 (@MAN7EXT@).
+.MR groff_rfc1345 @MAN7EXT@ .
 .
 .
 .TP
@@ -709,7 +709,7 @@ Use this for tracing macro calls.
 It is only useful for debugging.
 .
 See
-.IR groff_trace (@MAN7EXT@).
+.MR groff_trace @MAN7EXT@ .
 .
 .
 .TP
@@ -732,7 +732,7 @@ Additions of elements known from the HTML format, as used 
in World
 Wide Web pages; this includes URL links and mail addresses.
 .
 See
-.IR groff_www (@MAN7EXT@).
+.MR groff_www @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -741,7 +741,7 @@ See
 .
 Classical roff systems were designed before the conventions of the
 modern C
-.IR getopt (3)
+.MR getopt 3
 call evolved, and used a naming scheme for macro packages that looks
 odd to modern eyes.
 .
@@ -786,7 +786,7 @@ command-line option for activating this package reads
 .
 .P
 To cope with all situations, actual versions of
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 are smart about both naming schemes by providing two macro files
 for the inflicted macro packages; one with a leading \[oq]m\[cq]
 the other one without it.
@@ -848,7 +848,7 @@ is specified.
 .P
 The easiest way to find out which macro packages are available on a
 system is to check the man\~page
-.IR groff (@MAN1EXT@),
+.MR groff @MAN1EXT@ ,
 or the contents of the
 .I tmac
 directories.
@@ -905,7 +905,7 @@ and
 .B .mso
 requests,
 the roff preprocessor
-.IR \%@g@soelim (@MAN1EXT@)
+.MR @g@soelim @MAN1EXT@
 must be called if the files to be included need preprocessing.
 .
 This can be done either directly by a pipeline on the command line or
@@ -973,7 +973,7 @@ to invoke
 .
 There is a convention that is supported by many modern roff
 typesetters and
-.IR man (1)
+.MR man 1
 programs, the
 .I preprocessor word
 described in the following.
@@ -1008,12 +1008,12 @@ and
 (for
 .IR tbl ).
 (see
-.IR roff (@MAN7EXT@)).
+.MR roff @MAN7EXT@ ).
 .
 .
 .P
 Besides being a good reminder for the user, some formatters (like the
-.IR man (1)
+.MR man 1
 program) are even able to automatically start the preprocessors
 specified in the preprocessor word, but do not bet on this.
 .
@@ -1032,13 +1032,13 @@ man\~pages only the following characters should be used:
 .\" ====================================================================
 .
 A
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 document is a text file that is enriched by predefined formatting
 constructs, such as requests, escape sequences, strings, numeric
 registers, and macros from a macro package.
 .
 These elements are described in
-.IR roff (@MAN7EXT@).
+.MR roff @MAN7EXT@ .
 .
 .
 .P
@@ -1068,7 +1068,7 @@ the name under which the macro was called is in
 and the number of arguments is in register
 .BR \[rs]n[.$] ;
 see
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -1261,38 +1261,38 @@ is maintained by the Linux Foundation.
 .
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 is an overview of the
 .I groff
 system.
 .
 .
 .TP
-.IR groff_man (@MAN7EXT@),
+.MR groff_man @MAN7EXT@ ,
 .TQ
-.IR groff_mdoc (@MAN7EXT@),
+.MR groff_mdoc @MAN7EXT@ ,
 .TQ
-.IR groff_me (@MAN7EXT@),
+.MR groff_me @MAN7EXT@ ,
 .TQ
-.IR groff_mm (@MAN7EXT@),
+.MR groff_mm @MAN7EXT@ ,
 .TQ
-.IR groff_mom (@MAN7EXT@),
+.MR groff_mom @MAN7EXT@ ,
 .TQ
-.IR groff_ms (@MAN7EXT@),
+.MR groff_ms @MAN7EXT@ ,
 .TQ
-.IR groff_rfc1345 (@MAN7EXT@),
+.MR groff_rfc1345 @MAN7EXT@ ,
 .TQ
-.IR groff_trace (@MAN7EXT@),
+.MR groff_trace @MAN7EXT@ ,
 \~and
 .TQ
-.IR groff_www (@MAN7EXT@)
+.MR groff_www @MAN7EXT@
 are
 .I groff
 macro packages.
 .
 .
 .TP
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 summarizes the language recognized by GNU
 .IR troff . \" GNU
 .
diff --git a/man/roff.7.man b/man/roff.7.man
index 0d52b07..23a70c1 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -58,7 +58,7 @@ The most common
 .I roff
 system today is GNU
 .IR roff ,
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .I groff
 retains the input conventions and functionality of its ancestors,
@@ -73,7 +73,7 @@ the term
 .I roff
 generally refers to this class of programs,
 with the exception of a
-.IR roff (1)
+.MR roff 1
 command provided in early Unix systems.
 .
 In spite of its age,
@@ -97,7 +97,7 @@ details on the
 .I roff
 pipeline
 which is usually hidden behind front ends like
-.IR groff (@MAN1EXT@),
+.MR groff @MAN1EXT@ ,
 a general overview of the formatting language,
 some tips for editing
 .I roff
@@ -400,7 +400,7 @@ and programmable abort
 .
 .P
 Third Edition Unix also brought the
-.IR pipe (2)
+.MR pipe 2
 system call,
 the explosive growth of a componentized system based around it,
 and a \[lq]filter model\[rq] that remains perceptible today.
@@ -430,12 +430,12 @@ Unfortunately,
 surviving documentation does not illustrate what requests were
 implemented at this time for C/A/T support;
 the
-.IR troff (1) \" AT&T
+.MR troff 1 \" AT&T
 man page in Fourth Edition Unix
 (November 1973)
 does not feature a request list, \" nor does V6 Unix troff(1) (1975)
 unlike
-.IR nroff (1). \" AT&T
+.MR nroff 1 . \" AT&T
 .
 Apart from typesetter-driven features,
 Version 4 Unix
@@ -520,7 +520,7 @@ and documented the
 .I man
 macro package,
 introducing most of the macros described in
-.IR groff_man (7)
+.MR groff_man 7
 today,
 and edited volume 1 of the Version 7 manual using it.
 .
@@ -621,7 +621,7 @@ preprocessor for producing diagrams from a constraint-based 
language).
 Beyond that,
 it has added numerous features;
 see
-.IR groff_diff (@MAN7EXT@).
+.MR groff_diff @MAN7EXT@ .
 .
 Since its inception and for at least the following three decades,
 it has been used by practically all GNU/Linux and BSD operating systems.
@@ -698,10 +698,10 @@ system from the shell's command line.
 .
 These can be specific to a macro package,
 like
-.IR mmroff (@MAN1EXT@),
+.MR mmroff @MAN1EXT@ ,
 or more general.
 .
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 provides command-line options sparing the user from constructing the
 long,
 order-dependent pipelines familiar to AT&T
@@ -710,7 +710,7 @@ users.
 .
 Further,
 a heuristic program,
-.IR grog (@MAN1EXT@),
+.MR grog @MAN1EXT@ ,
 is available to infer from a document's contents which
 .I groff
 arguments should be used to process it.
@@ -900,7 +900,7 @@ termed the \[lq]intermediate output format\[rq].
 As noted in section \[lq]History\[rq] above,
 this language was first specified in CSTR\~#97;
 GNU extensions to it are documented in
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 Intermediate output is in specialized in its parameters,
 but not its syntax,
@@ -976,13 +976,13 @@ and font repertoire)
 have tended to increase.
 .
 The PostScript output driver
-.IR dpost (1)
+.MR dpost 1
 from an AT&T
 .I troff
 of 1980s vintage had a resolution of 720 units per inch,
 whereas
 .IR groff 's
-.IR grops (@MAN1EXT@)
+.MR grops @MAN1EXT@
 uses 72 000.
 .
 .
@@ -1036,7 +1036,7 @@ positions.
 .
 Details on the naming of macro packages and their placement is found
 in
-.IR groff_tmac (@MAN5EXT@).
+.MR groff_tmac @MAN5EXT@ .
 .
 .
 .P
@@ -1044,13 +1044,13 @@ A macro package anticipated for use in a document can 
be delcared to
 the formatter by the command-line option
 .BR \-m ;
 see
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 It can alternatively be specified within a document using the file
 inclusion requests of the
 .I roff
 language; see
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .
 .P
@@ -1255,7 +1255,7 @@ for \[lq]troff file\[rq] is seen now and then.
 .
 .P
 File name extensions can be handy in conjunction with the
-.IR less (1)
+.MR less 1
 pager.
 .
 It provides the possibility to feed all input into a command-line pipe
@@ -1281,7 +1281,7 @@ is either a system-supplied command or a shell script of 
your own.
 .
 .P
 See
-.IR \%groff_filenames (@MAN5EXT@)
+.MR groff_filenames @MAN5EXT@
 for more on file name extensions.
 .
 .
@@ -1364,7 +1364,7 @@ In the output, this sentence continues the same paragraph.
 Official GNU doctrine holds that the best program for editing a
 .I roff
 document is Emacs; see
-.IR emacs (1).
+.MR emacs 1 .
 .
 It provides an
 .I nroff
@@ -1443,9 +1443,9 @@ some other editors provide
 .I nroff
 style files too,
 e.g.,
-.IR vim (1),
+.MR vim 1 ,
 an extension of the
-.IR vi (1)
+.MR vi 1
 program.
 .
 Vim's highlighting can be made to recognize
@@ -1692,7 +1692,7 @@ implementations.
 For GNU
 .IR roff ,
 the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 man page offers a survey of all the documentation distributed with the
 system.
 .
@@ -1702,7 +1702,7 @@ With other
 .IR roff s,
 you are on your own,
 but
-.IR troff (1) \" foreign troff
+.MR troff 1 \" foreign troff
 might be a good starting point.
 .
 .
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.1.man
index 83b03c2..2248a25 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -153,7 +153,7 @@ providing the
 macro.
 .
 See
-.IR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 for a detailed description.
 .
 .
@@ -163,7 +163,7 @@ Font files for
 can be created from TFM
 (\*[tx] font metrics)
 files using
-.IR tfmtodit (@MAN1EXT@).
+.MR tfmtodit @MAN1EXT@ .
 .
 The font description file should contain the following
 additional commands:
@@ -298,7 +298,7 @@ it accepts the same arguments as the
 .B papersize
 command
 (see
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for details).
 .
 .
@@ -469,9 +469,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -530,13 +530,13 @@ and widths of rules be rounded.
 .SH "See also"
 .\" ====================================================================
 .
-.IR \%tfmtodit (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR groff_out (@MAN5EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR groff_char (@MAN7EXT@),
-.IR groff_tmac (@MAN5EXT@)
+.MR tfmtodit @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_char @MAN7EXT@ ,
+.MR groff_tmac @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 7b61d1e..a81d880 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -110,13 +110,13 @@ and a device driver,
 .IR post\-grohtml ;
 together,
 they translate
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 documents to HTML.
 .
 Users should always invoke
 .I grohtml
 via the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 command with the
 .B \-Thtml
 option.
@@ -163,7 +163,7 @@ In the second pass,
 the output driver
 .I post\-grohtml
 translates the output of
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 to HTML.
 .
 .
@@ -511,7 +511,7 @@ is encountered.
 uses temporary files.
 .
 See
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 for details about where such files are created.
 .
 .
@@ -525,9 +525,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -537,7 +537,7 @@ A timestamp
 to use as the creation timestamp in place of the current time.
 .
 The time is converted to human-readable form using
-.IR ctime (3)
+.MR ctime 3
 and recorded in an HTML comment.
 .
 .
@@ -548,7 +548,7 @@ The time zone to use when converting the current time
 .IR SOURCE_DATE_EPOCH )
 to human-readable form;
 see
-.IR tzset (3).
+.MR tzset 3 .
 .
 .
 .\" ====================================================================
@@ -572,12 +572,12 @@ space but no line break.
 .\" ====================================================================
 .
 .\" IR afmtodit (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
 .\" IR psbb (1), \" XXX: what is this?
 .\" IR groff_out (@MAN5EXT@),
 .\" IR groff_char (@MAN7EXT@),
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index 06c022a..9843a63 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -100,7 +100,7 @@ and LBP-8 printers.
 .
 .LP
 For compatibility with
-.BR grolj4 (@MAN1EXT@)
+.MR grolj4 @MAN1EXT@
 there is an additional drawing command available:
 .
 .TP
@@ -243,7 +243,7 @@ file (this applies to the page orientation too).
 .
 .PP
 See
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 how to set the paper dimensions in the
 .I DESC
 file.
@@ -330,7 +330,7 @@ option to force the pages to be printed in landscape.
 .\" ====================================================================
 .
 In addition to the usual commands described in
-.IR groff_font (@MAN5EXT@),
+.MR groff_font @MAN5EXT@ ,
 .B grolbp
 provides the command
 .I lbpname
@@ -415,9 +415,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -443,11 +443,11 @@ Macros for use with
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR groff_out (@MAN5EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR groff_char (@MAN7EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_char @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index 506741e..8cd7903 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -195,9 +195,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -230,12 +230,12 @@ Small dots.
 .SH "See also"
 .\" ====================================================================
 .
-.IR lj4_font (@MAN5EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR groff_out (@MAN5EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR groff_char (@MAN7EXT@)
+.MR lj4_font @MAN5EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_char @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grolj4/lj4_font.5.man 
b/src/devices/grolj4/lj4_font.5.man
index ddfbffa..cbd2117 100644
--- a/src/devices/grolj4/lj4_font.5.man
+++ b/src/devices/grolj4/lj4_font.5.man
@@ -84,7 +84,7 @@ all combinations of symbol set and index that reference the 
same glyph
 are equivalent.
 .
 For each glyph,
-.BR hpftodit (@MAN1EXT@)
+.MR hpftodit @MAN1EXT@
 searches a list of symbol sets,
 and selects the first set that contains the glyph.
 .
@@ -95,7 +95,7 @@ high byte(s),
 and the index in the low byte.
 .
 See
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for a complete description of the font file format;
 symbol sets are described in greater detail in the
 .IR "PCL\~5 Printer Language Technical Reference Manual" .
@@ -198,7 +198,7 @@ The differences in glyph metrics may be particularly 
noticeable with
 composite parentheses,
 brackets,
 and braces used by
-.IR eqn (@MAN1EXT@).
+.MR eqn @MAN1EXT@ .
 .
 A script,
 located in
@@ -253,10 +253,10 @@ special font for TrueType CG Times (LaserJet\~4000 and 
later).
 .SH "See also"
 .\" ====================================================================
 .
-.BR groff (@MAN1EXT@),
-.BR hpftodit (@MAN1EXT@),
-.BR grolj4 (@MAN1EXT@),
-.BR groff_font (@MAN5EXT@)
+.MR groff @MAN1EXT@ ,
+.MR hpftodit @MAN1EXT@ ,
+.MR grolj4 @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@
 .
 .
 .\" 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 c5777c3..b0511d5 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -186,7 +186,7 @@ file; it accepts the same arguments as the
 command.
 .
 See
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for details.
 .
 .
@@ -236,10 +236,10 @@ Set the foundry to use for selecting fonts of the same 
name.
 The input to
 .I gropdf
 must be in the format output by
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 This is described in
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 .
 .LP
@@ -256,7 +256,7 @@ device uses a resolution of 72000 and a sizescale of 1000.
 .
 .LP
 The device description file must contain a valid paper size; see
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for more information.
 .
 .B gropdf
@@ -773,7 +773,7 @@ slides with
 If you use present.tmac with
 .B gropdf
 there is no need to run the program
-.BR presentps (@MAN1EXT@)
+.MR presentps @MAN1EXT@
 since the output will already be a presentation pdf.
 .LP
 All other
@@ -795,7 +795,7 @@ parameter is the same as the
 command.
 .
 See
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for details.
 .
 This means that you can alter the page size at will within the PDF file
@@ -1162,9 +1162,9 @@ The PDF file you wish to insert must be a single page and 
the drawing
 must just fit inside the media size of the PDF file.
 .
 So, in
-.BR inkscape (1)
+.MR inkscape 1
 or
-.BR gimp (1)
+.MR gimp 1
 (for example) make sure the canvas size just fits the image.
 .
 .
@@ -1177,7 +1177,7 @@ produce PDFs.
 If you find a single page PDF which fails to import properly, it is
 worth running it through the
 .
-.BR pdftk (1)
+.MR pdftk 1
 program by issuing the command:
 .
 .
@@ -1232,7 +1232,7 @@ preceded with some binary bytes.
 .
 .IP \(bu
 Convert the AFM file to a groff font description file with the
-.BR \%afmtodit (@MAN1EXT@)
+.MR afmtodit @MAN1EXT@
 program.
 .
 An example call is
@@ -1271,7 +1271,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
-.IR \%@g@troff (@MAN1EXT@)
+.MR @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
@@ -1326,9 +1326,9 @@ the font file has been specified with a full path,
 no directories are searched.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -1357,7 +1357,7 @@ The time zone to use when converting the current time
 .IR SOURCE_DATE_EPOCH )
 to human-readable form;
 see
-.IR tzset (3).
+.MR tzset 3 .
 .
 .
 .\" ====================================================================
@@ -1414,11 +1414,11 @@ automatically loaded by
 .SH "See also"
 .\" ====================================================================
 .
-.IR \%afmtodit (@MAN1EXT@),
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR groff_out (@MAN5EXT@)
+.MR afmtodit @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_out @MAN5EXT@
 .\" Not actually referenced in above discussion.
 .\" .BR \%pfbtops (@MAN1EXT@),
 .\" .BR \%groff_tmac (@MAN5EXT@),
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.1.man
index 82a7628..81af4a8 100644
--- a/src/devices/gropdf/pdfmom.1.man
+++ b/src/devices/gropdf/pdfmom.1.man
@@ -60,7 +60,7 @@ pdfmom \- produce PDF documents using the mom macro package 
for groff
 .
 .I pdfmom
 is a wrapper around
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 that facilitates the production of PDF documents from files
 formatted with the
 .I mom
@@ -74,7 +74,7 @@ so output must usually be redirected to a destination file.
 .
 The size of the final PDF can be reduced by piping the output
 through
-.IR ps2pdf (1).
+.MR ps2pdf 1 .
 .
 .
 .P
@@ -85,7 +85,7 @@ option (which is the default),
 processes files using
 .IR groff 's
 native PDF driver,
-.IR gropdf (@MAN1EXT@).
+.MR gropdf @MAN1EXT@ .
 .
 If
 .B \-Tps
@@ -207,10 +207,10 @@ distribution.
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR gropdf (@MAN1EXT@),
-.IR pdfroff (@MAN1EXT@),
-.IR ps2pdf (1)
+.MR groff @MAN1EXT@ ,
+.MR gropdf @MAN1EXT@ ,
+.MR pdfroff @MAN1EXT@ ,
+.MR ps2pdf 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index 7b582cf..8b9982b 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -311,7 +311,7 @@ file; it accepts the same arguments as the
 command.
 .
 See
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for details.
 .
 .TP
@@ -340,10 +340,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
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 This is described in
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 .LP
 In addition, the device and font description files for the device used
@@ -359,7 +359,7 @@ device uses a resolution of 72000 and a sizescale of 1000.
 .
 .LP
 The device description file must contain a valid paper size; see
-.BR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for more information.
 .
 .
@@ -439,7 +439,7 @@ to print the document.
 Such fonts must be in PFA format.
 .
 Use
-.BR \%pfbtops (@MAN1EXT@)
+.MR pfbtops @MAN1EXT@
 to convert a Type\~1 font in PFB format.
 .
 Any downloadable fonts which should, when required, be included by
@@ -1037,7 +1037,7 @@ request.
 .
 .IP
 See
-.BR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 for a description of the
 .B PSPIC
 macro which provides a convenient high-level interface for inclusion of
@@ -1208,12 +1208,12 @@ TrueType fonts can be used with
 .I grops
 if converted first to Type\~42 format,
 a PostScript wrapper equivalent to the PFA format described in
-.IR \%pfbtops (@MAN1EXT@).
+.MR pfbtops @MAN1EXT@ .
 .
 Several methods exist to generate a Type\~42 wrapper;
 some of them involve the use of a PostScript interpreter such as
 Ghostscript\[em]see
-.IR gs (1).
+.MR gs 1 .
 .
 .
 .LP
@@ -1331,7 +1331,7 @@ built-in TrueType font interpreter).
 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@)
+.MR pfbtops @MAN1EXT@
 program to convert it to PFA.
 .
 For TrueType fonts, try
@@ -1344,7 +1344,7 @@ which can convert most outline font formats.
 .
 .IP \(bu
 Convert the AFM file to a groff font description file with the
-.BR \%afmtodit (@MAN1EXT@)
+.MR afmtodit @MAN1EXT@
 program.
 .
 An example call is
@@ -1387,7 +1387,7 @@ Install both the groff font description files and the 
fonts in a
 subdirectory of the font path which groff finds.
 .
 See section \[lq]Environment\[rq] in
-.BR troff (@MAN1EXT@)
+.MR 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
@@ -1467,9 +1467,9 @@ A list of directories in which to seek the selected 
output device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -1495,7 +1495,7 @@ A timestamp
 to use as the creation timestamp in place of the current time.
 .
 The time is converted to human-readable form using
-.IR ctime (3)
+.MR ctime 3
 and recorded in a PostScript comment.
 .
 .
@@ -1506,7 +1506,7 @@ The time zone to use when converting the current time
 .IR SOURCE_DATE_EPOCH )
 to human-readable form;
 see
-.IR tzset (3).
+.MR tzset 3 .
 .
 .
 .\" ====================================================================
@@ -1554,7 +1554,7 @@ PostScript printers (e.g., \[oq]eth\[cq] or 
\[oq]thorn\[cq]).
 .IR /tmp/grops XXXXXX
 Temporary file.
 See
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 for details on the location of temporary files.
 .
 .
@@ -1569,14 +1569,14 @@ PostScript Language Document Structuring Conventions 
Specification
 .
 .
 .LP
-.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@)
+.MR afmtodit @MAN1EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR pfbtops @MAN1EXT@ ,
+.MR groff_char @MAN7EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR 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 4aa4623..3deb9de 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -73,14 +73,14 @@ The GNU
 TTY
 (\[lq]Teletype\[rq])
 output driver translates the output of
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 into a form suitable for typewriter-like devices,
 including terminal emulators.
 .
 Normally,
 .I grotty
 is invoked by
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 when the latter is given one of the
 .BR \-Tascii ,
 .BR \-Tlatin1 ,
@@ -146,7 +146,7 @@ option below.
 When paging
 .IR grotty 's
 output with
-.IR less (1),
+.MR less 1 ,
 the latter program must be instructed to pass SGR and OSC sequences
 through to the device;
 its
@@ -157,7 +157,7 @@ version 566 or later is required for OSC\~8 support).
 .
 Consequently,
 programs like
-.IR man (1)
+.MR man 1
 that page
 .I roff
 documents with
@@ -220,7 +220,7 @@ The legacy output format can be rendered on a video terminal
 by piping
 .IR grotty 's
 output through
-.IR ul (1),
+.MR ul 1 ,
 .\" from bsdmainutils 11.1.2+b1 (on Debian Buster)
 which may render bold italics as reverse video.
 .
@@ -228,7 +228,7 @@ which may render bold italics as reverse video.
 .\" double-struck characters as bold nor supports -b, but does render
 .\" SGR sequences (including color) with no flags required.
 Some implementations of
-.IR more (1)
+.MR more 1
 are also able to display these sequences;
 you may wish to experiment with that command's
 .B \-b
@@ -245,7 +245,7 @@ implementations,
 never outputs reverse line feeds.
 .
 There is therefore no need to filter its output through
-.IR col (1).
+.MR col 1 .
 .
 .
 .\" ====================================================================
@@ -322,7 +322,7 @@ Otherwise, it emits characters in a single-byte encoding 
depending on
 the data in the font description files.
 .
 See
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for more details.
 .
 .
@@ -463,7 +463,7 @@ rather than underlined text.
 .
 Many terminals don't support this attribute;
 however,
-.IR xterm (1),
+.MR xterm 1 ,
 since patch\~#314 (2014-12-28),
 does.
 .
@@ -522,9 +522,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -633,7 +633,7 @@ cannot be printed.
 .
 .P
 Color handling differs from
-.IR grops (@MAN1EXT@).
+.MR grops @MAN1EXT@ .
 .
 The
 .I groff
@@ -714,12 +714,12 @@ not a man page.
 Use of color escapes in man pages is \f[BI]strongly discouraged\f[].
 .
 Some implementations of
-.IR man (1)
+.MR man 1
 .\" ...like man-db 2.8.5-2 on Debian Buster...
 completely disable them.
 .
 See subsection \[lq]Portability\[rq] of
-.IR groff_man_style (@MAN7EXT@)
+.MR groff_man_style @MAN7EXT@
 for guidance on writing man pages that are viewable by as many readers
 as possible.
 .
@@ -752,15 +752,15 @@ Egmont Koblinger.
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR groff_out (@MAN5EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR groff_char (@MAN7EXT@),
-.IR ul (1),
-.IR more (1),
-.IR less (1),
-.IR man (1)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR groff_char @MAN7EXT@ ,
+.MR ul 1 ,
+.MR more 1 ,
+.MR less 1 ,
+.MR man 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/devices/xditview/gxditview.1.man 
b/src/devices/xditview/gxditview.1.man
index f38aa6b..8aa83b7 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -68,7 +68,7 @@ gxditview \- display groff intermediate output files in X11
 .
 .I gxditview
 interprets and displays the intermediate output format of
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 on an X11\~display.
 .
 It uses the standard X11 fonts,
@@ -83,7 +83,7 @@ The
 intermediate output format of
 .IR groff ,
 documented in
-.IR groff_out (@MAN5EXT@),
+.MR groff_out @MAN5EXT@ ,
 is produced by
 .I \%@g@troff
 or the
@@ -309,7 +309,7 @@ output device specify the length and width in machine units 
of the
 virtual page displayed by
 .IR gxditview ;
 see
-.IR groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -568,9 +568,9 @@ A list of directories in which to seek the selected output 
device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -590,9 +590,9 @@ file,
 normally located in the user's home directory.
 .
 See
-.IR xrdb (1)
+.MR xrdb 1
 and
-.IR appres (1)
+.MR appres 1
 for more.
 .
 .
@@ -667,11 +667,11 @@ by Jim Flowers and Stephen Gildea.
 .
 .
 .PP
-.IR X (7),
-.IR xrdb (1),
-.IR xditview (1),
-.IR groff (@MAN1EXT@),
-.IR groff_out (@MAN5EXT@)
+.MR X 7 ,
+.MR xrdb 1 ,
+.MR xditview 1 ,
+.MR groff @MAN1EXT@ ,
+.MR 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 fa9138f..dfd9d79 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -81,16 +81,16 @@
 The GNU implemenation of
 .I eqn \" GNU
 is part of the
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 document formatting system.
 .
 .I \%@g@eqn
 is a
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 preprocessor that translates descriptions of equations embedded in
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 input files into the language understood by
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 It copies the contents of each
 .I file
@@ -108,7 +108,7 @@ is not executed directly by the user,
 but invoked by specifying the
 .B \-e
 option to
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 While GNU
 .IR eqn 's \" GNU
@@ -559,7 +559,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@)
+.MR @g@troff @MAN1EXT@
 macro named
 .IR text .
 .
@@ -1582,7 +1582,7 @@ Addison-Wesley Professional.
 .
 .
 .LP
-.IR groff_char (@MAN7EXT@),
+.MR groff_char @MAN7EXT@ ,
 particularly subsections \[lq]Logical symbols\[rq],
 \[lq]Mathematical symbols\[rq],
 and \[lq]Greek glyphs\[rq],
@@ -1591,10 +1591,10 @@ typesetting.
 .
 .
 .LP
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Clean up.
diff --git a/src/preproc/eqn/neqn.1.man b/src/preproc/eqn/neqn.1.man
index 38ac37a..efe2d62 100644
--- a/src/preproc/eqn/neqn.1.man
+++ b/src/preproc/eqn/neqn.1.man
@@ -40,7 +40,7 @@
 .
 .I \%@g@neqn
 invokes the
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 command with the
 .B ascii
 output device.
@@ -57,7 +57,7 @@ although it may work adequately for very simple input.
 .SH "See also"
 .\" ====================================================================
 .
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 8de1b73..7c37eca 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -71,7 +71,7 @@
 is a preprocessor for including
 .I gremlin
 pictures in
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 input.
 .
 .I \%@g@grn
@@ -452,16 +452,16 @@ When using
 .I \%@g@grn
 along with other preprocessors,
 it is best to run
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 before
 .IR \%@g@grn ,
-.IR \%@g@pic (@MAN1EXT@),
+.MR @g@pic @MAN1EXT@ ,
 and/or
 .I ideal \" no GNU version yet
 to avoid overworking
 .IR \%@g@tbl .
 .
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 should always be run last.
 .
 .
@@ -800,7 +800,7 @@ so you shouldn't ever use negative coordinates.
 .
 .I gremlin
 writes out coordinates using the
-.IR printf (3)
+.MR printf 3
 format \[lq]%f1.2\[rq];
 it's probably a good idea to use the same format if you want to modify
 the
@@ -847,7 +847,7 @@ The default is
 .BR @DEVICE@ .
 .
 See
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 for a list of valid devices.
 .
 .
@@ -938,10 +938,10 @@ Daniel Senderowicz and Werner Lemberg modified it for
 .SH "See also"
 .\" ====================================================================
 .
-.IR \%gremlin (1),
-.IR groff (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR ideal (1)
+.MR gremlin 1 ,
+.MR groff @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR 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 3d410f9..4f56ea3 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -84,12 +84,12 @@
 The GNU implementation of
 .I pic \" generic
 is part of the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 document formatting system.
 .
 .I \%@g@pic
 is a
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 preprocessor that compiles descriptions of diagrammatic pictures
 embedded in
 .I troff \" generic
@@ -122,7 +122,7 @@ is not executed directly by the user,
 but invoked by specifying the
 .B \-p
 option to
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 If no
 .I file
@@ -224,7 +224,7 @@ You should use this if you are using a postprocessor that 
doesn't
 support these extensions.
 .
 The extensions are described in
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 The
 .B \-n
@@ -1045,7 +1045,7 @@ can also be used;
 this will produce the arguments formatted according to
 .IR format ,
 which should be a string as described in
-.IR printf (3)
+.MR printf 3
 appropriate for the number of arguments supplied.
 .
 Only the flags
@@ -1185,7 +1185,7 @@ additional colors can be defined with the
 .B .defcolor
 request
 (see the manual page of
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 for more details).
 .
 .
@@ -1257,9 +1257,9 @@ Objects can have an
 attribute.
 .
 This will only work if the postprocessor is
-.IR grops (@MAN1EXT@)
+.MR grops @MAN1EXT@
 or
-.IR gropdf (@MAN1EXT@).
+.MR gropdf @MAN1EXT@ .
 .
 Any text associated with an object having the
 .B aligned
@@ -1431,7 +1431,7 @@ For bitmapped graphic formats,
 you should use
 .IR pstopnm ;
 the resulting (intermediate)
-.IR pnm (5)
+.MR pnm 5
 file can be then converted to virtually any graphics format using the
 tools of the
 .B netpbm
@@ -1461,7 +1461,7 @@ Characters that are invalid as input to GNU
 (see the
 .I groff
 Texinfo manual or
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 for a list)
 are rejected even in \*[tx] mode.
 .
@@ -1521,14 +1521,14 @@ W.\& Richard Stevens,
 .
 .
 .LP
-.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)
+.MR @g@troff @MAN1EXT@ ,
+.MR groff_out @MAN5EXT@ ,
+.MR tex 1 ,
+.MR gs 1 ,
+.MR ps2eps 1 ,
+.MR pstopnm 1 ,
+.MR ps2epsi 1 ,
+.MR pnm 5
 .
 .
 .\" Clean up.
diff --git a/src/preproc/preconv/preconv.1.man 
b/src/preproc/preconv/preconv.1.man
index e85f44b..a323177 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -68,7 +68,7 @@ preconv \- prepare files for typesetting with groff
 reads each
 .IR file ,
 converts its encoded characters to a form
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 can interpret,
 and sends the result to the standard output stream.
 .
@@ -499,9 +499,9 @@ requests.
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR iconv (3),
-.IR locale (7)
+.MR groff @MAN1EXT@ ,
+.MR iconv 3 ,
+.MR locale 7
 .
 .
 .\" 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 94e423b..a4d66f5 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -81,15 +81,15 @@
 The GNU implementation of
 .I \%refer \" generic
 is part of the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 document formatting system.
 .
 .I \%@g@refer
 is a
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 preprocessor that prepares bibilographic citations by looking up
 keywords specified in a
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 input document,
 obviating the need to type such annotations,
 and permitting the citation style in formatted output to be altered
@@ -117,7 +117,7 @@ is not executed directly by the user,
 but invoked by specifying the
 .B \-R
 option to
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 If no
 .I file
@@ -151,7 +151,7 @@ This mark consists of some label which can be separated 
from the text
 and from other labels in various ways.
 .
 For each reference it also outputs
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 language commands that can be used by a macro package to produce a
 formatted reference for each citation.
 .
@@ -199,7 +199,7 @@ just by adding the lines
 to the beginning of the document.
 .
 This will cause
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 to ignore everything between
 .B .R1
 and
@@ -227,7 +227,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@).
+.MR @g@soelim @MAN1EXT@ .
 .
 .
 .\" ====================================================================
@@ -1076,7 +1076,7 @@ For each
 if an index
 .IB file @INDEX_SUFFIX@
 created by
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@indxbib @MAN1EXT@
 exists,
 then it will be searched instead;
 each index can cover multiple databases.
@@ -1832,7 +1832,7 @@ Index files.
 uses temporary files.
 .
 See the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 man page for details of where such files are created.
 .
 .
@@ -1919,7 +1919,7 @@ it is up to the document or a macro package to employ and 
format this
 information usefully.
 .
 Let us see how we might turn
-.IR groff_ms (@MAN7EXT@)
+.MR groff_ms @MAN7EXT@
 to this task.
 .
 .
@@ -1962,9 +1962,9 @@ AT&T Bell Laboratories Computing Science Technical Report 
No.\& 69.
 .
 .
 .LP
-.IR \%@g@indxbib (@MAN1EXT@),
-.IR \%@g@lookbib (@MAN1EXT@),
-.IR \%lkbib (@MAN1EXT@)
+.MR @g@indxbib @MAN1EXT@ ,
+.MR @g@lookbib @MAN1EXT@ ,
+.MR 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 87ef0aa..499b1ea 100644
--- a/src/preproc/soelim/soelim.1.man
+++ b/src/preproc/soelim/soelim.1.man
@@ -73,12 +73,12 @@
 GNU
 .I soelim \" GNU
 is a preprocessor for the
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 document formatting system.
 .
 .I \%@g@soelim
 works as a filter to eliminate source requests in
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 input files;
 that is,
 it replaces lines of the form
@@ -198,14 +198,14 @@ to flatten a tree of input documents.
 was designed to handle situations where the target of a
 .I roff \" generic
 source request requires a preprocessor such as
-.IR \%@g@eqn (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR \%@g@refer (@MAN1EXT@),
+.MR @g@eqn @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@refer @MAN1EXT@ ,
 or
-.IR \%@g@tbl (@MAN1EXT@).
+.MR @g@tbl @MAN1EXT@ .
 .
 The usual processing sequence of
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 is as follows.
 .
 .\" Does this groff installation use a command prefix?  In installed
@@ -423,7 +423,7 @@ the last one specified controls.
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index ca74112..d1e23af 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -63,16 +63,16 @@
 The GNU implementation of
 .I tbl \" generic
 is part of the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 document formatting system.
 .
 .I \%@g@tbl
 is a
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 preprocessor that translates descriptions of tables embedded within a
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 input files into the language understood by
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 It copies the contents of each
 .I file
@@ -104,7 +104,7 @@ is not executed directly by the user,
 but invoked by specifying the
 .B \-t
 option to
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 If no
 .I file
@@ -226,7 +226,7 @@ Use
 .I x
 .RI and\~ y
 as start and end delimiters for
-.IR \%@g@eqn (@MAN1EXT@).
+.MR @g@eqn @MAN1EXT@ .
 .
 .TP
 .B doublebox
@@ -749,7 +749,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@)
+.MR @g@troff @MAN1EXT@
 width expression in parentheses or a unitless integer.
 .
 If no unit is given, en units are used.
@@ -1044,9 +1044,9 @@ arithmetic.
 .SS "Interaction with \f[I]\%@g@eqn\f[]"
 .\" ====================================================================
 .
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 should always be called before
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 .RI ( groff (@MAN1EXT@)
 automatically takes care of the correct order of preprocessors).
 .
@@ -1399,8 +1399,8 @@ AT&T Bell Laboratories;
 .
 .
 .LP
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @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 6ee7990..c20aa83 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -136,7 +136,7 @@ display a usage message and exit.
 Because
 .I groff
 is intended to subsume most users' direct invocations of the
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 formatter,
 the two programs share a set of options.
 .
@@ -169,7 +169,7 @@ or are interpreted differently by
 .TP
 .BI \-D\~ enc
 Set default input encoding used by
-.IR preconv (@MAN1EXT@)
+.MR preconv @MAN1EXT@
 to
 .IR enc ;
 implies
@@ -179,21 +179,21 @@ implies
 .TP
 .B \-e
 Run
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 preprocessor.
 .
 .
 .TP
 .B \-g
 Run
-.IR \%@g@grn (@MAN1EXT@)
+.MR @g@grn @MAN1EXT@
 preprocessor.
 .
 .
 .TP
 .B \-G
 Run
-.IR grap (1)
+.MR grap 1
 preprocessor;
 implies
 .BR \-p .
@@ -211,7 +211,7 @@ and
 .BR \-s .
 .
 It is passed to
-.IR \%@g@soelim (@MAN1EXT@)
+.MR @g@soelim @MAN1EXT@
 and the output driver,
 and
 .I \%@g@grn
@@ -225,7 +225,7 @@ as its argument.
 .TP
 .B \-j
 Run
-.IR \%@g@chem (@MAN1EXT@)
+.MR @g@chem @MAN1EXT@
 preprocessor;
 implies
 .BR \-p .
@@ -234,7 +234,7 @@ implies
 .TP
 .B \-k
 Run
-.IR preconv (@MAN1EXT@),
+.MR preconv @MAN1EXT@ ,
 which is run before any other preprocessor.
 .
 Please refer to
@@ -250,7 +250,7 @@ options is also specified.
 .TP
 .BI \-K\~ enc
 Set input encoding used by
-.IR preconv (@MAN1EXT@)
+.MR preconv @MAN1EXT@
 to
 .IR enc ;
 implies
@@ -266,11 +266,11 @@ The
 directive in the device description file
 specifies the default command to be used;
 see
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 If no such directive is present for the output device,
 output is piped to
-.IR lpr (1).
+.MR lpr 1 .
 .
 See options
 .B \-L
@@ -309,13 +309,13 @@ delimiters.
 This is the same as the
 .B \-N
 option in
-.IR \%@g@eqn (@MAN1EXT@).
+.MR @g@eqn @MAN1EXT@ .
 .
 .
 .TP
 .B \-p
 Run
-.IR \%@g@pic (@MAN1EXT@)
+.MR @g@pic @MAN1EXT@
 preprocessor.
 .
 .
@@ -344,7 +344,7 @@ before passing it to the postprocessor.
 .TP
 .B \-R
 Run
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 preprocessor.
 .
 No mechanism is provided for passing arguments to
@@ -354,13 +354,13 @@ because most
 options have equivalent language elements that can be specified within
 the document;
 see
-.IR \%@g@refer (@MAN1EXT@).
+.MR @g@refer @MAN1EXT@ .
 .
 .
 .TP
 .B \-s
 Run
-.IR \%@g@soelim (@MAN1EXT@)
+.MR @g@soelim @MAN1EXT@
 preprocessor.
 .
 .
@@ -378,7 +378,7 @@ safer mode is enabled by default.
 .TP
 .B \-t
 Run
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 preprocessor.
 .
 .
@@ -441,7 +441,7 @@ the pipeline is both written to the standard error stream 
and run.
 .TP
 .B \-X
 Use
-.IR \%gxditview (@MAN1EXT@)
+.MR gxditview @MAN1EXT@
 instead of the usual postprocessor to (pre)view a document on an X11
 display.
 .
@@ -455,7 +455,7 @@ output will appear on the standard output stream
 (unless suppressed with
 .BR \-z );
 see
-.IR \%groff_out (@MAN5EXT@)
+.MR groff_out @MAN5EXT@
 for a description of this format.
 .
 .
@@ -464,7 +464,7 @@ for a description of this format.
 .\" ====================================================================
 .
 The following options are passed as-is to the formatter program
-.IR \%@g@troff (@MAN1EXT@),
+.MR @g@troff @MAN1EXT@ ,
 and described in more detail in its man page.
 .
 .
@@ -604,7 +604,7 @@ and the formatter
 at its heart.
 .
 See
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 for a survey of how a
 .I roff
 system works.
@@ -623,7 +623,7 @@ The discussion below summarizes the constituent parts of 
the GNU
 system.
 .
 It complements
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 with
 .IR groff -specific
 information.
@@ -777,7 +777,7 @@ names,
 like \[lq]letter\[rq] or
 \[lq]A4\[rq];
 see
-.IR groff_tmac (@MAN5EXT@).
+.MR groff_tmac @MAN5EXT@ .
 .
 The default used by the formatter depends on its build configuration,
 but is usually one of the foregoing,
@@ -804,7 +804,7 @@ to override the default dimensions and an option
 to use landscape orientation.
 .
 See
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 for a description of the
 .B papersize
 directive,
@@ -813,7 +813,7 @@ which takes an argument of the same form as
 .
 The output driver's man page,
 such as
-.IR grops (@MAN1EXT@),
+.MR grops @MAN1EXT@ ,
 may also be helpful.
 .
 .I groff
@@ -838,7 +838,7 @@ groff \-Tps \-dpaper=a4l \-P\-pa4 \-P\-l \-ms foo.ms > 
foo.ps
 The
 .I groff
 program is a wrapper around the
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 program.
 .
 It allows one to specify preprocessors via command-line options and
@@ -848,11 +848,11 @@ output device.
 Doing so,
 the manual construction of pipelines or management of temporary files
 required of users of traditional
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 systems can be avoided.
 .
 The
-.IR grog (@MAN1EXT@)
+.MR grog @MAN1EXT@
 program can be used to infer an appropriate
 .I groff
 command line to format a document.
@@ -871,7 +871,7 @@ The combination constitutes a document in one of a family 
of languages
 we also call
 .IR roff ;
 see
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 for background.
 .
 An overview of GNU
@@ -881,7 +881,7 @@ including lists of all supported escape sequences,
 requests,
 and pre-defined registers,
 can be found in
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .I groff
 extensions to the AT&T
@@ -891,7 +891,7 @@ a common subset of
 .I roff
 dialects extant today,
 are detailed in
-.IR \%groff_diff (@MAN7EXT@).
+.MR groff_diff @MAN7EXT@ .
 .
 .
 .\" ====================================================================
@@ -930,34 +930,34 @@ include
 .
 .RS
 .TP
-.IR \%@g@eqn (@MAN1EXT@)
+.MR @g@eqn @MAN1EXT@
 for mathematical formulae,
 .
 .
 .TP
-.IR \%@g@grn (@MAN1EXT@)
+.MR @g@grn @MAN1EXT@
 for pictures in
-.IR gremlin (1)
+.MR gremlin 1
 format,
 .
 .
 .TP
-.IR \%@g@pic (@MAN1EXT@)
+.MR @g@pic @MAN1EXT@
 for diagrams,
 .
 .
 .TP
-.IR \%@g@chem (@MAN1EXT@)
+.MR @g@chem @MAN1EXT@
 for chemical structure diagrams,
 .
 .
 .TP
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 for bibliographic references,
 .
 .
 .TP
-.IR \%@g@soelim (@MAN1EXT@)
+.MR @g@soelim @MAN1EXT@
 to preprocess files included with
 .I roff \" language
 .B .so
@@ -966,7 +966,7 @@ and
 .
 .
 .TP
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 for tables.
 .RE
 .
@@ -975,7 +975,7 @@ for tables.
 A preprocessor unique to GNU
 .I roff
 is
-.IR \%preconv (@MAN1EXT@),
+.MR preconv @MAN1EXT@ ,
 which converts various input encodings to something GNU
 .I troff \" GNU
 can understand.
@@ -1055,7 +1055,7 @@ provides the following such packages.
 is used to compose man pages in the format originating in Version\~7
 Unix (1979);
 see
-.IR groff_man (@MAN7EXT@).
+.MR groff_man @MAN7EXT@ .
 .
 It can be specified on the command line as
 .BR \-man .
@@ -1066,7 +1066,7 @@ It can be specified on the command line as
 is used to compose man pages in the format originating in 4.3BSD-Reno
 (1990);
 see
-.IR groff_mdoc (@MAN7EXT@).
+.MR groff_mdoc @MAN7EXT@ .
 .
 It can be specified on the command line as
 .BR \-mdoc .
@@ -1078,7 +1078,7 @@ is the Berkeley general-purpose macro suite,
 developed as an alternative to AT&T's
 .IR s ;
 see
-.IR groff_me (@MAN7EXT@).
+.MR groff_me @MAN7EXT@ .
 .
 It can be specified on the command line as
 .BR \-me .
@@ -1091,7 +1091,7 @@ second-generation AT&T macro suite for general documents,
 a successor to
 .IR s ;
 see
-.IR groff_mm (@MAN7EXT@).
+.MR groff_mm @MAN7EXT@ .
 .
 It can be specified on the command line as
 .BR \-mm .
@@ -1119,7 +1119,7 @@ takes the female pronoun\[em]can be specified on the 
command line as
 .I s
 is the original AT&T general-purpose document format;
 see
-.IR groff_ms (@MAN7EXT@).
+.MR groff_ms @MAN7EXT@ .
 .
 It can be specified on the command line as
 .BR \-ms .
@@ -1143,7 +1143,7 @@ It can be specified on the command line as
 .BR \%\-mandoc .
 .
 A
-.IR man (1)
+.MR man 1
 librarian program \" such as man-db, since 2001
 may use this macro file to delegate loading of the correct macro
 package;
@@ -1163,7 +1163,7 @@ These auxiliary packages are described,
 along with
 details of macro file naming and placement,
 in
-.IR groff_tmac (@MAN5EXT@).
+.MR groff_tmac @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -1175,7 +1175,7 @@ The central
 formatter within the
 .I groff
 system is
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 It provides the features of both the classical
 .I troff
@@ -1198,7 +1198,7 @@ as much as possible.
 .
 .P
 There is a shell script
-.IR \%@g@nroff (@MAN1EXT@)
+.MR @g@nroff @MAN1EXT@
 that emulates the behavior of classical
 .IR nroff .
 .
@@ -1211,7 +1211,7 @@ The formatter program generates a device-independent,
 but not device-agnostic,
 intermediate output format,
 documented in
-.IR groff_out (@MAN5EXT@).
+.MR groff_out @MAN5EXT@ .
 .
 .
 .\" ====================================================================
@@ -1228,7 +1228,7 @@ are
 dvi
 TeX DVI format
 (postprocessor is
-.IR grodvi (@MAN1EXT@)).
+.MR grodvi @MAN1EXT@ ).
 .
 .TP
 html
@@ -1247,7 +1247,7 @@ lbp
 Canon CaPSL printers
 (\%LBP-4 and \%LBP-8 series laser printers;
 postprocessor is
-.IR grolbp (@MAN1EXT@)).
+.MR grolbp @MAN1EXT@ ).
 .
 .TP
 lj4
@@ -1256,17 +1256,17 @@ HP LaserJet4-compatible
 printers
 (postprocessor
 is
-.IR grolj4 (@MAN1EXT@)).
+.MR grolj4 @MAN1EXT@ ).
 .
 .TP
 ps
 PostScript output (postprocessor is
-.IR grops (@MAN1EXT@)).
+.MR grops @MAN1EXT@ ).
 .
 .TP
 pdf
 Portable Document Format (PDF) output (postprocessor is
-.IR gropdf (@MAN1EXT@)).
+.MR gropdf @MAN1EXT@ ).
 .RE
 .RE
 .
@@ -1274,7 +1274,7 @@ Portable Document Format (PDF) output (postprocessor is
 .IP
 For the following TTY output devices
 (where postprocessor is
-.IR grotty (@MAN1EXT@)),
+.MR grotty @MAN1EXT@ ),
 .B \-T
 selects the output encoding:
 .
@@ -1357,7 +1357,7 @@ devices are as follows.
 .TP
 .B ascii
 Text output using the
-.IR ascii (7)
+.MR ascii 7
 character set.
 .
 .TP
@@ -1375,7 +1375,7 @@ HTML output.
 .TP
 .B latin1
 Text output using the ISO \%Latin-1 (ISO \%8859-1) character set; see
-.IR \%iso_8859_1 (7).
+.MR iso_8859_1 7 .
 .
 .TP
 .B lbp
@@ -1389,20 +1389,20 @@ HP LaserJet4-compatible (or other PCL5-compatible) 
printers.
 .TP
 .B ps
 PostScript output; suitable for printers and previewers like
-.IR gv (1).
+.MR gv 1 .
 .
 .TP
 .B pdf
 PDF files; suitable for viewing with tools such as
-.IR evince (1)
+.MR evince 1
 and
-.IR okular (1).
+.MR okular 1 .
 .
 .TP
 .B utf8
 Text output using the Unicode (ISO 10646) character set with \%UTF-8
 encoding; see
-.IR unicode (7).
+.MR unicode 7 .
 .
 .TP
 .B xhtml
@@ -1411,9 +1411,9 @@ XHTML output.
 .TP
 .B X75
 75dpi X Window System output suitable for the previewers
-.IR \%xditview (1x)
+.MR xditview 1x
 and
-.IR \%gxditview (@MAN1EXT@).
+.MR gxditview @MAN1EXT@ .
 .
 A variant for a 12\|pt document base font is
 .BR \%X75-12 .
@@ -1421,9 +1421,9 @@ A variant for a 12\|pt document base font is
 .TP
 .B X100
 100dpi X Window System output suitable for the previewers
-.IR \%xditview (1x)
+.MR xditview 1x
 and
-.IR \%gxditview (@MAN1EXT@).
+.MR gxditview @MAN1EXT@ .
 .
 A variant for a 12\|pt document base font is
 .BR \%X100-12 .
@@ -1434,7 +1434,7 @@ The postprocessor to be used for a device is specified by 
the
 .B postpro
 directive in the device description file;
 see
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 This can be overridden with the
 .B \-X
@@ -1453,15 +1453,15 @@ The default device is
 provides 3\~hardware postprocessors:
 .
 .TP
-.IR \%grolbp (@MAN1EXT@)
+.MR grolbp @MAN1EXT@
 for some Canon printers,
 .
 .TP
-.IR \%grolj4 (@MAN1EXT@)
+.MR grolj4 @MAN1EXT@
 for printers compatible to the HP LaserJet\~4 and PCL5,
 .
 .TP
-.IR \%grotty (@MAN1EXT@)
+.MR grotty @MAN1EXT@
 for text output using various encodings, e.g., on text-oriented
 terminals or line printers.
 .
@@ -1481,19 +1481,19 @@ The
 software devices for conversion into other document file formats are
 .
 .TP
-.IR \%grodvi (@MAN1EXT@)
+.MR grodvi @MAN1EXT@
 for the DVI format,
 .
 .TP
-.IR \%grohtml (@MAN1EXT@)
+.MR grohtml @MAN1EXT@
 for HTML and XHTML formats,
 .
 .TP
-.IR grops (@MAN1EXT@)
+.MR grops @MAN1EXT@
 for PostScript.
 .
 .TP
-.IR gropdf (@MAN1EXT@)
+.MR gropdf @MAN1EXT@
 for PDF.
 .
 .
@@ -1513,24 +1513,24 @@ The following utility programs around
 are available.
 .
 .TP
-.IR \%addftinfo (@MAN1EXT@)
+.MR addftinfo @MAN1EXT@
 Add information to
 .I troff
 font description files for use with
 .IR groff .
 .
 .TP
-.IR \%afmtodit (@MAN1EXT@)
+.MR afmtodit @MAN1EXT@
 Create font description files for PostScript device.
 .
 .TP
-.IR eqn2graph (@MAN1EXT@)
+.MR eqn2graph @MAN1EXT@
 Convert an
 .I eqn
 image into a cropped image.
 .
 .TP
-.IR \%gdiffmk (@MAN1EXT@)
+.MR gdiffmk @MAN1EXT@
 Mark differences between
 .IR groff ,
 .IR nroff ,
@@ -1539,55 +1539,55 @@ or
 files.
 .
 .TP
-.IR \%grap2graph (@MAN1EXT@)
+.MR grap2graph @MAN1EXT@
 Convert a
 .I grap
 diagram into a cropped bitmap image.
 .
 .TP
-.IR \%gxditview (@MAN1EXT@)
+.MR gxditview @MAN1EXT@
 The
 .I groff
 X viewer, the \f[CR]GNU\f[] version of
 .IR xditview .
 .
 .TP
-.IR \%hpftodit (@MAN1EXT@)
+.MR hpftodit @MAN1EXT@
 Create font description files for lj4 device.
 .
 .TP
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@indxbib @MAN1EXT@
 Make inverted index for bibliographic databases.
 .
 .TP
-.IR lkbib (@MAN1EXT@)
+.MR lkbib @MAN1EXT@
 Search bibliographic databases.
 .
 .TP
-.IR \%@g@lookbib (@MAN1EXT@)
+.MR @g@lookbib @MAN1EXT@
 Interactively search bibliographic databases.
 .
 .TP
-.IR \%pdfroff (@MAN1EXT@)
+.MR pdfroff @MAN1EXT@
 Create PDF documents using
 .IR groff .
 .
 .TP
-.IR \%pfbtops (@MAN1EXT@)
+.MR pfbtops @MAN1EXT@
 Translate a PostScript font in \&.pfb format to \f[CR]ASCII\f[].
 .
 .TP
-.IR \%pic2graph (@MAN1EXT@)
+.MR pic2graph @MAN1EXT@
 Convert a
 .I pic
 diagram into a cropped image.
 .
 .TP
-.IR \%tfmtodit (@MAN1EXT@)
+.MR tfmtodit @MAN1EXT@
 Create font description files for TeX DVI device.
 .
 .TP
-.IR \%xditview (1x)
+.MR xditview 1x
 .I roff
 viewer historically distributed with the X Window System.
 .\" Nowadays (2017) it's its own module as X.Org does not do monolithic
@@ -1595,7 +1595,7 @@ viewer historically distributed with the X Window System.
 .\" close to moribund, though.
 .
 .TP
-.IR \%xtotroff (@MAN1EXT@)
+.MR xtotroff @MAN1EXT@
 Convert X font metrics into \f[CR]GNU\f[]
 .I troff
 font metrics.
@@ -1710,7 +1710,7 @@ command-line option overrides the value of
 .IR \%GROFF_ENCODING .
 .
 See
-.IR preconv (@MAN1EXT@)
+.MR preconv @MAN1EXT@
 for details.
 .
 .
@@ -1720,9 +1720,9 @@ A list of directories in which to seek the selected 
output device's
 directory of device and font description files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -1730,9 +1730,9 @@ and
 A list of directories in which to seek macro files.
 .
 See
-.IR \%@g@troff (@MAN1EXT@)
+.MR @g@troff @MAN1EXT@
 and
-.IR \%groff_tmac (@MAN5EXT@).
+.MR groff_tmac @MAN5EXT@ .
 .
 .
 .TP
@@ -1759,10 +1759,10 @@ temporary files are created in
 .IR /tmp .
 .
 The
-.IR \%@g@refer (@MAN1EXT@),
-.IR \%grohtml (@MAN1EXT@),
+.MR @g@refer @MAN1EXT@ ,
+.MR grohtml @MAN1EXT@ ,
 and
-.IR grops (@MAN1EXT@)
+.MR grops @MAN1EXT@
 commands use temporary files.
 .
 .
@@ -1787,7 +1787,7 @@ A timestamp
 to use as the creation timestamp in place of the current time.
 .
 The time is converted to human-readable form using
-.IR ctime (3)
+.MR ctime 3
 when the formatter starts up and stored in registers usable by documents
 and macro packages.
 .
@@ -1799,7 +1799,7 @@ The time zone to use when converting the current time
 .IR SOURCE_DATE_EPOCH )
 to human-readable form;
 see
-.IR tzset (3).
+.MR tzset 3 .
 .
 .
 .\" ====================================================================
@@ -1860,7 +1860,7 @@ groff \-p \-t \-me \-T utf8 foo.me
 .
 .P
 An even easier way to do this is to use
-.IR grog (@MAN1EXT@)
+.MR grog @MAN1EXT@
 to guess the preprocessor and macro options and execute the result by
 using the command substitution feature of the shell.
 .
@@ -1919,13 +1919,13 @@ and
 .RB \[lq] utf8 \[rq]
 devices,
 programs like
-.IR more (1)
+.MR more 1
 and
-.IR less (1)
+.MR less 1
 may require command-line options to correctly handle some output
 sequences;
 see
-.IR \%grotty (@MAN1EXT@).
+.MR grotty @MAN1EXT@ .
 .
 .
 .P
@@ -1957,7 +1957,7 @@ On this installation, the following locations are used.
 .TP
 .I @APPRESDIR@
 Application defaults directory for
-.IR gxditview (@MAN1EXT@).
+.MR gxditview @MAN1EXT@ .
 .
 .
 .TP
@@ -1970,7 +1970,7 @@ executable commands.
 .TP
 .I @COMMON_WORDS_FILE@
 List of common words for
-.IR indxbib (@MAN1EXT@).
+.MR indxbib @MAN1EXT@ .
 .
 .
 .TP
@@ -1981,9 +1981,9 @@ Directory for data files.
 .TP
 .I @DEFAULT_INDEX@
 Default index for
-.IR lkbib (@MAN1EXT@)
+.MR lkbib @MAN1EXT@
 and
-.IR refer (@MAN1EXT@).
+.MR refer @MAN1EXT@ .
 .
 .
 .TP
@@ -2035,7 +2035,7 @@ file) directory.
 Font directory for compatibility with old versions of
 .IR groff ;
 see
-.IR grops (@MAN1EXT@).
+.MR grops @MAN1EXT@ .
 .
 .
 .TP
@@ -2058,7 +2058,7 @@ This contains all information related to macro packages.
 .
 Note that more than a single directory is searched for those files
 as documented in
-.IR \%groff_tmac (@MAN5EXT@).
+.MR groff_tmac @MAN5EXT@ .
 .
 For the
 .I groff
@@ -2103,7 +2103,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
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 For the
 .I groff
@@ -2120,7 +2120,7 @@ have a special meaning:
 Device description file for device
 .IR name ,
 see
-.IR \%groff_font (@MAN5EXT@).
+.MR groff_font @MAN5EXT@ .
 .
 .
 .TP
@@ -2235,121 +2235,121 @@ You can browse it interactively with \[lq]info 
groff\[rq].
 .\" so that it is easier to tell that we've enumerated all of them.
 .TP
 Introduction, history, and further reading:
-.IR roff (@MAN7EXT@), \" #23
-.IR ditroff (@MAN7EXT@) \" #16
+.MR roff @MAN7EXT@ , \" #23
+.MR ditroff @MAN7EXT@ \" #16
 .
 .
 .TP
 .RI "Viewer for\~" groff "\~(and AT&T device-independent)\~" troff \
 \~documents:
-.IR gxditview (@MAN1EXT@) \" #33
+.MR gxditview @MAN1EXT@ \" #33
 .
 .
 .TP
 Preprocessors:
-.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 \%preconv (@MAN1EXT@), \" #38
-.IR gperl (@MAN1EXT@), \" #5
-.IR \%@g@pic (@MAN1EXT@), \" #37
-.IR gpinyin (@MAN1EXT@), \" #6
-.IR \%@g@refer (@MAN1EXT@), \" #39
-.IR \%@g@soelim (@MAN1EXT@), \" #40
-.IR \%@g@tbl (@MAN1EXT@) \" #41
+.MR @g@chem @MAN1EXT@ , \" #1
+.MR @g@eqn @MAN1EXT@ , \" #34
+.MR @g@neqn @MAN1EXT@ , \" #35
+.MR glilypond @MAN1EXT@ , \" #4
+.MR @g@grn @MAN1EXT@ , \" #36
+.MR preconv @MAN1EXT@ , \" #38
+.MR gperl @MAN1EXT@ , \" #5
+.MR @g@pic @MAN1EXT@ , \" #37
+.MR gpinyin @MAN1EXT@ , \" #6
+.MR @g@refer @MAN1EXT@ , \" #39
+.MR @g@soelim @MAN1EXT@ , \" #40
+.MR @g@tbl @MAN1EXT@ \" #41
 .
 .
 .TP
 Macro packages and macro-specific utilities:
-.IR \%groff_hdtbl (@MAN7EXT@), \" #9
-.IR \%groff_man (@MAN7EXT@), \" #55a
-.IR \%groff_man_style (@MAN7EXT@), \" #55b
-.IR \%groff_mdoc (@MAN7EXT@), \" #56
-.IR \%groff_me (@MAN7EXT@), \" #57
-.IR \%groff_mm (@MAN7EXT@), \" # 10
-.IR \%groff_mmse (@MAN7EXT@), \" # 11
-.IR \%mmroff (@MAN1EXT@), \" #12
-.IR \%groff_mom (@MAN7EXT@), \" #13
-.IR \%pdfmom (@MAN1EXT@), \" #30
-.IR \%groff_ms (@MAN7EXT@), \" #58
-.IR \%groff_rfc1345 (@MAN7EXT@), \" added 2021-02-01
-.IR \%groff_trace (@MAN7EXT@), \" #60
-.IR \%groff_www (@MAN7EXT@) \" #59
+.MR groff_hdtbl @MAN7EXT@ , \" #9
+.MR groff_man @MAN7EXT@ , \" #55a
+.MR groff_man_style @MAN7EXT@ , \" #55b
+.MR groff_mdoc @MAN7EXT@ , \" #56
+.MR groff_me @MAN7EXT@ , \" #57
+.MR groff_mm @MAN7EXT@ , \" # 10
+.MR groff_mmse @MAN7EXT@ , \" # 11
+.MR mmroff @MAN1EXT@ , \" #12
+.MR groff_mom @MAN7EXT@ , \" #13
+.MR pdfmom @MAN1EXT@ , \" #30
+.MR groff_ms @MAN7EXT@ , \" #58
+.MR groff_rfc1345 @MAN7EXT@ , \" added 2021-02-01
+.MR groff_trace @MAN7EXT@ , \" #60
+.MR groff_www @MAN7EXT@ \" #59
 .
 .
 .TP
 Bibliographic and index tools:
-.IR \%@g@indxbib (@MAN1EXT@), \" #49
-.IR \%lkbib (@MAN1EXT@), \" #50
-.IR \%@g@lookbib (@MAN1EXT@) \" #51
+.MR @g@indxbib @MAN1EXT@ , \" #49
+.MR lkbib @MAN1EXT@ , \" #50
+.MR @g@lookbib @MAN1EXT@ \" #51
 .
 .
 .TP
 Language, conventions, and GNU extensions:
-.IR groff (@MAN7EXT@), \" #17
-.IR groff_char (@MAN7EXT@), \" #18
-.IR groff_diff (@MAN7EXT@), \" #19
-.IR \%groff_filenames (@MAN5EXT@), \" #8
-.IR groff_font (@MAN5EXT@), \" #20
-.IR groff_tmac (@MAN5EXT@) \" #22
+.MR groff @MAN7EXT@ , \" #17
+.MR groff_char @MAN7EXT@ , \" #18
+.MR groff_diff @MAN7EXT@ , \" #19
+.MR groff_filenames @MAN5EXT@ , \" #8
+.MR groff_font @MAN5EXT@ , \" #20
+.MR groff_tmac @MAN5EXT@ \" #22
 .
 .
 .TP
 Intermediate output language:
-.IR groff_out (@MAN5EXT@) \" #21
+.MR groff_out @MAN5EXT@ \" #21
 .
 .
 .TP
 Formatter program:
-.IR \%@g@troff (@MAN1EXT@) \" #45
+.MR @g@troff @MAN1EXT@ \" #45
 .
 .
 .TP
 Formatter wrappers:
 .\".IR groff (@MAN1EXT@), \" 42 -- this page
-.IR \%@g@nroff (@MAN1EXT@), \" #44
-.IR \%pdfroff (@MAN1EXT@) \" #14
+.MR @g@nroff @MAN1EXT@ , \" #44
+.MR pdfroff @MAN1EXT@ \" #14
 .
 .
 .TP
 Postprocessors for output devices:
-.IR \%grodvi (@MAN1EXT@), \" #24
-.IR \%grohtml (@MAN1EXT@), \" #25
-.IR grolbp (@MAN1EXT@), \" #26
-.IR grolj4 (@MAN1EXT@), \" #27
-.IR lj4_font (@MAN5EXT@), \" #28
-.IR gropdf (@MAN1EXT@), \" #29
-.IR grops (@MAN1EXT@), \" #31
-.IR \%grotty (@MAN1EXT@) \" #32
+.MR grodvi @MAN1EXT@ , \" #24
+.MR grohtml @MAN1EXT@ , \" #25
+.MR grolbp @MAN1EXT@ , \" #26
+.MR grolj4 @MAN1EXT@ , \" #27
+.MR lj4_font @MAN5EXT@ , \" #28
+.MR gropdf @MAN1EXT@ , \" #29
+.MR grops @MAN1EXT@ , \" #31
+.MR grotty @MAN1EXT@ \" #32
 .
 .
 .TP
 Font support utilities:
-.IR \%addftinfo (@MAN1EXT@), \" #46
-.IR \%afmtodit (@MAN1EXT@), \" #47
-.IR \%hpftodit (@MAN1EXT@), \" #48
-.IR \%pfbtops (@MAN1EXT@), \" #52
-.IR \%tfmtodit (@MAN1EXT@), \" #53
-.IR xtotroff (@MAN1EXT@) \" #54
+.MR addftinfo @MAN1EXT@ , \" #46
+.MR afmtodit @MAN1EXT@ , \" #47
+.MR hpftodit @MAN1EXT@ , \" #48
+.MR pfbtops @MAN1EXT@ , \" #52
+.MR tfmtodit @MAN1EXT@ , \" #53
+.MR xtotroff @MAN1EXT@ \" #54
 .
 .
 .TP
 Graphics conversion utilities:
-.IR eqn2graph (@MAN1EXT@), \" #2
-.IR grap2graph (@MAN1EXT@), \" #7
-.IR pic2graph (@MAN1EXT@) \" #15
+.MR eqn2graph @MAN1EXT@ , \" #2
+.MR grap2graph @MAN1EXT@ , \" #7
+.MR pic2graph @MAN1EXT@ \" #15
 .
 .
 .TP
 Difference-marking utility:
-.IR \%gdiffmk (@MAN1EXT@) \" #3
+.MR gdiffmk @MAN1EXT@ \" #3
 .
 .
 .TP
 \[lq]groff guess\[rq] utility:
-.IR grog (@MAN1EXT@) \" #43
+.MR grog @MAN1EXT@ \" #43
 .
 .
 .\" 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 a476f54..327c978 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -87,7 +87,7 @@
 .
 .I \%@g@nroff
 formats documents written in the
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 language for typewriter-like devices such as terminal emulators.
 .
 GNU
@@ -95,11 +95,11 @@ GNU
 emulates the AT&T
 .I nroff \" AT&T
 command using
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .I \%@g@nroff
 generates output via
-.IR grotty (@MAN1EXT@),
+.MR grotty @MAN1EXT@ ,
 .IR groff 's
 terminal output driver,
 which needs to know the character encoding scheme used by the device.
@@ -126,7 +126,7 @@ specifies a (valid) device,
 consults the locale to select an appropriate output device.
 .
 It first tries the
-.IR locale (1)
+.MR locale 1
 program,
 then checks several locale-related environment variables;
 see section \[lq]Environment\[rq], below.
@@ -155,7 +155,7 @@ The
 and
 .B \-z
 options have the effects described in
-.IR \%@g@troff (@MAN1EXT@).
+.MR @g@troff @MAN1EXT@ .
 .
 .B \-c
 and
@@ -189,7 +189,7 @@ The options
 and
 .B \-S
 are documented in
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .B \-V
 causes
@@ -289,24 +289,24 @@ unrepresentable glyphs.
 .
 .P
 Pager programs like
-.IR more (1)
+.MR more 1
 and
-.IR less (1)
+.MR less 1
 may require command-line options to correctly handle some output
 sequences;
 see
-.IR \%grotty (@MAN1EXT@).
+.MR grotty @MAN1EXT@ .
 .
 .
 .\" ====================================================================
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR grotty (@MAN1EXT@),
-.IR locale (1),
-.IR roff (@MAN7EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR grotty @MAN1EXT@ ,
+.MR locale 1 ,
+.MR roff @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 4016a2a..32682b4 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -103,7 +103,7 @@ It is functionally compatible with the AT&T
 typesetter and features numerous extensions.
 .
 Many people prefer to use the
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 command,
 a front end which also runs preprocessors and output drivers in the
 appropriate order and with appropriate options.
@@ -209,7 +209,7 @@ or
 must be a one-character name.
 .
 Due to
-.IR getopt_long (3)
+.MR getopt_long 3
 limitations,
 .IR c\~ cannot
 be and
@@ -386,7 +386,7 @@ or
 be a one-character name.
 .
 Due to
-.IR getopt_long (3)
+.MR getopt_long 3
 limitations,
 .IR c\~ cannot
 be and
@@ -412,7 +412,7 @@ Prepare output for device
 rather than the default,
 .RB \[lq] @DEVICE@ \[rq];
 see
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .
 .TP
@@ -808,7 +808,7 @@ A timestamp
 to use as the creation timestamp in place of the current time.
 .
 The time is converted to human-readable form using
-.IR ctime (3)
+.MR ctime 3
 when the formatter starts up and stored in registers usable by documents
 and macro packages.
 .
@@ -820,7 +820,7 @@ The timezone to use when converting the current time
 .IR SOURCE_DATE_EPOCH )
 to human-readable form;
 see
-.IR tzset (3).
+.MR tzset 3 .
 .
 .
 .\" ====================================================================
@@ -918,7 +918,7 @@ You can browse it interactively with \[lq]info groff\[rq].
 .
 .
 .TP
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 offers an overview of the GNU
 .I roff
 system
@@ -926,7 +926,7 @@ and describes its front end executable.
 .
 .
 .TP
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 details the
 .I groff
 language,
@@ -936,7 +936,7 @@ and escape sequences.
 .
 .
 .TP
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 explains the syntax of
 .I groff
 special character escape sequences,
@@ -944,7 +944,7 @@ and lists all special characters predefined by the language.
 .
 .
 .TP
-.IR groff_diff (@MAN7EXT@)
+.MR groff_diff @MAN7EXT@
 enumerates the differences between
 AT&T device-independent
 .I troff \" AT&T
@@ -953,27 +953,27 @@ and
 .
 .
 .TP
-.IR groff_font (@MAN5EXT@)
+.MR groff_font @MAN5EXT@
 covers the format of
 .I groff
 device and font description files.
 .
 .
 .TP
-.IR groff_out (@MAN5EXT@)
+.MR groff_out @MAN5EXT@
 describes the format of
 .IR \%@g@troff 's
 output.
 .
 .
 .TP
-.IR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 includes information about macro files that ship with
 .IR groff .
 .
 .
 .TP
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 supplies background on
 .I roff
 systems in general,
diff --git a/src/utils/addftinfo/addftinfo.1.man 
b/src/utils/addftinfo/addftinfo.1.man
index a9788ec..4cc6ad6 100644
--- a/src/utils/addftinfo/addftinfo.1.man
+++ b/src/utils/addftinfo/addftinfo.1.man
@@ -198,9 +198,9 @@ The defaults are chosen to produce reasonable values for a 
Times font.
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff_font (@MAN5EXT@),
-.IR groff (@MAN1EXT@),
-.IR groff_char (@MAN7EXT@)
+.MR groff_font @MAN5EXT@ ,
+.MR groff @MAN1EXT@ ,
+.MR groff_char @MAN7EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index 148bf71..abd9df8 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -73,7 +73,7 @@ for use with the
 and
 .B pdf
 output drivers of
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .I map-file
 associates a
@@ -191,7 +191,7 @@ If there is a downloadable font file for the font,
 it may be listed in the file
 .IR \%@FONTDIR@/\:\%devps/\:\%download ;
 see
-.IR grops (@MAN1EXT@).
+.MR grops @MAN1EXT@ .
 .
 .
 .LP
@@ -203,7 +203,7 @@ automatically generates an italic correction,
 a left italic correction,
 and a subscript correction for each character
 (the significance of these is explained in
-.IR groff_font (@MAN5EXT@));
+.MR groff_font @MAN5EXT@ );
 they can be specified for individual characters by
 adding to the
 .I afm-file
@@ -289,7 +289,7 @@ in
 The format of
 .I enc-file
 is described in
-.IR grops (@MAN1EXT@).
+.MR grops @MAN1EXT@ .
 .
 If not found in the current directory,
 the
@@ -378,7 +378,7 @@ Roman font files distributed with
 were created with
 .B \-i0\ \-m
 to improve spacing with
-.IR \%@g@eqn (@MAN1EXT@).
+.MR @g@eqn @MAN1EXT@ .
 .
 .
 .TP
@@ -454,10 +454,10 @@ You can browse it interactively with \[lq]info 
\[aq](groff)Using
 .
 .
 .LP
-.IR groff (@MAN1EXT@),
-.IR gropdf (@MAN1EXT@),
-.IR grops (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@)
+.MR groff @MAN1EXT@ ,
+.MR gropdf @MAN1EXT@ ,
+.MR grops @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/grog/grog.1.man b/src/utils/grog/grog.1.man
index fb9c635..401367c 100644
--- a/src/utils/grog/grog.1.man
+++ b/src/utils/grog/grog.1.man
@@ -64,7 +64,7 @@ requires
 .I grog
 reads its input
 and guesses which
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 options are needed to render it.
 .
 If no operands are given,
@@ -145,7 +145,7 @@ reads each
 operand,
 pattern-matching strings that are statistically likely to be
 characteristic of
-.IR roff (@MAN7EXT@)
+.MR roff @MAN7EXT@
 documents.
 .
 It tries to guess which of the following
@@ -203,7 +203,7 @@ or IBM code page 1047,
 specification of a
 .I groff
 option to run the
-.IR preconv (@MAN1EXT@)
+.MR preconv @MAN1EXT@
 preprocessor is advised;
 see the
 .BR \-D ,
@@ -211,7 +211,7 @@ see the
 and
 .B \-K
 options of
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 For UTF-8 input,
 .B \-k
@@ -313,7 +313,7 @@ Detection of the
 .B \-s
 option
 (the
-.IR \%@g@soelim (@MAN1EXT@)
+.MR @g@soelim @MAN1EXT@
 preprocessor)
 is tricky;
 to correctly infer its necessity would require
@@ -375,7 +375,7 @@ In the foregoing example,
 we see that this procedure enabled
 .I grog
 to detect
-.IR @g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 macros,
 so we would add
 .B \-s
@@ -531,7 +531,7 @@ Consider a file
 which uses the
 .I \%@g@grn
 preprocessor to include a
-.IR \%gremlin (1)
+.MR gremlin 1
 picture file in an
 .I me \" generic
 document.
@@ -594,7 +594,7 @@ G.\& Branden Robinson
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 .
 .
 .\" 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 21a5779..6a20b28 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -72,9 +72,9 @@ hpftodit \- create font description files for use with groff 
\-Tlj4
 creates a font file for use with a Hewlett-Packard LaserJet\~4-\%series
 (or newer)
 printer with the
-.IR grolj4 (@MAN1EXT@),
+.MR grolj4 @MAN1EXT@ ,
 output driver of
-.IR groff (@MAN1EXT@),
+.MR groff @MAN1EXT@ ,
 using data from an HP tagged font metric (TFM) file.
 .
 .I tfm-file
@@ -106,7 +106,7 @@ are the
 .I groff
 names of the character
 (see
-.IR groff_char (@MAN7EXT@)
+.MR groff_char @MAN7EXT@
 for a list).
 .
 The values can be separated by any whitespace;
@@ -136,7 +136,7 @@ If the given Unicode value is in the Private Use Area
 the glyph is included as an unnamed glyph.
 .
 Refer to
-.IR groff_diff (@MAN1EXT@)
+.MR groff_diff @MAN1EXT@
 for additional information about unnamed glyphs and how to access them.
 .
 .
@@ -228,7 +228,7 @@ automatically will generate an italic correction,
 a left italic correction and a subscript correction
 for each character
 (the significance of these parameters is explained in
-.IR groff_font (@MAN5EXT@)).
+.MR groff_font @MAN5EXT@ ).
 .
 .
 .\" ====================================================================
@@ -434,11 +434,11 @@ symbol mapping files
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR groff_diff (@MAN1EXT@),
-.IR grolj4 (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@),
-.IR lj4_font (@MAN5EXT@)
+.MR groff @MAN1EXT@ ,
+.MR groff_diff @MAN1EXT@ ,
+.MR grolj4 @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@ ,
+.MR 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 c2cc5bb..a32c730 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -81,10 +81,10 @@
 makes an inverted index for the bibliographic databases in each
 .I file
 for use with
-.IR \%@g@refer (@MAN1EXT@),
-.IR \%@g@lookbib (@MAN1EXT@),
+.MR @g@refer @MAN1EXT@ ,
+.MR @g@lookbib @MAN1EXT@ ,
 and
-.IR \%lkbib (@MAN1EXT@).
+.MR lkbib @MAN1EXT@ .
 .
 Each created index is named
 .RI file @INDEX_SUFFIX@ ;
@@ -170,12 +170,12 @@ Use
 .I dir
 as the pathname of the current working directory to store in the index,
 instead of the path printed by
-.IR pwd (1).
+.MR pwd 1 .
 .
 Usually
 .I dir
 will be a symbolic link that points to the directory printed by
-.IR pwd (1).
+.MR pwd 1 .
 .
 .
 .TP
@@ -320,9 +320,9 @@ AT&T Bell Laboratories Computing Science Technical Report 
No.\& 69.
 .
 .
 .LP
-.IR \%@g@refer (@MAN1EXT@),
-.IR \%lkbib (@MAN1EXT@),
-.IR \%@g@lookbib (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@ ,
+.MR lkbib @MAN1EXT@ ,
+.MR @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 9a435ce..62e5881 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -86,7 +86,7 @@ to be searched,
 if an index
 .RI filename @INDEX_SUFFIX@
 created by
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@indxbib @MAN1EXT@
 exists, then it will be searched instead;
 each index can cover multiple databases.
 .
@@ -169,9 +169,9 @@ AT&T Bell Laboratories Computing Science Technical Report 
No.\& 69.
 .
 .
 .LP
-.IR \%@g@refer (@MAN1EXT@),
-.IR \%@g@lookbib (@MAN1EXT@),
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@ ,
+.MR @g@lookbib @MAN1EXT@ ,
+.MR @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 977a0ef..880ee68 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -77,7 +77,7 @@ to be searched,
 if an index
 .RI filename @INDEX_SUFFIX@
 created by
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@indxbib @MAN1EXT@
 exists, then it will be searched instead;
 each index can cover multiple databases.
 .
@@ -134,9 +134,9 @@ AT&T Bell Laboratories Computing Science Technical Report 
No.\& 69.
 .
 .
 .LP
-.IR \%@g@refer (@MAN1EXT@),
-.IR lkbib (@MAN1EXT@),
-.IR \%@g@indxbib (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@ ,
+.MR lkbib @MAN1EXT@ ,
+.MR @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 120fc1e..35b48b7 100644
--- a/src/utils/pfbtops/pfbtops.1.man
+++ b/src/utils/pfbtops/pfbtops.1.man
@@ -73,7 +73,7 @@ PostScript fonts for MS-DOS were historically supplied in PFB 
format.
 .
 .LP
 The resulting PFA font can be used with
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 if it is first listed in
 .I \%@FONTDIR@/\:\%devps/\:\%download
 and
@@ -95,8 +95,8 @@ all exit afterward.
 .SH "See also"
 .\" ====================================================================
 .
-.IR grops (@MAN1EXT@),
-.IR gropdf (@MAN1EXT@)
+.MR grops @MAN1EXT@ ,
+.MR gropdf @MAN1EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/tfmtodit/tfmtodit.1.man 
b/src/utils/tfmtodit/tfmtodit.1.man
index 26974e6..08cbe1b 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -75,7 +75,7 @@ tfmtodit \- adapt TeX Font Metrics files for groff \-Tdvi
 creates a font file for use with the
 .B dvi
 output driver of
-.IR groff (@MAN1EXT@).
+.MR groff @MAN1EXT@ .
 .
 .I tfm-file
 is the name of the \*(tx font metric file for the font.
@@ -282,9 +282,9 @@ Font description file for font
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR grodvi (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@)
+.MR groff @MAN1EXT@ ,
+.MR grodvi @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/src/utils/xtotroff/xtotroff.1.man 
b/src/utils/xtotroff/xtotroff.1.man
index 3a3c9d2..e6499e8 100644
--- a/src/utils/xtotroff/xtotroff.1.man
+++ b/src/utils/xtotroff/xtotroff.1.man
@@ -64,7 +64,7 @@ xtotroff \- convert X font metrics into groff font metrics
 uses
 .I font-map
 to create
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 font description files from X11 fonts.
 .
 Each line in
@@ -174,11 +174,11 @@ by Jim Flowers and Stephen Gildea.
 .
 .
 .PP
-.IR X (7),
-.IR groff (@MAN1EXT@),
-.IR gxditview (@MAN1EXT@),
-.IR troff (@MAN1EXT@),
-.IR groff_font (@MAN5EXT@)
+.MR X 7 ,
+.MR groff @MAN1EXT@ ,
+.MR gxditview @MAN1EXT@ ,
+.MR troff @MAN1EXT@ ,
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in
index 0b8c773..500fabb 100644
--- a/tmac/groff_man.7.man.in
+++ b/tmac/groff_man.7.man.in
@@ -15,7 +15,7 @@ _ifstyle()dnl
 the width of a letter \(lqn\(rq in the font current when the macro is
 called
 (see section \(lqNumerical Expressions\(rq in
-.IR groff (@MAN7EXT@))\c
+.MR groff @MAN7EXT@ )\c
 _endif
 \&.
 
@@ -124,7 +124,7 @@ _ifnotstyle()dnl
 Man page authors and maintainers who are not already experienced
 .I groff
 users should consult
-.IR groff_man_style (@MAN7EXT@),
+.MR groff_man_style @MAN7EXT@ ,
 an expanded version of this document,
 for additional explanations and advice.
 .
@@ -310,7 +310,7 @@ group of macros.
 .B .TH
 (title heading) identifies the document as a man page and defines
 information enabling its indexing by
-.IR mandb (8)
+.MR mandb 8
 or a similar tool.
 .
 Section headings
@@ -359,7 +359,7 @@ manuals.
 _endif()dnl
 .
 See
-.IR man (1)
+.MR man 1
 for details on the section numbers and suffixes applicable to your
 system.
 .
@@ -502,10 +502,10 @@ for a man page to be properly indexed.
 .
 See
 _ifnotstyle()dnl
-.IR groff_man_style (@MAN7EXT@)
+.MR groff_man_style @MAN7EXT@
 for suggestions and
 _endif()dnl
-.IR man (7)
+.MR man 7
 for the conventions prevailing on your system.
 .RE \" Move left margin back to standard position.
 .
@@ -913,7 +913,7 @@ Multiple
 blocks can be specified,
 for instance to distinguish differing modes of operation of a complex
 command like
-.IR tar (1);
+.MR tar 1 ;
 each will be vertically separated as paragraphs are.
 .
 .
@@ -1610,7 +1610,7 @@ _endif()dnl
 see subsection \(lqPortability\(rq
 _ifnotstyle()dnl
 in
-.IR groff_man_style (@MAN7EXT@)
+.MR groff_man_style @MAN7EXT@
 for approaches.
 _endif()dnl
 _ifstyle()dnl
@@ -1760,7 +1760,7 @@ that is,
 the width of a letter \(lqn\(rq in the font current when the macro is
 called
 (see section \(lqNumerical Expressions\(rq in
-.IR groff (@MAN7EXT@)).
+.MR groff @MAN7EXT@ ).
 _endif()dnl
 _ifnotstyle()dnl
 package assumes \(lqn\(rq.
@@ -1979,7 +1979,7 @@ check,
 or which is developed in the future.
 .
 The table preprocessor
-.IR \%@g@tbl (@MAN1EXT@)
+.MR @g@tbl @MAN1EXT@
 can likely meet your needs.
 _endif()dnl
 .
@@ -2049,7 +2049,7 @@ The following strings are defined for use in man pages.
 _ifnotstyle()dnl
 None of these is necessary in a contemporary man page;
 see
-.IR groff_man_style (@MAN7EXT@).
+.MR groff_man_style @MAN7EXT@ .
 _endif()dnl
 .
 Others are supported for configuration of rendering parameters;
@@ -2787,7 +2787,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@)
+.MR @g@tbl @MAN1EXT@
 markup instead.
 .
 .
@@ -3046,7 +3046,7 @@ Any valid argument to
 \[lq].ad\[rq] request may be used.
 .
 See
-.IR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 for less-common choices.
 .
 .
@@ -3140,14 +3140,14 @@ Any valid argument to
 \[lq].ft\[rq] request may be used.
 .
 See
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 .
 .TP
 .BI \-rHY= hyphenation-mode
 Set hyphenation mode,
 as documented in section \(lqHyphenation\(rq of
-.IR groff (@MAN7EXT@).
+.MR groff @MAN7EXT@ .
 .
 Use
 .B \-rHY=0
@@ -3299,7 +3299,7 @@ and so forth.
 .
 The register tracking the suffixed page letter uses format \(lqa\(rq
 (see the \(lq.af\(rq request in
-.IR groff (@MAN7EXT@)).
+.MR groff @MAN7EXT@ ).
 .
 _ifstyle()dnl
 For example,
@@ -3469,7 +3469,7 @@ end of the site-local file.
 .
 However,
 a security-sandboxed
-.IR man (1) \" such as man-db 2.8.5
+.MR man 1 \" such as man-db 2.8.5
 program may lack permission to open such files.
 .RE
 .
@@ -3776,20 +3776,20 @@ _endif()dnl
 .SH "See also"
 .\" ====================================================================
 .
-.IR \%@g@tbl (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
+.MR @g@tbl @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
 and
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 are preprocessors used with man pages.
 .
 .
 .P
-.IR man (1)
+.MR man 1
 describes the man page librarian on your system.
 .
 .
 .P
-.IR groff_mdoc (@MAN7EXT@)
+.MR groff_mdoc @MAN7EXT@
 describes the
 .I groff
 version of the BSD-originated alternative macro package for man pages.
@@ -3797,14 +3797,14 @@ version of the BSD-originated alternative macro package 
for man pages.
 .
 .P
 _ifstyle()dnl
-.IR groff_man (@MAN7EXT@),
+.MR groff_man @MAN7EXT@ ,
 _endif()dnl
 _ifnotstyle()dnl
-.IR groff_man_style (@MAN7EXT@),
+.MR groff_man_style @MAN7EXT@ ,
 _endif()dnl
-.IR groff (@MAN7EXT@),
-.IR groff_char (@MAN7EXT@),
-.IR man (7)
+.MR groff @MAN7EXT@ ,
+.MR groff_char @MAN7EXT@ ,
+.MR man 7
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.7.man
index 3bc8c55..bf8aab7 100644
--- a/tmac/groff_me.7.man
+++ b/tmac/groff_me.7.man
@@ -588,17 +588,17 @@ You can browse it interactively with \[lq]info groff\[rq].
 For preprocessors supported by
 .IR me ,
 see
-.IR \%@g@eqn (@MAN1EXT@),
-.IR \%@g@grn (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR \%@g@refer (@MAN1EXT@),
+.MR @g@eqn @MAN1EXT@ ,
+.MR @g@grn @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@refer @MAN1EXT@ ,
 and
-.IR \%@g@tbl (@MAN1EXT@).
+.MR @g@tbl @MAN1EXT@ .
 .
 .
 .P
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @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 4715ebc..5709653 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -77,11 +77,11 @@ and indexing.
 .
 .I ms
 supports the
-.IR \%@g@tbl (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
+.MR @g@tbl @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
 and
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 preprocessors for inclusion of tables,
 mathematical equations,
 diagrams,
@@ -1391,7 +1391,7 @@ Denote a reference to be processed by the
 preprocessor.
 .
 The GNU
-.IR \%@g@refer (@MAN1EXT@)
+.MR @g@refer @MAN1EXT@
 manual page provides a comprehensive reference
 to the preprocessor and the format of the
 bibliographic database.
@@ -2444,12 +2444,12 @@ You can browse it interactively with \[lq]info 
groff\[rq].
 .
 .
 .PP
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR \%@g@tbl (@MAN1EXT@),
-.IR \%@g@pic (@MAN1EXT@),
-.IR \%@g@eqn (@MAN1EXT@),
-.IR \%@g@refer (@MAN1EXT@)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR @g@tbl @MAN1EXT@ ,
+.MR @g@pic @MAN1EXT@ ,
+.MR @g@eqn @MAN1EXT@ ,
+.MR @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 40586c8..7745f5c 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -43,7 +43,7 @@ groff_trace \- GNU roff macros for debugging groff documents
 The
 .I trace
 macro package of
-.IR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 can be a valuable tool for debugging documents written in the
 .I roff
 formatting language.
@@ -257,7 +257,7 @@ macros are kept in the file
 located in the
 .IR "tmac directory" ;
 see
-.IR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 for details.
 .
 .
@@ -289,23 +289,23 @@ You can browse it interactively with \[lq]info groff\[rq].
 .
 .
 .TP
-.BR groff (@MAN1EXT@)
+.MR groff @MAN1EXT@
 An overview of the groff system.
 .
 .
 .TP
-.BR troff (@MAN1EXT@)
+.MR troff @MAN1EXT@
 For details on option
 .BR \-m .
 .
 .
 .TP
-.BR groff_tmac (@MAN5EXT@)
+.MR groff_tmac @MAN5EXT@
 A general description of groff macro packages.
 .
 .
 .TP
-.BR groff (@MAN7EXT@)
+.MR groff @MAN7EXT@
 A short reference for the groff formatting language.
 .
 .
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index a2e3eb0..1e76304 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -719,10 +719,10 @@ Bernd Warken
 .SH "See also"
 .\" ====================================================================
 .
-.IR groff (@MAN1EXT@),
-.IR \%@g@troff (@MAN1EXT@),
-.IR \%grohtml (@MAN1EXT@),
-.IR netpbm (1)
+.MR groff @MAN1EXT@ ,
+.MR @g@troff @MAN1EXT@ ,
+.MR grohtml @MAN1EXT@ ,
+.MR netpbm 1
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).



reply via email to

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