Stricter validation of the NAME section, in particular:

- require a comma between names
- reject all other text nodes
- reject all empty Nm below NAME, not only in the leading position
- reject Nm after Nd

9 files changed, 54 insertions, 5 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Nd/broken.out_lint b/regress/usr.bin/mandoc/mdoc/Nd/broken.out_lint
index 6606c52d020..2fc6732be6f 100644
--- a/regress/usr.bin/mandoc/mdoc/Nd/broken.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Nd/broken.out_lint
@@ -1,6 +1,6 @@
 mandoc: broken.in:5:2: WARNING: bad NAME section content: Oo
 mandoc: broken.in:9:1: WARNING: bad NAME section content: text
-mandoc: broken.in:4:2: WARNING: NAME section without name
+mandoc: broken.in:4:2: WARNING: NAME section without Nm before Nd
 mandoc: broken.in:4:2: WARNING: NAME section without description
 mandoc: broken.in:13:2: WARNING: moving content out of list: Bl
 mandoc: broken.in:18:1: WARNING: moving content out of list: text
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/Makefile b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
index 9fdac3f1a9e..a1db1161c9b 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2015/02/06 01:07:07 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2017/01/08 00:10:22 schwarze Exp $
 
-REGRESS_TARGETS	 = badNAME before empty emptyNAME first nohead order subbefore
-LINT_TARGETS	 = badNAME before empty emptyNAME first nohead order subbefore
+REGRESS_TARGETS	 = badNAME before empty emptyNAME first nohead order
+REGRESS_TARGETS	+= orderNAME punctNAME subbefore
+LINT_TARGETS	 = badNAME before empty emptyNAME first nohead order
+LINT_TARGETS	+= orderNAME punctNAME subbefore
 
 SKIP_GROFF	= subbefore first empty
 SKIP_ASCII	= first
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_lint
index 0713bec9ee3..c6da49bb508 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_lint
@@ -1,2 +1,2 @@
-mandoc: emptyNAME.in:4:2: WARNING: NAME section without name
+mandoc: emptyNAME.in:4:2: WARNING: NAME section without Nm before Nd
 mandoc: emptyNAME.in:4:2: WARNING: NAME section without description
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.in b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.in
new file mode 100644
index 00000000000..d8fa14525d3
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.in
@@ -0,0 +1,9 @@
+.Dd January 7, 2017
+.Dt SH-ORDERNAME 1
+.Os OpenBSD
+.Sh NAME
+.Nd name after description in NAME section
+.Ss subsection
+.Nm Sh-orderNAME
+.Sh DESCRIPTION
+The order of Nm and Nd is wrong in the NAME section.
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_ascii
new file mode 100644
index 00000000000..5e9e032fe2a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_ascii
@@ -0,0 +1,12 @@
+SH-ORDERNAME(1)             General Commands Manual            SH-ORDERNAME(1)
+
+NNAAMMEE
+     - name after description in NAME section
+
+   ssuubbsseeccttiioonn
+     SShh--oorrddeerrNNAAMMEE
+
+DDEESSCCRRIIPPTTIIOONN
+     The order of Nm and Nd is wrong in the NAME section.
+
+OpenBSD                         January 7, 2017                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_lint
new file mode 100644
index 00000000000..0049023dd80
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/orderNAME.out_lint
@@ -0,0 +1,2 @@
+mandoc: orderNAME.in:5:2: WARNING: description not at the end of NAME
+mandoc: orderNAME.in:4:2: WARNING: NAME section without Nm before Nd
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.in b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.in
new file mode 100644
index 00000000000..c34648b56ce
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.in
@@ -0,0 +1,10 @@
+.Dd January 7, 2017
+.Dt SH-PUNCTNAME 1
+.Os OpenBSD
+.Sh NAME
+.Nm Sh-punctNAME
+.Nm second_name ;
+.Nm third_name ,
+.Nd wrong punctuation in the NAME section
+.Sh DESCRIPTION
+One comma is missing, and one is misplaced.
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_ascii
new file mode 100644
index 00000000000..8b74eda5fe3
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_ascii
@@ -0,0 +1,10 @@
+SH-PUNCTNAME(1)             General Commands Manual            SH-PUNCTNAME(1)
+
+NNAAMMEE
+     SShh--ppuunnccttNNAAMMEE sseeccoonndd__nnaammee; tthhiirrdd__nnaammee, - wrong punctuation in the NAME
+     section
+
+DDEESSCCRRIIPPTTIIOONN
+     One comma is missing, and one is misplaced.
+
+OpenBSD                         January 7, 2017                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_lint
new file mode 100644
index 00000000000..9ed95e4e01b
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/punctNAME.out_lint
@@ -0,0 +1,4 @@
+mandoc: punctNAME.in:6:2: WARNING: missing comma before name: Nm second_name
+mandoc: punctNAME.in:6:17: WARNING: bad NAME section content: text
+mandoc: punctNAME.in:7:2: WARNING: missing comma before name: Nm third_name
+mandoc: punctNAME.in:7:16: WARNING: bad NAME section content: text