[groff] 22/25: Revert "[sboxes]: Stop requiring ms package."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b0441c55f0a7ac17f11ef6bddb4186315c38f949
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Mar 29 02:01:32 2022 +1100

    Revert "[sboxes]: Stop requiring ms package."
    
    This reverts commit 26dc01acc81b363e505a95574126b66f96a9445c.
    
    Things go rapidly pear-shaped in the absence of defined header and
    footer and margin amounts when a box abuts where they should be, so just
    depend on ms.
---
 contrib/sboxes/ChangeLog   |  9 ---------
 contrib/sboxes/sboxes.tmac | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 637901dd..3dd1901a 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -24,15 +24,6 @@
        are prerequisite problems.  This is an auxiliary package; it is
        not necessarily fatal to the user's purposes if it doesn't load.
 
-2022-02-06  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       * sboxes.tmac: Stop requiring ms package.  As the documentation
-       says, it's not necessary; sboxes will simply take advantage of
-       it if it is.  Problem introduced by me in commit f1f047013, 17
-       October.  Append to ms's `fn@print-sep` and `par*start` macros
-       only if the `GS` register exists, so that warnings aren't thrown
-       when ms is not loaded.
-
 2022-02-06  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * notquine.sed: Convert tilde to special character when inlining
diff --git a/contrib/sboxes/sboxes.tmac b/contrib/sboxes/sboxes.tmac
index 04ee0baf..b0fd3604 100644
--- a/contrib/sboxes/sboxes.tmac
+++ b/contrib/sboxes/sboxes.tmac
@@ -33,6 +33,9 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .\" Define a string for use in diagnostic messages.
 .ds bx*name sboxes.tmac\"
 .
+.if !r GS \
+.  ab \*[bx*name]: ms macros must be loaded first; aborting
+.
 .if (\n[.x]\n[.y] < 123) \{\
 .  ds bx*msg \*[bx*name]: groff 1.23 or later is required,\"
 .  as bx*msg " but found groff \n[.x].\n[.y]; not loading\"
@@ -60,18 +63,16 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .  .
 .\}
 .
-.\" Link into ms macros to trap footnote growth.
-.if r GS \{\
-.  am fn@print-sep
-.    nr bx*pb \\n[nl]u-2p
-.    nop \!x X pdf: background footnote \\n[bx*pb]z
-.    rr bx*pb
-.  .
+.\" Link into ms macros to trap footnote growth
+.am fn@print-sep
+.  nr bx*pb \\n[nl]u-2p
+.  nop \!x X pdf: background footnote \\n[bx*pb]z
+.  rr bx*pb
+..
 .\" Has PD been actioned?
-.  am par*start
-.    nr bx*PD \\n[PD]
-.  .
-.\}
+.am par*start
+.  nr bx*PD \\n[PD]
+..
 .
 .de BOXSTART
 .  fl