support tail arguments on the .ME and .UE macros,

used for example in the ditroff(7) manual of the groff package

6 files changed, 33 insertions, 16 deletions

diff --git a/regress/man/MT/args.in b/regress/man/MT/args.in
index c6ea1526..806e1a77 100644
--- a/regress/man/MT/args.in
+++ b/regress/man/MT/args.in
@@ -1,13 +1,19 @@
 .\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
-.TH MT-ARGS 1 "June 25, 2017"
+.TH MT-ARGS 1 "August 13, 2018"
 .SH NAME
 MT-args \- argument handling of the man-ext mailto macro
 .SH DESCRIPTION
+argument, text, and tail:
+.MT test@example.com
+text
+.ME tail args
+.PP
 argument plus text:
 .MT test@example.com
 invalid
 address
 .ME
+next line
 .PP
 argument but no text:
 .MT test@example.com
diff --git a/regress/man/MT/args.out_ascii b/regress/man/MT/args.out_ascii
index 05939dcb..09dd4cd1 100644
--- a/regress/man/MT/args.out_ascii
+++ b/regress/man/MT/args.out_ascii
@@ -6,7 +6,9 @@ NNAAMMEE
        MT-args - argument handling of the man-ext mailto macro
 
 DDEESSCCRRIIPPTTIIOONN
-       argument plus text: invalid address <test@example.com>
+       argument, text, and tail: text <test@example.com>tail args
+
+       argument plus text: invalid address <test@example.com> next line
 
        argument but no text: <test@example.com>
 
@@ -20,4 +22,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-OpenBSD                          June 25, 2017                      MT-ARGS(1)
+OpenBSD                         August 13, 2018                     MT-ARGS(1)
diff --git a/regress/man/MT/args.out_lint b/regress/man/MT/args.out_lint
index e94e63de..b06ec906 100644
--- a/regress/man/MT/args.out_lint
+++ b/regress/man/MT/args.out_lint
@@ -1,5 +1,5 @@
-mandoc: args.in:22:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:27:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:13:2: WARNING: empty block: MT
-mandoc: args.in:17:2: WARNING: missing resource identifier, using "": MT
-mandoc: args.in:27:2: WARNING: empty block: MT
+mandoc: args.in:28:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:33:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:19:2: WARNING: empty block: MT
+mandoc: args.in:23:2: WARNING: missing resource identifier, using "": MT
+mandoc: args.in:33:2: WARNING: empty block: MT
diff --git a/regress/man/UR/args.in b/regress/man/UR/args.in
index 183269e8..9afbbee5 100644
--- a/regress/man/UR/args.in
+++ b/regress/man/UR/args.in
@@ -1,13 +1,19 @@
 .\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
-.TH UR-ARGS 1 "October 17, 2013"
+.TH UR-ARGS 1 "August 14, 2018"
 .SH NAME
 UR-basic \- argument handling of the man-ext URI macro
 .SH DESCRIPTION
+argument, text, and tail:
+.UR http://www.openbsd.org/
+text
+.UE tail argument
+.PP
 argument plus text:
 .UR http://www.openbsd.org/
 OpenBSD
 homepage
 .UE
+next line
 .PP
 argument but no text:
 .UR http://www.netbsd.org/
diff --git a/regress/man/UR/args.out_ascii b/regress/man/UR/args.out_ascii
index 9368974a..9b1d2ec3 100644
--- a/regress/man/UR/args.out_ascii
+++ b/regress/man/UR/args.out_ascii
@@ -6,7 +6,10 @@ NNAAMMEE
        UR-basic - argument handling of the man-ext URI macro
 
 DDEESSCCRRIIPPTTIIOONN
-       argument plus text: OpenBSD homepage <http://www.openbsd.org/>
+       argument, text, and tail: text <http://www.openbsd.org/>tail argument
+
+       argument plus text: OpenBSD homepage <http://www.openbsd.org/> next
+       line
 
        argument but no text: <http://www.netbsd.org/>
 
@@ -20,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-OpenBSD                        October 17, 2013                     UR-ARGS(1)
+OpenBSD                         August 14, 2018                     UR-ARGS(1)
diff --git a/regress/man/UR/args.out_lint b/regress/man/UR/args.out_lint
index 262c9886..b1525e0f 100644
--- a/regress/man/UR/args.out_lint
+++ b/regress/man/UR/args.out_lint
@@ -1,5 +1,5 @@
-mandoc: args.in:22:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:27:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:13:2: WARNING: empty block: UR
-mandoc: args.in:17:2: WARNING: missing resource identifier, using "": UR
-mandoc: args.in:27:2: WARNING: empty block: UR
+mandoc: args.in:28:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:33:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:19:2: WARNING: empty block: UR
+mandoc: args.in:23:2: WARNING: missing resource identifier, using "": UR
+mandoc: args.in:33:2: WARNING: empty block: UR