groff-commit
[Top][All Lists]
Advanced

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

[groff] 06/06: **/*.{man,tmac}: Save compatibility mode robustly.


From: G. Branden Robinson
Subject: [groff] 06/06: **/*.{man,tmac}: Save compatibility mode robustly.
Date: Sun, 19 Apr 2020 01:49:59 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 1474eebe1f83c439dd6d422a311c1c39417fac40
Author: G. Branden Robinson <address@hidden>
AuthorDate: Sun Apr 19 15:24:24 2020 +1000

    **/*.{man,tmac}: Save compatibility mode robustly.
    
    Use new \n[.cp] register to save compatibilty mode.
    
    Use register names based on the filename (at the source maintenance
    level) to avoid clobbering other files' saved compatibility modes.
    
    tmac/html.tmac: Eliminate reference to saved-compatibility register by
    moving its test inside the block where compatibility mode is off.  This
    is the only part of this changeset that was not automated.
---
 ChangeLog                                     | 15 +++++++++++++++
 contrib/chem/chem.1.man                       |  4 ++--
 contrib/eqn2graph/eqn2graph.1.man             |  4 ++--
 contrib/gdiffmk/gdiffmk.1.man                 |  4 ++--
 contrib/glilypond/glilypond.1.man             |  4 ++--
 contrib/gperl/gperl.1.man                     |  4 ++--
 contrib/gpinyin/gpinyin.1.man                 |  4 ++--
 contrib/grap2graph/grap2graph.1.man           |  4 ++--
 contrib/groff_filenames/groff_filenames.5.man |  4 ++--
 contrib/groffer/groffer.1.man                 |  4 ++--
 contrib/groffer/roff2.1.man                   |  4 ++--
 contrib/hdtbl/groff_hdtbl.7.man               |  4 ++--
 contrib/mm/groff_mm.7.man                     |  4 ++--
 contrib/mm/groff_mmse.7.man                   |  4 ++--
 contrib/mm/mmroff.1.man                       |  4 ++--
 contrib/mom/groff_mom.7.man                   |  4 ++--
 contrib/pdfmark/pdfroff.1.man                 |  4 ++--
 contrib/pic2graph/pic2graph.1.man             |  4 ++--
 man/ditroff.7.man                             |  4 ++--
 man/groff.7.man                               |  4 ++--
 man/groff_char.7.man                          |  4 ++--
 man/groff_diff.7.man                          |  4 ++--
 man/groff_font.5.man                          |  4 ++--
 man/groff_out.5.man                           |  4 ++--
 man/groff_tmac.5.man                          |  4 ++--
 man/roff.7.man                                |  4 ++--
 src/devices/grodvi/grodvi.1.man               |  4 ++--
 src/devices/grohtml/grohtml.1.man             |  4 ++--
 src/devices/grolbp/grolbp.1.man               |  4 ++--
 src/devices/grolj4/grolj4.1.man               |  4 ++--
 src/devices/grolj4/lj4_font.5.man             |  4 ++--
 src/devices/gropdf/gropdf.1.man               |  4 ++--
 src/devices/gropdf/pdfmom.1.man               |  4 ++--
 src/devices/grops/grops.1.man                 |  4 ++--
 src/devices/grotty/grotty.1.man               |  4 ++--
 src/devices/xditview/gxditview.1.man          |  4 ++--
 src/preproc/eqn/eqn.1.man                     |  4 ++--
 src/preproc/grn/grn.1.man                     |  4 ++--
 src/preproc/pic/pic.1.man                     |  4 ++--
 src/preproc/preconv/preconv.1.man             |  4 ++--
 src/preproc/refer/refer.1.man                 |  4 ++--
 src/preproc/soelim/soelim.1.man               |  4 ++--
 src/preproc/tbl/tbl.1.man                     |  4 ++--
 src/roff/groff/groff.1.man                    |  4 ++--
 src/roff/grog/grog.1.man                      |  4 ++--
 src/roff/nroff/nroff.1.man                    |  4 ++--
 src/roff/troff/troff.1.man                    |  4 ++--
 src/utils/afmtodit/afmtodit.1.man             |  4 ++--
 src/utils/hpftodit/hpftodit.1.man             |  4 ++--
 src/utils/indxbib/indxbib.1.man               |  4 ++--
 src/utils/lkbib/lkbib.1.man                   |  4 ++--
 src/utils/lookbib/lookbib.1.man               |  4 ++--
 src/utils/pfbtops/pfbtops.1.man               |  4 ++--
 src/utils/tfmtodit/tfmtodit.1.man             |  4 ++--
 tmac/X.tmac                                   |  4 ++--
 tmac/Xps.tmac                                 |  4 ++--
 tmac/an-old.tmac                              |  4 ++--
 tmac/andoc.tmac                               |  4 ++--
 tmac/cp1047.tmac                              |  4 ++--
 tmac/devtag.tmac                              |  4 ++--
 tmac/dvi.tmac                                 |  4 ++--
 tmac/ec.tmac                                  |  4 ++--
 tmac/fallbacks.tmac                           |  4 ++--
 tmac/groff_man.7.man                          |  4 ++--
 tmac/groff_me.7.man                           |  4 ++--
 tmac/groff_ms.7.man                           |  4 ++--
 tmac/groff_trace.7.man                        |  4 ++--
 tmac/groff_www.7.man                          |  4 ++--
 tmac/html-end.tmac                            |  4 ++--
 tmac/html.tmac                                |  7 +++----
 tmac/latin1.tmac                              |  4 ++--
 tmac/latin2.tmac                              |  4 ++--
 tmac/latin5.tmac                              |  4 ++--
 tmac/latin9.tmac                              |  4 ++--
 tmac/lbp.tmac                                 |  4 ++--
 tmac/lj4.tmac                                 |  4 ++--
 tmac/papersize.tmac                           |  4 ++--
 tmac/pdfpic.tmac                              |  4 ++--
 tmac/ps.tmac                                  |  4 ++--
 tmac/psold.tmac                               |  4 ++--
 tmac/pspic.tmac                               |  4 ++--
 tmac/trace.tmac                               |  4 ++--
 tmac/tty-char.tmac                            |  4 ++--
 tmac/tty.tmac                                 |  4 ++--
 tmac/unicode.tmac                             |  4 ++--
 tmac/www.tmac.in                              |  4 ++--
 86 files changed, 186 insertions(+), 172 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 235a32a..df467a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2020-04-19  G. Branden Robinson <address@hidden>
+
+       * **/*.{man,tmac}: Save compatibility mode robustly.
+
+       Use new \n[.cp] register to save compatibilty mode.
+
+       Use register names based on the filename (at the source
+       maintenance level) to avoid clobbering other files' saved
+       compatibility modes.
+
+       * tmac/html.tmac: Eliminate reference to saved-compatibility
+       register by moving its test inside the block where compatibility
+       mode is off.  This is the only part of this changeset that was
+       not automated.
+
 2020-04-16  G. Branden Robinson <address@hidden>
 
        Implement new read-only .cp register.
diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index fa39205..a39ce44 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -30,7 +30,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr chem_C \n[.C]
+.do nr *groff_chem_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -928,7 +928,7 @@ is
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[chem_C]
+.cp \n[*groff_chem_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/eqn2graph/eqn2graph.1.man 
b/contrib/eqn2graph/eqn2graph.1.man
index 7ba468c..06f1955 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -4,7 +4,7 @@ eqn2graph \- convert an EQN equation into a cropped image
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr eqn2graph_C \n[.C]
+.do nr *groff_eqn2graph_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -158,7 +158,7 @@ by W.\& Richard Stevens.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[eqn2graph_C]
+.cp \n[*groff_eqn2graph_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.man
index d619b2d..b723332 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -4,7 +4,7 @@ gdiffmk \- mark differences between groff/nroff/troff files
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr gdiffmk_C \n[.C]
+.do nr *groff_gdiffmk_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -261,7 +261,7 @@ Mike Bianchi
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[gdiffmk_C]
+.cp \n[*groff_gdiffmk_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/glilypond/glilypond.1.man 
b/contrib/glilypond/glilypond.1.man
index 5b155e7..bd8295c 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -4,7 +4,7 @@ glilypond \- integrate lilypond parts into groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr glilypond_C \n[.C]
+.do nr *groff_glilypond_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -960,7 +960,7 @@ format.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[glilypond_C]
+.cp \n[*groff_glilypond_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index 2763410..21038db 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -4,7 +4,7 @@ gperl \- groff preprocessor for Perl parts in roff files
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr gperl_C \n[.C]
+.do nr *groff_gperl_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -505,7 +505,7 @@ are
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[gperl_C]
+.cp \n[*groff_gperl_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.1.man
index 79da34b..59ac274 100644
--- a/contrib/gpinyin/gpinyin.1.man
+++ b/contrib/gpinyin/gpinyin.1.man
@@ -5,7 +5,7 @@ gpinyin \- use Hanyu Pinyin Chinese in roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr gpinyin_C \n[.C]
+.do nr *groff_gpinyin_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -342,7 +342,7 @@ respectively.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[gpinyin_C]
+.cp \n[*groff_gpinyin_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/grap2graph/grap2graph.1.man 
b/contrib/grap2graph/grap2graph.1.man
index d8b6b3d..2455e39 100644
--- a/contrib/grap2graph/grap2graph.1.man
+++ b/contrib/grap2graph/grap2graph.1.man
@@ -4,7 +4,7 @@ grap2graph \- convert a GRAP diagram into a cropped image
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grap2graph_C \n[.C]
+.do nr *groff_grap2graph_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -175,7 +175,7 @@ by W.\& Richard Stevens.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grap2graph_C]
+.cp \n[*groff_grap2graph_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/groff_filenames/groff_filenames.5.man 
b/contrib/groff_filenames/groff_filenames.5.man
index 2f62d10..64a2e8d 100644
--- a/contrib/groff_filenames/groff_filenames.5.man
+++ b/contrib/groff_filenames/groff_filenames.5.man
@@ -3,7 +3,7 @@
 groff_filenames \- filename extensions for roff and groff
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_filenames_C \n[.C]
+.do nr *groff_groff_filenames_5_man_C \n[.cp]
 .cp 0
 .
 .
@@ -651,7 +651,7 @@ You can get this package with the shell command:
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_filenames_C]
+.cp \n[*groff_groff_filenames_5_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.man
index 431ed9c..92bcea9 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -4,7 +4,7 @@ groffer \- display groff files and man pages on X and tty
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groffer_C \n[.C]
+.do nr *groff_groffer_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -3798,7 +3798,7 @@ The decompression programs supported by
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groffer_C]
+.cp \n[*groff_groffer_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/groffer/roff2.1.man b/contrib/groffer/roff2.1.man
index f7077ee..2f30c4e 100644
--- a/contrib/groffer/roff2.1.man
+++ b/contrib/groffer/roff2.1.man
@@ -4,7 +4,7 @@ roff2@ROFF2MODE@ \- transform roff code into @ROFF2MODE@ mode
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr roff2_C \n[.C]
+.do nr *groff_roff2_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -221,7 +221,7 @@ Bernd Warken
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[roff2_C]
+.cp \n[*groff_roff2_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.7.man
index 9601734..e11e621 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -4,7 +4,7 @@ groff_hdtbl \- Heidelberger table macros for GNU roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_hdtbl_C \n[.C]
+.do nr *groff_groff_hdtbl_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1282,7 +1282,7 @@ preprocessor for tables.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_hdtbl_C]
+.cp \n[*groff_groff_hdtbl_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 6622d13..ad78154 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -5,7 +5,7 @@ groff_mm \- memorandum macros for GNU roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_mm_C \n[.C]
+.do nr *groff_groff_mm_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -3985,7 +3985,7 @@ of Lund, Sweden.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_mm_C]
+.cp \n[*groff_groff_mm_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/mm/groff_mmse.7.man b/contrib/mm/groff_mmse.7.man
index 0e635f8..9d542cb 100644
--- a/contrib/mm/groff_mmse.7.man
+++ b/contrib/mm/groff_mmse.7.man
@@ -4,7 +4,7 @@ groff_mmse \- svenska \(rqmemorandum\(rq makro f\(:or GNU roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_mmse_C \n[.C]
+.do nr *groff_groff_mmse_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -168,7 +168,7 @@ J
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_mmse_C]
+.cp \n[*groff_groff_mmse_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/mm/mmroff.1.man b/contrib/mm/mmroff.1.man
index 8e35bac..90d38e7 100644
--- a/contrib/mm/mmroff.1.man
+++ b/contrib/mm/mmroff.1.man
@@ -4,7 +4,7 @@ mmroff \- cross-reference preprocessor for GNU roff mm macro 
package
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr mmroff_C \n[.C]
+.do nr *groff_mmroff_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -102,7 +102,7 @@ of Lund, Sweden.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[mmroff_C]
+.cp \n[*groff_mmroff_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index 6ea6e2e..a96ac3b 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -5,7 +5,7 @@ language, part of \(lqgroff\(rq
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_mom_C \n[.C]
+.do nr *groff_groff_mom_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -3391,7 +3391,7 @@ team.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_mom_C]
+.cp \n[*groff_groff_mom_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.man
index 47a73e9..93c9916 100644
--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
@@ -4,7 +4,7 @@ pdfroff \- create PDF documents using groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr pdfroff_C \n[.C]
+.do nr *groff_pdfroff_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -829,7 +829,7 @@ included in the installed documentation set as
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[pdfroff_C]
+.cp \n[*groff_pdfroff_1_man_C]
 .
 .
 .\" ====================================================================
diff --git a/contrib/pic2graph/pic2graph.1.man 
b/contrib/pic2graph/pic2graph.1.man
index bde99da..ec9623a 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -4,7 +4,7 @@ pic2graph \- convert a PIC diagram into a cropped image
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr pic2graph_C \n[.C]
+.do nr *groff_pic2graph_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -204,7 +204,7 @@ W.\& Richard Stevens,
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[pic2graph_C]
+.cp \n[*groff_pic2graph_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/ditroff.7.man b/man/ditroff.7.man
index c6874f8..3888584 100644
--- a/man/ditroff.7.man
+++ b/man/ditroff.7.man
@@ -4,7 +4,7 @@ ditroff \- classical device-independent roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr ditroff_C \n[.C]
+.do nr *groff_ditroff_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -168,7 +168,7 @@ multi-device output.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[ditroff_C]
+.cp \n[*groff_ditroff_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/groff.7.man b/man/groff.7.man
index 60db329..bceafda 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -30,7 +30,7 @@ groff \- a short reference for the GNU roff language
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_7_C \n[.C]
+.do nr *groff_groff_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -4843,7 +4843,7 @@ documentations and other information.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_7_C]
+.cp \n[*groff_groff_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/groff_char.7.man b/man/groff_char.7.man
index f7e3e82..33fa390 100644
--- a/man/groff_char.7.man
+++ b/man/groff_char.7.man
@@ -36,7 +36,7 @@ groff_char \- groff glyph names
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_char_C \n[.C]
+.do nr *groff_groff_char_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1388,7 +1388,7 @@ The Unicode Standard
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_char_C]
+.cp \n[*groff_groff_char_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index e23dc8d..cb6ef2f 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -9,7 +9,7 @@ groff_diff \- differences between GNU troff and classical troff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_diff_C \n[.C]
+.do nr *groff_groff_diff_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -4243,7 +4243,7 @@ classical troff documentation
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_diff_C]
+.cp \n[*groff_groff_diff_7_man_C]
 .
 .
 .\" ====================================================================
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index d47a384..55908f5 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -23,7 +23,7 @@ groff_font \- format of groff device and font description 
files
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_font_C \n[.C]
+.do nr *groff_groff_font_5_man_C \n[.cp]
 .cp 0
 .
 .
@@ -709,7 +709,7 @@ for graphical mode (default is PDF mode).
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_font_C]
+.cp \n[*groff_groff_font_5_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 7c9b15a..32dc67e 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -9,7 +9,7 @@ groff_out \- groff intermediate output format
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_out_C \n[.C]
+.do nr *groff_groff_out_5_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1992,7 +1992,7 @@ CSTR\~#54
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_out_C]
+.cp \n[*groff_groff_out_5_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index c7a22d2..ecb95fe 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -8,7 +8,7 @@ groff_tmac \- macro files in the roff typesetting system
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_tmac_C \n[.C]
+.do nr *groff_groff_tmac_5_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1319,7 +1319,7 @@ FHS web site
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_tmac_C]
+.cp \n[*groff_groff_tmac_5_man_C]
 .
 .
 .\" Local Variables:
diff --git a/man/roff.7.man b/man/roff.7.man
index b881590..48dedda 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -7,7 +7,7 @@ roff \- concepts and history of roff typesetting
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr roff_C \n[.C]
+.do nr *groff_roff_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1414,7 +1414,7 @@ might be a good starting point.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[roff_C]
+.cp \n[*groff_roff_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.1.man
index ef74838..5e98784 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -26,7 +26,7 @@ grodvi \- convert groff output to TeX DVI format
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grodvi_C \n[.C]
+.do nr *groff_grodvi_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -467,7 +467,7 @@ and widths of rules be rounded.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grodvi_C]
+.cp \n[*groff_grodvi_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 26a4fc1..27b45ba 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -4,7 +4,7 @@ grohtml \- HTML driver for groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grohtml_C \n[.C]
+.do nr *groff_grohtml_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -446,7 +446,7 @@ It is still beta code.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grohtml_C]
+.cp \n[*groff_grohtml_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index b532cb9..563224d 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -6,7 +6,7 @@ series laser printers)
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grolbp_C \n[.C]
+.do nr *groff_grolbp_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -446,7 +446,7 @@ Macros for use with
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grolbp_C]
+.cp \n[*groff_grolbp_1_man_C]
 .
 .
 .\"
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index bdd326b..d15e606 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -4,7 +4,7 @@ grolj4 \- groff driver for HP LaserJet 4 family
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grolj4_C \n[.C]
+.do nr *groff_grolj4_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -235,7 +235,7 @@ Small dots.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grolj4_C]
+.cp \n[*groff_grolj4_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grolj4/lj4_font.5.man 
b/src/devices/grolj4/lj4_font.5.man
index d6b6ca0..fb6f83d 100644
--- a/src/devices/grolj4/lj4_font.5.man
+++ b/src/devices/grolj4/lj4_font.5.man
@@ -4,7 +4,7 @@ lj4_font \- groff fonts for use with devlj4
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr lj4_font_C \n[.C]
+.do nr *groff_lj4_font_5_man_C \n[.cp]
 .cp 0
 .
 .
@@ -258,7 +258,7 @@ special font for TrueType CG Times (LaserJet\~4000 and 
later).
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[lj4_font_C]
+.cp \n[*groff_lj4_font_5_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index 47669b8..602f280 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -4,7 +4,7 @@ gropdf \- PDF driver for groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr gropdf_C \n[.C]
+.do nr *groff_gropdf_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1378,7 +1378,7 @@ automatically loaded by
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[gropdf_C]
+.cp \n[*groff_gropdf_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.1.man
index 137897a..b4031cf 100644
--- a/src/devices/gropdf/pdfmom.1.man
+++ b/src/devices/gropdf/pdfmom.1.man
@@ -4,7 +4,7 @@ pdfmom \- produce PDF documents using the mom macro package for 
groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr pdfmom_C \n[.C]
+.do nr *groff_pdfmom_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -190,7 +190,7 @@ a copy is installed at
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[pdfmom_C]
+.cp \n[*groff_pdfmom_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index e227b78..9730eb9 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -4,7 +4,7 @@ grops \- PostScript driver for groff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grops_C \n[.C]
+.do nr *groff_grops_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1500,7 +1500,7 @@ PostScript Language Document Structuring Conventions 
Specification
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grops_C]
+.cp \n[*groff_grops_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.1.man
index 9c878ca..792a098 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -4,7 +4,7 @@ grotty \- groff driver for typewriter-like (terminal) devices
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grotty_C \n[.C]
+.do nr *groff_grotty_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -715,7 +715,7 @@ ECMA\-ST/\:Ecma\-048.pdf
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grotty_C]
+.cp \n[*groff_grotty_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/devices/xditview/gxditview.1.man 
b/src/devices/xditview/gxditview.1.man
index 8ac2813..59db124 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -4,7 +4,7 @@ gxditview \- display groff intermediate output files
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr gxditview_C \n[.C]
+.do nr *groff_gxditview_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -563,7 +563,7 @@ which was derived from
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[gxditview_C]
+.cp \n[*groff_gxditview_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index ba03fc1..1f9bc5f 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -5,7 +5,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr eqn_C \n[.C]
+.do nr *groff_eqn_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1365,7 +1365,7 @@ This is allowed by the specification, but inefficient.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[eqn_C]
+.cp \n[*groff_eqn_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 178becb..a61b20f 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -27,7 +27,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grn_C \n[.C]
+.do nr *groff_grn_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -774,7 +774,7 @@ Daniel Senderowicz and Werner Lemberg modified it for
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grn_C]
+.cp \n[*groff_grn_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 12b35bf..1b7d557 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -4,7 +4,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr pic_C \n[.C]
+.do nr *groff_pic_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1341,7 +1341,7 @@ PostScript\*R is a registered trademark of Adobe Systems 
Incorporation.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[pic_C]
+.cp \n[*groff_pic_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/preconv/preconv.1.man 
b/src/preproc/preconv/preconv.1.man
index 3742da5..ecca486 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -5,7 +5,7 @@ understands
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr preconv_C \n[.C]
+.do nr *groff_preconv_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -367,7 +367,7 @@ info pages
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[preconv_C]
+.cp \n[*groff_preconv_1_man_C]
 .
 .
 .\" Emacs setting
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.man
index 1b21f42..2c2df45 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -4,7 +4,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr refer_C \n[.C]
+.do nr *groff_refer_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1785,7 +1785,7 @@ website of the late W.\& Richard Stevens
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[refer_C]
+.cp \n[*groff_refer_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.1.man
index 353d6fc..ca16153 100644
--- a/src/preproc/soelim/soelim.1.man
+++ b/src/preproc/soelim/soelim.1.man
@@ -5,7 +5,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr soelim_C \n[.C]
+.do nr *groff_soelim_1_man_C \n[.cp]
 .cp 0
 .mso pic.tmac
 .
@@ -274,7 +274,7 @@ box invisible width 0.5 height 0.4 "output" "file"
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[soelim_C]
+.cp \n[*groff_soelim_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index 050b88f..f157ddb 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -5,7 +5,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr tbl_C \n[.C]
+.do nr *groff_tbl_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1239,7 +1239,7 @@ website of the late Uriel Pereira
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[tbl_C]
+.cp \n[*groff_tbl_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index b7f3931..efa77f8 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -6,7 +6,7 @@ groff \- front-end for the groff document formatting system
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_1_C \n[.C]
+.do nr *groff_groff_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -2064,7 +2064,7 @@ The following utilities are available:
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_1_C]
+.cp \n[*groff_groff_1_man_C]
 .
 .
 .\" ====================================================================
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.1.man
index e0f4eac..204c6d2 100644
--- a/src/roff/grog/grog.1.man
+++ b/src/roff/grog/grog.1.man
@@ -3,7 +3,7 @@
 grog \- guess options for a following groff command
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr grog_C \n[.C]
+.do nr *groff_grog_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -463,7 +463,7 @@ Werner Lemberg
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[grog_C]
+.cp \n[*groff_grog_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index a7bdca3..bb97c66 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -4,7 +4,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr nroff_C \n[.C]
+.do nr *groff_nroff_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -279,7 +279,7 @@ are loaded to replace unrepresentable glyphs.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[nroff_C]
+.cp \n[*groff_nroff_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 5547e5b..3ce761f 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -5,7 +5,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr troff_C \n[.C]
+.do nr *groff_troff_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -676,7 +676,7 @@ You can browse it interactively with \(lqinfo groff\(rq.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[troff_C]
+.cp \n[*groff_troff_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index 8c58ad0..ddf8997 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -4,7 +4,7 @@ afmtodit \- create font files for use with groff \-Tps and 
\-Tpdf
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr afmtodit_C \n[.C]
+.do nr *groff_afmtodit_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -445,7 +445,7 @@ Symbols\(aq\(rq.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[afmtodit_C]
+.cp \n[*groff_afmtodit_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/hpftodit/hpftodit.1.man 
b/src/utils/hpftodit/hpftodit.1.man
index 6831050..4d9aa85 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -4,7 +4,7 @@ hpftodit \- create font description files for use with groff 
\-Tlj4
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr hpftodit_C \n[.C]
+.do nr *groff_hpftodit_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -414,7 +414,7 @@ symbol mapping files
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[hpftodit_C]
+.cp \n[*groff_hpftodit_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.1.man
index b26b0bd..a938341 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -4,7 +4,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr indxbib_C \n[.C]
+.do nr *groff_indxbib_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -294,7 +294,7 @@ website of the late W.\& Richard Stevens
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[indxbib_C]
+.cp \n[*groff_indxbib_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index 615c95c..29858c7 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -4,7 +4,7 @@ lkbib \- search bibliographic databases
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr lkbib_C \n[.C]
+.do nr *groff_lkbib_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -184,7 +184,7 @@ website of the late W.\& Richard Stevens
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[lkbib_C]
+.cp \n[*groff_lkbib_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.1.man
index 6c4248d..1c809e1 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -4,7 +4,7 @@
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr lookbib_C \n[.C]
+.do nr *groff_lookbib_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -149,7 +149,7 @@ website of the late W.\& Richard Stevens
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[lookbib_C]
+.cp \n[*groff_lookbib_1_man_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/src/utils/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.1.man
index 4fdab0b..923ef80 100644
--- a/src/utils/pfbtops/pfbtops.1.man
+++ b/src/utils/pfbtops/pfbtops.1.man
@@ -4,7 +4,7 @@ pfbtops \- translate Printer Font Binary files to PostScript 
ASCII
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr pfbtops_C \n[.C]
+.do nr *groff_pfbtops_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -98,7 +98,7 @@ Display version information and exit.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[pfbtops_C]
+.cp \n[*groff_pfbtops_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/src/utils/tfmtodit/tfmtodit.1.man 
b/src/utils/tfmtodit/tfmtodit.1.man
index 8209c43..393ffd5 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -4,7 +4,7 @@ tfmtodit \- create font files for use with groff \-Tdvi
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr lkbib_C \n[.C]
+.do nr *groff_tfmtodit_1_man_C \n[.cp]
 .cp 0
 .
 .
@@ -251,7 +251,7 @@ Font description file for font
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[lkbib_C]
+.cp \n[*groff_tfmtodit_1_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/X.tmac b/tmac/X.tmac
index 16fb19d..f8e737a 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -1,6 +1,6 @@
 .\" X.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_X_tmac_C \n[.cp]
 .cp 0
 .ftr CW CR
 .ftr C CR
@@ -122,7 +122,7 @@
 .  char \[radicalex] \h'-\w'\[sr]'u'\[radicalex]\h'\w'\[sr]'u'
 .fchar \[sqrtex] \[radicalex]
 .
-.cp \n[_C]
+.cp \n[*groff_X_tmac_C]
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
diff --git a/tmac/Xps.tmac b/tmac/Xps.tmac
index d6d45af..38ad76a 100644
--- a/tmac/Xps.tmac
+++ b/tmac/Xps.tmac
@@ -1,7 +1,7 @@
 .\" Xps.tmac
 .\"
 .do mso ps.tmac
-.nr _C \n(.C
+.do nr *groff_Xps_tmac_C \n[.cp]
 .cp 0
 .
 .\" Use this macro only to replace characters which do really exist in
@@ -49,7 +49,7 @@
 .Xps-char \[lh] \[lA]
 .Xps-char \[rh] \[rA]
 .
-.cp \n[_C]
+.cp \n[*groff_Xps_tmac_C]
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 17e6299..7b14918 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -40,7 +40,7 @@
 .
 .do mso devtag.tmac
 .
-.nr _C \n(.C
+.do nr *groff_an-old_tmac_C \n[.cp]
 .cp 0
 .
 .if (\n[.x]\n[.y] < 118) \
@@ -700,7 +700,7 @@
 .if !r CS .nr CS 0
 .if !r CT .nr CT 0
 .
-.cp \n[_C]
+.cp \n[*groff_an-old_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/andoc.tmac b/tmac/andoc.tmac
index 27f56da..8fe2a25 100644
--- a/tmac/andoc.tmac
+++ b/tmac/andoc.tmac
@@ -27,7 +27,7 @@
 .if !\n(.g \
 .  ab These macros require groff.
 .
-.nr _C \n(.C
+.do nr *groff_andoc_tmac_C \n[.cp]
 .cp 0
 .
 .als andoc-em em
@@ -88,7 +88,7 @@
 .de EN
 ..
 .
-.cp \n[_C]
+.cp \n[*groff_andoc_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/cp1047.tmac b/tmac/cp1047.tmac
index 13b674a..4d3afc6 100644
--- a/tmac/cp1047.tmac
+++ b/tmac/cp1047.tmac
@@ -1,6 +1,6 @@
 .\" cp1047.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_cp1047_tmac_C \n[.cp]
 .cp 0
 .trin \[char66]\[^a]
 .trin \[char67]\[:a]
@@ -98,7 +98,7 @@
 .trin \[char252]\[:U]
 .trin \[char253]\[`U]
 .trin \[char254]\['U]
-.cp \n(_C
+.cp \n[*groff_cp1047_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/devtag.tmac b/tmac/devtag.tmac
index 4f2d2d6..c708dba 100644
--- a/tmac/devtag.tmac
+++ b/tmac/devtag.tmac
@@ -44,7 +44,7 @@ reasonably generic and could be applied to other devices.
 .
 .do if d DEVTAG-NH .nx
 .
-.nr _C \n(.C
+.do nr *groff_devtag_tmac_C \n[.cp]
 .cp 0
 .
 .\" --------------------------------------------------------------------
@@ -116,7 +116,7 @@ reasonably generic and could be applied to other devices.
 ..
 .
 .
-.cp \n[_C]
+.cp \n[*groff_devtag_tmac_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 3d5f5c4..4f8c832 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -1,6 +1,6 @@
 .\" dvi.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_dvi_tmac_C \n[.cp]
 .cp 0
 .
 .ftr CR CW
@@ -777,7 +777,7 @@ D\v'-.33m'\s0\v'.33m'
 .defcolor yellow3 rgb #cdcd00
 .defcolor yellow4 rgb #8b8b00
 .
-.cp \n(_C
+.cp \n[*groff_dvi_tmac_C]
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
diff --git a/tmac/ec.tmac b/tmac/ec.tmac
index 2f8232a..ee2ad33 100644
--- a/tmac/ec.tmac
+++ b/tmac/ec.tmac
@@ -9,7 +9,7 @@
 .\" hcode values are not handled.
 .\"
 .
-.nr _C \n(.C
+.do nr *groff_ec_tmac_C \n[.cp]
 .cp 0
 .
 .ftr R REC
@@ -62,7 +62,7 @@
 .\" an ID register
 .nr ECFONTS 1
 .
-.cp \n(_C
+.cp \n[*groff_ec_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/fallbacks.tmac b/tmac/fallbacks.tmac
index 72381ed..aa6df81 100644
--- a/tmac/fallbacks.tmac
+++ b/tmac/fallbacks.tmac
@@ -4,7 +4,7 @@
 .\"
 .\" This file contains generic fallback characters.
 .
-.nr _C \n(.C
+.do nr *groff_fallbacks_tmac_C \n[.cp]
 .cp 0
 .
 .\" fall back to GREEK CAPITAL LETTER DELTA for INCREMENT
@@ -62,7 +62,7 @@
 .fchar \[u217e] d
 .fchar \[u217f] m
 .
-.cp \n[_C]
+.cp \n[*groff_fallbacks_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 6b4c0ac..b213163 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -5,7 +5,7 @@ groff_man \- GNU roff macro package for formatting man pages
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_man_C \n[.C]
+.do nr *groff_groff_man_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -2720,7 +2720,7 @@ version of the BSD-originated alternative macro package 
for man pages.
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_man_C]
+.cp \n[*groff_groff_man_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.7.man
index b57a0fb..30d9c8b 100644
--- a/tmac/groff_me.7.man
+++ b/tmac/groff_me.7.man
@@ -6,7 +6,7 @@ roff
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_me_C \n[.C]
+.do nr *groff_groff_me_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -526,7 +526,7 @@ and
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_me_C]
+.cp \n[*groff_groff_me_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 0b4f6e1..83a6cef 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -5,7 +5,7 @@ groff_ms \- GNU roff manuscript macro package for formatting 
documents
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_ms_C \n[.C]
+.do nr *groff_groff_ms_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -1819,7 +1819,7 @@ by Trent A.\& Fisher and Werner Lemberg
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_ms_C]
+.cp \n[*groff_groff_ms_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index 40c18a0..1418b91 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -7,7 +7,7 @@ groff_trace \- groff macro package trace.tmac
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_trace_C \n[.C]
+.do nr *groff_groff_trace_7_man_C \n[.cp]
 .cp 0
 .
 .
@@ -330,7 +330,7 @@ A general description of groff macro packages.
 A short reference for the groff formatting language.
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_trace_C]
+.cp \n[*groff_groff_trace_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index 16755c7..74c4931 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -6,7 +6,7 @@ groff_www \- groff macros for authoring web pages
 .
 .
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr groff_www_C \n[.C]
+.do nr *groff_groff_www_7_man_C \n[.cp]
 .cp 0
 .do mso www.tmac
 .
@@ -722,7 +722,7 @@ Bernd Warken
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[groff_www_C]
+.cp \n[*groff_groff_www_7_man_C]
 .
 .
 .\" Local Variables:
diff --git a/tmac/html-end.tmac b/tmac/html-end.tmac
index 3b005b9..827d46c 100644
--- a/tmac/html-end.tmac
+++ b/tmac/html-end.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" html-end.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_html-end_tmac_C \n[.cp]
 .cp 0
 .
 .\" turn off all headers and footers for ms, me, and mm macro sets
@@ -22,7 +22,7 @@
 .ll \n[.l]u
 .ta \n[.tabs]
 .
-.cp \n(_C
+.cp \n[*groff_html-end_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/html.tmac b/tmac/html.tmac
index 1da9fb2..52154e5 100644
--- a/tmac/html.tmac
+++ b/tmac/html.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" html.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_html_tmac_C \n[.cp]
 .cp 0
 .
 .nroff
@@ -533,10 +533,9 @@
 .defcolor yellow1 rgb #fffc17
 .defcolor yellowgreen rgb #52d017
 .
-.cp \n(_C
+.mso www.tmac
 .
-.if !\n(_C \
-.  mso www.tmac
+.cp \n[*groff_html_tmac_C]
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
diff --git a/tmac/latin1.tmac b/tmac/latin1.tmac
index 6b45685..d8c07ef 100644
--- a/tmac/latin1.tmac
+++ b/tmac/latin1.tmac
@@ -1,6 +1,6 @@
 .\" latin1.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_latin1_tmac_C \n[.cp]
 .cp 0
 .\" 0xA1
 .trin \[char161]\[r!]
@@ -104,7 +104,7 @@
 .trin \[char253]\['y]
 .trin \[char254]\[Tp]
 .trin \[char255]\[:y]
-.cp \n[_C]
+.cp \n[*groff_latin1_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/latin2.tmac b/tmac/latin2.tmac
index c0c6c3e..e457c33 100644
--- a/tmac/latin2.tmac
+++ b/tmac/latin2.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" latin2.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_latin2_tmac_C \n[.cp]
 .cp 0
 .\" 0xA1
 .trin \[char161]\[A ho]
@@ -106,7 +106,7 @@
 .trin \[char253]\['y]
 .trin \[char254]\[t ac]
 .trin \[char255]\[a.]
-.cp \n[_C]
+.cp \n[*groff_latin2_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/latin5.tmac b/tmac/latin5.tmac
index fc495b2..3313c54 100644
--- a/tmac/latin5.tmac
+++ b/tmac/latin5.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" latin5.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_latin5_tmac_C \n[.cp]
 .cp 0
 .\" 0xA1
 .trin \[char161]\[r!]
@@ -106,7 +106,7 @@
 .trin \[char253]\[.i]
 .trin \[char254]\[s ,]
 .trin \[char255]\[:y]
-.cp \n[_C]
+.cp \n[*groff_latin5_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/latin9.tmac b/tmac/latin9.tmac
index 0c9c70c..1f21be7 100644
--- a/tmac/latin9.tmac
+++ b/tmac/latin9.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" latin9.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_latin9_tmac_C \n[.cp]
 .cp 0
 .\" 0xA1
 .trin \[char161]\[r!]
@@ -106,7 +106,7 @@
 .trin \[char253]\['y]
 .trin \[char254]\[Tp]
 .trin \[char255]\[:y]
-.cp \n[_C]
+.cp \n[*groff_latin9_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index 0124b5e..87138f0 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" lbp.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_lbp_tmac_C \n[.cp]
 .cp 0
 .
 .ftr CW CR
@@ -91,7 +91,7 @@
 .fchar \[s ,] \o's\[ac]'
 .hcode \[s ,]s
 .
-.cp \n(_C
+.cp \n[*groff_lbp_tmac_C]
 .
 .do mso latin1.tmac
 .
diff --git a/tmac/lj4.tmac b/tmac/lj4.tmac
index c79c527..af968ec 100644
--- a/tmac/lj4.tmac
+++ b/tmac/lj4.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" lj4.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_lj4_tmac_C \n[.cp]
 .cp 0
 .
 .ftr CW CR
@@ -29,7 +29,7 @@
 .
 .fchar \[sqrtex] \[radicalex]
 .
-.cp \n[_C]
+.cp \n[*groff_lj4_tmac_C]
 .
 .do mso latin1.tmac
 .
diff --git a/tmac/papersize.tmac b/tmac/papersize.tmac
index be642e4..dea723a 100644
--- a/tmac/papersize.tmac
+++ b/tmac/papersize.tmac
@@ -20,7 +20,7 @@
 .\"
 .\"   groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
 .
-.nr _C \n(.C
+.do nr *groff_papersize_tmac_C \n[.cp]
 .cp 0
 .
 .if d paper \{\
@@ -156,7 +156,7 @@
 .      nr LL \n[.l]u  \" for ms, mdoc, man
 .\}
 .
-.cp \n[_C]
+.cp \n[*groff_papersize_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/pdfpic.tmac b/tmac/pdfpic.tmac
index 5b35ff8..cc0a122 100644
--- a/tmac/pdfpic.tmac
+++ b/tmac/pdfpic.tmac
@@ -14,7 +14,7 @@
 .
 .do if d PDFPIC .nx
 .
-.nr _C \n(.C
+.do nr *groff_pdfpic_tmac_C \n[.cp]
 .cp 0
 .
 .de @abort
@@ -143,7 +143,7 @@ sed -e 's/Page *size: *\\([[:digit:].]*\\) *x 
*\\([[:digit:].]*\\).*$/\
 .  \}
 ..
 .
-.cp \n[_C]
+.cp \n[*groff_pdfpic_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/ps.tmac b/tmac/ps.tmac
index 3a49d7d..1892876 100644
--- a/tmac/ps.tmac
+++ b/tmac/ps.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" ps.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_ps_tmac_C \n[.cp]
 .cp 0
 .
 .ftr AX ABI
@@ -681,7 +681,7 @@
 .defcolor yellow3 rgb #cdcd00
 .defcolor yellow4 rgb #8b8b00
 .
-.cp \n[_C]
+.cp \n[*groff_ps_tmac_C]
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
diff --git a/tmac/psold.tmac b/tmac/psold.tmac
index dd08cf2..9c03b51 100644
--- a/tmac/psold.tmac
+++ b/tmac/psold.tmac
@@ -8,7 +8,7 @@
 .\" some of these characters.  This file prevents those characters from
 .\" being used.  This will allow the PostScript output to be printed on
 .\" such old printers.
-.nr _C \n(.C
+.do nr *groff_psold_tmac_C \n[.cp]
 .cp 0
 .\" Define an accented character.
 .de ps-achar
@@ -60,7 +60,7 @@ 
I\h'-.25m'\v'-.33m'\s'\En(.s*6u/10u'\v'.33m'D\v'-.33m'\s0\v'.33m'
 .tr \[char247]\[di]
 .tr \[char253]\['y]
 .tr \[char254]\[Tp]
-.cp \n(_C
+.cp \n[*groff_psold_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/pspic.tmac b/tmac/pspic.tmac
index b366f3b..049ef1a 100644
--- a/tmac/pspic.tmac
+++ b/tmac/pspic.tmac
@@ -11,7 +11,7 @@
 .
 .do if d PSPIC .nx
 .
-.nr _C \n(.C
+.do nr *groff_pspic_tmac_C \n[.cp]
 .cp 0
 .
 .de PSPIC
@@ -161,7 +161,7 @@
 .  HTML-IMAGE-END
 ..
 .
-.cp \n[_C]
+.cp \n[*groff_pspic_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/trace.tmac b/tmac/trace.tmac
index a85b5ec..5eca0ce 100644
--- a/tmac/trace.tmac
+++ b/tmac/trace.tmac
@@ -45,7 +45,7 @@
 .do if d !!!sp \
 .  nx
 .
-.nr _C \n(.C
+.do nr *groff_trace_tmac_C \n[.cp]
 .cp 0
 .
 .ds !!!sp " \"
@@ -336,7 +336,7 @@
 .
 .ec
 .
-.cp \n(_C
+.cp \n[*groff_trace_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/tty-char.tmac b/tmac/tty-char.tmac
index 2a76085..de3b231 100644
--- a/tmac/tty-char.tmac
+++ b/tmac/tty-char.tmac
@@ -16,7 +16,7 @@
 .\" file is inferior compared to that of the replacement characters defined
 .\" in the file tty.tmac.
 .\"
-.nr _C \n(.C
+.do nr *groff_tty-char_tmac_C \n[.cp]
 .cp 0
 .
 .de tty-char
@@ -242,7 +242,7 @@
 .\"tty-char \[:y] \ij
 .tty-char \[arrowvertex] |
 .tty-char \[mc] <micro>
-.cp \n[_C]
+.cp \n[*groff_tty-char_tmac_C]
 .
 .ie '\*(.T'cp1047' \
 .      do mso cp1047.tmac
diff --git a/tmac/tty.tmac b/tmac/tty.tmac
index 03ff651..85998df 100644
--- a/tmac/tty.tmac
+++ b/tmac/tty.tmac
@@ -1,6 +1,6 @@
 .\" tty.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_tty_tmac_C \n[.cp]
 .cp 0
 .
 .nroff
@@ -81,7 +81,7 @@
 .defcolor cyan rgb #00ffff
 .defcolor white rgb #ffffff
 .
-.cp \n[_C]
+.cp \n[*groff_tty_tmac_C]
 .
 .ie '\*(.T'cp1047' \
 .  do mso cp1047.tmac
diff --git a/tmac/unicode.tmac b/tmac/unicode.tmac
index e10c606..9a7315b 100644
--- a/tmac/unicode.tmac
+++ b/tmac/unicode.tmac
@@ -1,11 +1,11 @@
 .\" unicode.tmac
 .\"
-.nr _C \n(.C
+.do nr *groff_unicode_tmac_C \n[.cp]
 .cp 0
 .char - \[hy]
 .char ` \[oq]
 .char ' \[cq]
-.cp \n[_C]
+.cp \n[*groff_unicode_tmac_C]
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/www.tmac.in b/tmac/www.tmac.in
index 940d0bb..3701ae7 100644
--- a/tmac/www.tmac.in
+++ b/tmac/www.tmac.in
@@ -47,7 +47,7 @@ following, HTML always denotes XHTML also.
 .
 .do mso devtag.tmac
 .
-.nr _C \n(.C
+.do nr *groff_www_tmac_in_C \n[.cp]
 .cp 0
 .
 .
@@ -1620,7 +1620,7 @@ following, HTML always denotes XHTML also.
 .\}
 .
 .if r ps4html .nop \O[0]
-.cp \n(_C
+.cp \n[*groff_www_tmac_in_C]
 .
 .\" now set
 .



reply via email to

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