[groff] 03/08: tmac/andoc.tmac: Remove mdoc traps correctly.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 3b4d8acafe320ce95988b715f144ec4049903e08
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Oct 11 03:19:10 2020 +1100

    tmac/andoc.tmac: Remove mdoc traps correctly.
    
    * tmac/andoc.tmac: Remove traps set by mdoc package by the names they
      actually use.
    
    Problem appears to date back to the multi-package-supporting  rewrite of
    andoc.tmac in 7351ffde2ef55946eb22d49359885c4c1bac21d1, 4 October 2008.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?59246>.
---
 ChangeLog       | 7 +++++--
 tmac/andoc.tmac | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 698d260..5998f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 2020-10-11  G. Branden Robinson <g.branden.robinson@gmail.com>
 
-       * tmac/tests/andoc-clear-doc-traps.sh: Add regression test for
-       Savannah #59246.
+       * tmac/andoc.tmac: Remove traps set by mdoc package by the names
+       they actually use.
+       * tmac/tests/andoc-clear-doc-traps.sh: Add regression test.
        * tmac/tmac.an: Run test.
 
+       Fixes <https://savannah.gnu.org/bugs/index.php?59246>.
+
 2020-10-10  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/tbl/table.cpp (table::init_output): In the release
diff --git a/tmac/andoc.tmac b/tmac/andoc.tmac
index 3155a5c..841c0cc 100644
--- a/tmac/andoc.tmac
+++ b/tmac/andoc.tmac
@@ -65,8 +65,8 @@
 .de reload-man
 .  do cp \n(.C       \" restore original compatibility mode
 .
-.  do ch header      \" remove trap set by doc.tmac
-.  do ch footer      \" remove trap set by doc.tmac
+.  do ch doc-header  \" remove trap set by mdoc/doc-{n,dit}roff
+.  do ch doc-footer  \" remove trap set by mdoc/doc-{n,dit}roff
 .
 .  do als em andoc-em
 .  do als bp andoc-bp