[groff] 06/33: [tmac]: Fix Savannah #63194.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit aaa9dc9d988d003c475041bc34e019d42f970c97
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Oct 10 23:49:57 2022 -0500

    [tmac]: Fix Savannah #63194.
    
    * tmac/ec.tmac: Remove apparently unnecessary remappings of styles (and
      reassertion of style slots in the font mounting position list, albeit
      in an unusual order (RBI instead of RIB)).  This code frustrated the
      rendering of man pages with post-1.22.4 groff for the 'dvi' output
      device when using EC fonts.  Instead remap the T and H family
      typefaces in all four styles explicitly.  (The CW and CWI faces were
      already handled.)  Also add remappings of groff+PostScriptish font
      names "CB" and "CBI" to CW EC faces of normal weight, corresponding to
      dvi.tmac; see commits 529e2ca0c4, 2002-03-23 and c9741da6c0,
      2021-05-06.
    
    Fixes <https://savannah.gnu.org/bugs/?63194>.
    
    Also drop pointless restatement of file name in comment and old-style
    Emacs file-local variable setting.
---
 ChangeLog    | 15 +++++++++++++++
 tmac/ec.tmac | 23 +++++++++++------------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2717e9f88..30d4cf73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2022-10-10  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/ec.tmac: Remove apparently unnecessary remappings of
+       styles (and reassertion of style slots in the font mounting
+       position list, albeit in an unusual order (RBI instead of RIB)).
+       This code frustrated the rendering of man pages with post-1.22.4
+       groff for the 'dvi' output device when using EC fonts.  Instead
+       remap the T and H family typefaces in all four styles
+       explicitly.  (The CW and CWI faces were already handled.)  Also
+       add remappings of groff+PostScriptish font names "CB" and "CBI"
+       to CW EC faces of normal weight, corresponding to dvi.tmac; see
+       commits 529e2ca0c4, 2002-03-23 and c9741da6c0, 2021-05-06.
+
+       Fixes <https://savannah.gnu.org/bugs/?63194>.
+
 2022-10-10  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/tests/an_works-with-ec.sh: Add regression test for
diff --git a/tmac/ec.tmac b/tmac/ec.tmac
index 7f37ddfc6..9f04a13a8 100644
--- a/tmac/ec.tmac
+++ b/tmac/ec.tmac
@@ -1,7 +1,3 @@
-.\" -*- nroff -*-
-.\"
-.\" ec.tmac
-.\"
 .\" Switch to EC fonts.
 .\"
 .\" Load this file before any language-specific stuff.
@@ -12,22 +8,25 @@
 .do nr *groff_ec_tmac_C \n[.cp]
 .cp 0
 .
-.ftr R REC
-.ftr I IEC
-.ftr B BEC
-.ftr BI BIEC
+.ftr TR TREC
+.ftr TI TIEC
+.ftr TB TBEC
+.ftr TBI TBIEC
 .
-.sty 1 R
-.sty 2 B
-.sty 3 I
-.sty 4 BI
+.ftr HR HREC
+.ftr HI HIEC
+.ftr HB HBEC
+.ftr HBI HBIEC
 .
 .ftr CW CWEC
 .ftr CWI CWIEC
+.
 .ftr CR CWEC
 .ftr C CWEC
 .ftr CO CWIEC
 .ftr CI CWIEC
+.ftr CB CWEC
+.ftr CBI CWIEC
 .ftr TT CWEC
 .ftr H HREC
 .