[groff] 13/19: [ms]: Fix Savannah #62686.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b8b6c6d04d4442fa16d55fc3e41e59a4ab33219c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Jul 6 12:56:15 2022 -0500

    [ms]: Fix Savannah #62686.
    
    * tmac/s.tmac (@MC): Set no-space mode before doing a paragraph reset,
      not after: we don't want vertical space at the top of the first column
      when entering multi-column mode, because then it doesn't align with
      the tops of subsequent columns.
    
    Fixes <https://savannah.gnu.org/bugs/?62686>.
    
    Discovered while formatting Kernighan & Cherry's "Typesetting
    Mathematics -- User's Guide (Second Edition) from the Unix V7
    Programmer's Manual.
---
 ChangeLog   | 11 +++++++++++
 tmac/s.tmac |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9272664e..37e51b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-07-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [ms]: Fix Savannah #62686.
+
+       * tmac/s.tmac (@MC): Set no-space mode before doing a paragraph
+       reset, not after: we don't want vertical space at the top of the
+       first column when entering multi-column mode, because then it
+       doesn't align with the tops of subsequent columns.
+
+       Fixes <https://savannah.gnu.org/bugs/?62686>.
+
 2022-07-06  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [ms]: Regression-test Savannah #62686.
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 1458d1f0..a934225c 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -570,10 +570,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .      el .nr pg*gutw 0
 .\}
 .DEVTAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
-.ns
 .nr pg*col-num 0
 .nr pg@fn-colw \\n[pg@colw]*\\*[FR]
 .par@reset
+.ns
 .mk pg*col-top
 ..
 .de 2C