[groff] 09/14: [mandoc]: Reflect man rename in package and test.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit fdac25937ff4a1c81366e0fedcf66271e105d7dd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jul 5 23:02:18 2021 +1000

    [mandoc]: Reflect man rename in package and test.
    
    * tmac/tmac.an (tmac/stamp-wrap): Macro-source `an.tmac` in the man
      wrapper.
    
    * tmac/andoc.tmac: Refer to (and macro-source) an.tmac.
    
    * tmac/man.tmac: Macro-source `an.tmac`, not `andoc.tmac`.
    
    * tmac/tests/andoc_flush-between-packages.sh: Call groff with `-mandoc`
      option instead of `-man`.  Henceforth, if you want the andoc wrapper,
      you have to ask for it.
---
 ChangeLog                                  | 7 +++++++
 tmac/andoc.tmac                            | 9 ++++-----
 tmac/man.tmac                              | 2 +-
 tmac/tests/andoc_flush-between-packages.sh | 2 +-
 tmac/tmac.am                               | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b4bdb6..bfd3aee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,13 @@
 
        * tmac/tmac.am (TMACNORMALFILES): Remove an-old.tmac.
        (tmac_TESTS): Reflect renames of test files above.
+       (tmac/stamp-wrap): Macro-source `an.tmac` in the man wrapper.
+
+       * tmac/andoc.tmac: Refer to (and macro-source) an.tmac.
+       * tmac/man.tmac: Macro-source `an.tmac`, not `andoc.tmac`.
+       * tmac/tests/andoc_flush-between-packages.sh: Call groff with
+       `-mandoc` option instead of `-man`.  Henceforth, if you want the
+       andoc wrapper, you have to ask for it.
 
 2021-07-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
diff --git a/tmac/andoc.tmac b/tmac/andoc.tmac
index 1e6f105..5a948e6 100644
--- a/tmac/andoc.tmac
+++ b/tmac/andoc.tmac
@@ -1,7 +1,6 @@
 .\" andoc.tmac
 .\"
-.\" Load either an-old.tmac or doc.tmac.  Multiple man pages can be
-.\" handled.
+.\" Load either an.tmac or doc.tmac.  Multiple man pages can be handled.
 .\"
 .\"
 .\" Copyright (C) 1991-2020 Free Software Foundation, Inc.
@@ -52,7 +51,7 @@
 .  do if d an-end \
 .    do an-end
 .
-.  \" Remove traps planted by an-old.tmac.
+.  \" Remove traps planted by an.tmac.
 .  do ch an-header
 .  do ch an-break-body-text
 .  do ch an-footer
@@ -85,8 +84,8 @@
 .  do als bp andoc-bp
 .  do blm            \" no blank line trap
 .
-.  do rm TH          \" force reinitialization of an-old.tmac
-.  do mso an-old.tmac
+.  do rm TH          \" force reinitialization of an.tmac
+.  do mso an.tmac
 .
 .  do als Dd reload-doc
 .
diff --git a/tmac/man.tmac b/tmac/man.tmac
index c188f39..b017e5a 100644
--- a/tmac/man.tmac
+++ b/tmac/man.tmac
@@ -2,4 +2,4 @@
 .\"
 .\" man.tmac
 .\"
-.do mso andoc.tmac
+.do mso an.tmac
diff --git a/tmac/tests/andoc_flush-between-packages.sh 
b/tmac/tests/andoc_flush-between-packages.sh
index 86203bf..6447d2e 100755
--- a/tmac/tests/andoc_flush-between-packages.sh
+++ b/tmac/tests/andoc_flush-between-packages.sh
@@ -49,7 +49,7 @@ man\-flush-test2 \- a second sanity test for groff_man(7)
 This supernumerary loquacious sentence should end up with a
 partially-collected output line.'
 
-OUTPUT=$(printf "%s\n" "$EXAMPLE" | "$groff" -Tascii -P-cbou -man)
+OUTPUT=$(printf "%s\n" "$EXAMPLE" | "$groff" -Tascii -P-cbou -mandoc)
 
 FAIL=
 
diff --git a/tmac/tmac.am b/tmac/tmac.am
index e966b43..8c0c533 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -251,7 +251,7 @@ tmac/stamp-wrap:
          for m in ""$(tmac_wrap); do \
            $(RM) $(top_builddir)/tmac/$$m-wrap; \
            if test "$$m" = an; then \
-             echo .do mso andoc.tmac >>$(top_builddir)/tmac/$$m-wrap; \
+             echo .do mso an.tmac >>$(top_builddir)/tmac/$$m-wrap; \
            fi; \
            echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
            echo .so $(sys_tmac_prefix)$$m >>$(top_builddir)/tmac/$$m-wrap; \