[groff] 03/30: [mm]: Fix ML mark alignment when 2nd arg present.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit c7f76028fdb32e7356526bd6d02f652e96be1d4d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Jul 9 11:48:25 2024 -0500

    [mm]: Fix ML mark alignment when 2nd arg present.
    
    * contrib/mm/m.tmac (ML): Right-align mark within text indentation when
      the latter is specified.  Problem introduced by me in commit
      512b749f4e, 2 July.
    
    * contrib/mm/tests/lists-indent-correctly.sh: Update test expectations.
---
 contrib/mm/ChangeLog                       | 8 ++++++++
 contrib/mm/m.tmac                          | 2 +-
 contrib/mm/tests/lists-indent-correctly.sh | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 38691ccd8..29918af82 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,11 @@
+2024-07-09  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m.tmac (ML): Right-align mark within text indentation when the
+       latter is specified.  Problem introduced by me in commit
+       512b749f4e, 2 July.
+
+       * tests/lists-indent-correctly.sh: Update test expectations.
+
 2024-07-04  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m.tmac (DL): Use the `EM` string as the mark instead of an em
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index d3e880668..5f76da480 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -2561,7 +2561,7 @@ exceeds depth of nested lists (\\n[li*lvl])
 .              as " '\\$2'\"
 .              @error \\*[li*msg]
 .      \}
-.      ie \\n[.$]=2 .LB \\$2                 0 0 0 "\\$1"
+.      ie \\n[.$]=2 .LB \\$2                 0 1 0 "\\$1"
 .      el           .LB \\n[li*text-indent]u 0 0 0 "\\$1"
 .      \}
 .\}
diff --git a/contrib/mm/tests/lists-indent-correctly.sh 
b/contrib/mm/tests/lists-indent-correctly.sh
index cf8bfb629..891a0779b 100755
--- a/contrib/mm/tests/lists-indent-correctly.sh
+++ b/contrib/mm/tests/lists-indent-correctly.sh
@@ -169,7 +169,7 @@ o21 o22 o23 o24 o25 o26 o27 o28 o29 o30
 #       ! d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17
 #         d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30
 #
-#       @    e1 e2 e3 e4 e5 e6 e7 e8 e9 e10 e11 e12 e13 e14 e15 e16
+#          @ e1 e2 e3 e4 e5 e6 e7 e8 e9 e10 e11 e12 e13 e14 e15 e16
 #            e17 e18 e19 e20 e21 e22 e23 e24 e25 e26 e27 e28 e29 e30
 #
 #        [1] f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16
@@ -252,7 +252,7 @@ echo "checking indentation of ML list, second line" >&2
 echo "$output" | grep -Eq "^ {9}d18" || wail
 
 echo "checking indentation of ML list with text indent, first line" >&2
-echo "$output" | grep -Eq "^ {7}@ {4}e1" || wail
+echo "$output" | grep -Eq "^ {10}@ {1}e1" || wail
 
 echo "checking indentation of ML list with text indent, second line" >&2
 echo "$output" | grep -Eq "^ {12}e17" || wail