[groff] 34/40: [sboxes]: Stop requiring ms package.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 26dc01acc81b363e505a95574126b66f96a9445c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Feb 6 02:50:01 2022 +1100

    [sboxes]: Stop requiring ms package.
    
    * 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.
---
 contrib/sboxes/ChangeLog   |  9 +++++++++
 contrib/sboxes/sboxes.tmac | 23 +++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 21b78564..f8741639 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,12 @@
+2021-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.
+
 2021-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 29c07fb0..24ac289e 100644
--- a/contrib/sboxes/sboxes.tmac
+++ b/contrib/sboxes/sboxes.tmac
@@ -29,9 +29,6 @@ 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]; aborting\"
@@ -58,16 +55,18 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .  .
 .\}
 .
-.\" 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
-..
+.\" 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
+.  .
 .\" Has PD been actioned?
-.am par*start
-.  nr bx*PD \\n[PD]
-..
+.  am par*start
+.    nr bx*PD \\n[PD]
+.  .
+.\}
 .
 .de BOXSTART
 .  fl