[groff] 17/19: [ms]: Fix Savannah #62688.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 783f3c2745b8132a9b7fa99bd1b241d2e34f4398
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Jul 6 14:17:44 2022 -0500

    [ms]: Fix Savannah #62688.
    
    * tmac/s.tmac (DE): Set no-space mode when ending displays.
    
      (@EN): Set no-space mode after outputting the display distance
      so that it doesn't combine with inter-paragraph space.
    
    Fixes <https://savannah.gnu.org/bugs/?62688>.
    
    Discovered while formatting Kernighan & Cherry's "Typesetting
    Mathematics -- User's Guide (Second Edition) from the Unix V7
    Programmer's Manual.
---
 ChangeLog   | 10 ++++++++++
 tmac/s.tmac |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6a680ffa..174cf699 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-07-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [ms]: Fix Savannah #62688.
+
+       * tmac/s.tmac (DE): Set no-space mode when ending displays.
+       (@EN): Set no-space mode after outputting the display distance
+       so that it doesn't combine with inter-paragraph space.
+
+       Fixes <https://savannah.gnu.org/bugs/?62688>.
+
 2022-07-06  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [ms]: Regression-test Savannah #62688.
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 5c3ed694..d146609e 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -991,6 +991,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .de DE
 .ds*end!\\n[\\n[.ev]:ds-type]
 .nr \\n[.ev]:ds-type 0
+.ns
 ..
 .de ds@auto-end
 .if \\n[\\n[.ev]:ds-type] \{\
@@ -1893,6 +1894,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .      if !'\\*[eqn*num]'' .nr eqn*have-num 1
 .      ie \\n[dl]:\\n[eqn*have-num] \{\
 .              sp \\n[DD]u
+.              ns
 .              par@reset
 .              ds eqn*tabs \\n[.tabs]
 .              nf
@@ -1921,6 +1923,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .              \}
 .\".           if !'\*(.T'html' .sp \\n[DD]u
 .              sp \\n[DD]u
+.              ns
 .              ta \\*[eqn*tabs]
 .      \}
 .      el \{\