12 files changed, 78 insertions, 9 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/In/Makefile b/regress/usr.bin/mandoc/mdoc/In/Makefile
index 55c83febd60..790827bbcfa 100644
--- a/regress/usr.bin/mandoc/mdoc/In/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/In/Makefile
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2012/11/16 18:40:39 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2015/02/06 01:07:07 schwarze Exp $
 
-REGRESS_TARGETS = break font eos
+REGRESS_TARGETS	 = break eos font noarg
+LINT_TARGETS	 = noarg
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.in b/regress/usr.bin/mandoc/mdoc/In/noarg.in
new file mode 100644
index 00000000000..f443637a6e5
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/In/noarg.in
@@ -0,0 +1,20 @@
+.Dd February 5, 2015
+.Dt IN-NOARG 2
+.Os OpenBSD
+.Sh NAME
+.Nm In-noarg
+.Nd include file macros without argument
+.Sh SYNOPSIS
+.In math.h
+.Ft double
+.Fn sin "double x"
+.In
+.Ft double
+.Fn cos "double x"
+.Sh DESCRIPTION
+.In math.h
+.Ft double
+.Fn sin "double x"
+.In
+.Ft double
+.Fn cos "double x"
diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii
new file mode 100644
index 00000000000..1a86acd619e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/In/noarg.out_ascii
@@ -0,0 +1,18 @@
+IN-NOARG(2)                   System Calls Manual                  IN-NOARG(2)
+
+NNAAMMEE
+     IInn--nnooaarrgg - include file macros without argument
+
+SSYYNNOOPPSSIISS
+     ##iinncclluuddee <<mmaatthh..hh>>
+
+     _d_o_u_b_l_e
+     ssiinn(_d_o_u_b_l_e _x);
+
+     _d_o_u_b_l_e
+     ccooss(_d_o_u_b_l_e _x);
+
+DDEESSCCRRIIPPTTIIOONN
+     <_m_a_t_h_._h> _d_o_u_b_l_e ssiinn(_d_o_u_b_l_e _x) _d_o_u_b_l_e ccooss(_d_o_u_b_l_e _x)
+
+OpenBSD                        February 5, 2015                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint
new file mode 100644
index 00000000000..3b4e6d2237a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/In/noarg.out_lint
@@ -0,0 +1,2 @@
+mandoc: noarg.in:11:2: WARNING: skipping empty macro: In
+mandoc: noarg.in:18:2: WARNING: skipping empty macro: In
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/Makefile b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
index a740b8fa492..9fdac3f1a9e 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2014/11/25 03:04:32 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2015/02/06 01:07:07 schwarze Exp $
 
-REGRESS_TARGETS	= before subbefore first emptyNAME badNAME order empty
-LINT_TARGETS	= before subbefore first emptyNAME badNAME order empty
+REGRESS_TARGETS	 = badNAME before empty emptyNAME first nohead order subbefore
+LINT_TARGETS	 = badNAME before empty emptyNAME first nohead order subbefore
 
 SKIP_GROFF	= subbefore first empty
 SKIP_ASCII	= first
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/nohead.in b/regress/usr.bin/mandoc/mdoc/Sh/nohead.in
new file mode 100644
index 00000000000..d4516cc7ec8
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/nohead.in
@@ -0,0 +1,12 @@
+.Dd February 5, 2015
+.Dt SH-NOHEAD 1
+.Os OpenBSD
+.Sh NAME
+.Nm Sh-nohead
+.Nd sections without header lines
+.Sh DESCRIPTION
+empty section header:
+.Sh
+empty subsection header:
+.Ss
+text
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_ascii
new file mode 100644
index 00000000000..fa42f20c505
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_ascii
@@ -0,0 +1,9 @@
+SH-NOHEAD(1)                General Commands Manual               SH-NOHEAD(1)
+
+NNAAMMEE
+     SShh--nnoohheeaadd - sections without header lines
+
+DDEESSCCRRIIPPTTIIOONN
+     empty section header: empty subsection header: text
+
+OpenBSD                        February 5, 2015                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_lint
new file mode 100644
index 00000000000..b93f65e6d85
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/nohead.out_lint
@@ -0,0 +1,2 @@
+mandoc: nohead.in:9:2: WARNING: skipping empty macro: Sh
+mandoc: nohead.in:11:2: WARNING: skipping empty macro: Ss
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/Makefile b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
index fb494d29804..98887f8477a 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2011/12/03 23:01:21 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2015/02/06 01:07:07 schwarze Exp $
 
-REGRESS_TARGETS=args
+REGRESS_TARGETS	 = args
+LINT_TARGETS	 = args
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.in b/regress/usr.bin/mandoc/mdoc/Xr/args.in
index 8dece170483..97e68202de0 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.in
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.in
@@ -19,7 +19,9 @@ another
 .Xr echo 1 .
 .Pp
 Finally, half an
-.Xr echo
+.Xr echo ,
+no echo
+.Xr ,
 and no
 .Xr
 echo at all.
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
index 987ffb5ad43..81fe8784d59 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
@@ -11,6 +11,6 @@ DDEESSCCRRIIPPTTIIOONN
 
      A call, an echo(1), and another echo(1).
 
-     Finally, half an echo and no echo at all.
+     Finally, half an echo, no echo and no echo at all.
 
 OpenBSD                        December 3, 2011                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint b/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint
new file mode 100644
index 00000000000..703a0abf3e6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_lint
@@ -0,0 +1,2 @@
+mandoc: args.in:24:2: WARNING: skipping empty macro: Xr
+mandoc: args.in:26:2: WARNING: skipping empty macro: Xr