Discard excess head arguments for .Bd .Bl .Bk and delete hwarn_eq0().

Discard empty .Bk blocks.
Improve related diagnostics.

7 files changed, 59 insertions, 13 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.in b/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
index 0dbd2931160..4b06a528776 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
@@ -16,7 +16,7 @@ last
 wins
 .Ed
 no type:
-.Bd -offset 0n
+.Bd -offset 0n -bogus args
 displayed
 text
 .Ed
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
index 25d51a2efb4..554577d4062 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
@@ -3,6 +3,7 @@ mandoc: badargs.in:12:2: ERROR: skipping all arguments: Ed tail argument
 mandoc: badargs.in:14:34: WARNING: duplicate argument: Bd -compact
 mandoc: badargs.in:14:43: WARNING: duplicate argument: Bd -offset 6n
 mandoc: badargs.in:19:2: WARNING: missing display type, using -ragged: Bd
+mandoc: badargs.in:19:16: ERROR: skipping excess arguments: Bd ... -bogus
 mandoc: badargs.in:24:2: WARNING: skipping duplicate display type: Bd -unfilled
 mandoc: badargs.in:28:2: WARNING: skipping duplicate display type: Bd -ragged
 mandoc: badargs.in:33:2: ERROR: NOT IMPLEMENTED: Bd -file
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/badarg.in b/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
index 1f331e56519..c3338e701bf 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
+++ b/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
@@ -46,7 +46,7 @@
 .Ar x x x x x x x x
 .Ar x x x x x x x x
 .Ar x x x x x x
-.Bk -words -murks
+.Bk -words -murks bogus
 .Op o Ar a
 .Ek
 .Sh DESCRIPTION
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_lint b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_lint
index 3ced9f1087d..310c156d58d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_lint
@@ -1,6 +1,6 @@
-mandoc: badarg.in:13:2: WARNING: argument count wrong: want 0 children (have 1)
-mandoc: badarg.in:22:2: WARNING: argument count wrong: want 0 children (have 1)
+mandoc: badarg.in:13:5: ERROR: skipping excess arguments: Bk ... -badarg
+mandoc: badarg.in:22:5: ERROR: skipping excess arguments: Bk ... -lines
 mandoc: badarg.in:24:2: ERROR: skipping all arguments: Ek tail argument
-mandoc: badarg.in:31:2: WARNING: argument count wrong: want 0 children (have 1)
-mandoc: badarg.in:49:2: WARNING: argument count wrong: want 0 children (have 1)
-mandoc: badarg.in:54:2: WARNING: argument count wrong: want more than 0 children (have 0)
+mandoc: badarg.in:31:5: ERROR: skipping excess arguments: Bk ... -line
+mandoc: badarg.in:49:12: ERROR: skipping excess arguments: Bk ... -murks
+mandoc: badarg.in:54:2: WARNING: skipping empty macro: Bk
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.in b/regress/usr.bin/mandoc/mdoc/Bl/badargs.in
index 93a7de83d71..9c825b5ea86 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.in
@@ -1,4 +1,4 @@
-.Dd July 5, 2014
+.Dd February 4, 2015
 .Dt BL-BADARGS 1
 .Os OpenBSD
 .Sh NAME
@@ -46,6 +46,31 @@ bullet enum
 .It
 enum bullet
 .El
+unknown arguments:
+.Bl -bullet -bogus args
+.It
+bullet text
+.El
+.Bl -enum -bogus args
+.It
+enum text
+.El
+.Bl -inset -bogus args
+.It inset
+text
+.El
+.Bl -item -bogus args
+.It
+item text
+.El
+.Bl -ohang -bogus args
+.It ohang
+text
+.El
+.Bl -tag -width Ds -bogus args
+.It tag
+text
+.El
 double arguments:
 .Bl -tag -compact -offset 20n -width 20n -compact -offset 2n -width 6n
 .It last
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
index cdefa4da21b..ad1707b1edd 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
@@ -23,7 +23,21 @@ DDEESSCCRRIIPPTTIIOONN
      double type:
      ++oo   bullet enum
      1.   enum bullet
+     unknown arguments:
+
+     ++oo   bullet text
+
+     1.   enum text
+
+     inset text
+
+     item text
+
+     ohang
+     text
+
+     tag     text
      double arguments:
        last    wins
 
-OpenBSD                          July 5, 2014                          OpenBSD
+OpenBSD                        February 4, 2015                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
index 84dc961ba06..df7541a4828 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
@@ -6,7 +6,13 @@ mandoc: badargs.in:31:11: WARNING: empty argument, using 0n: Bl -width
 mandoc: badargs.in:35:10: WARNING: empty argument, using 0n: Bl -width
 mandoc: badargs.in:41:2: WARNING: skipping duplicate list type: Bl -enum
 mandoc: badargs.in:45:2: WARNING: skipping duplicate list type: Bl -bullet
-mandoc: badargs.in:50:42: WARNING: duplicate argument: Bl -compact
-mandoc: badargs.in:50:51: WARNING: duplicate argument: Bl -offset 2n
-mandoc: badargs.in:50:62: WARNING: duplicate argument: Bl -width 6n
-mandoc: badargs.in:53:2: ERROR: skipping all arguments: El tail argument
+mandoc: badargs.in:50:13: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:54:11: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:58:12: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:62:11: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:66:12: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:70:20: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:75:42: WARNING: duplicate argument: Bl -compact
+mandoc: badargs.in:75:51: WARNING: duplicate argument: Bl -offset 2n
+mandoc: badargs.in:75:62: WARNING: duplicate argument: Bl -width 6n
+mandoc: badargs.in:78:2: ERROR: skipping all arguments: El tail argument