9 files changed, 20 insertions, 12 deletions

diff --git a/regress/mdoc/Bl/Makefile b/regress/mdoc/Bl/Makefile
index 7ac8d729..aeb6bd56 100644
--- a/regress/mdoc/Bl/Makefile
+++ b/regress/mdoc/Bl/Makefile
@@ -10,7 +10,7 @@ REGRESS_TARGETS += bareIt bareTa unclosed break breakingIt breakingTa broken
 
 UTF8_TARGETS	 = dash
 
-LINT_TARGETS	 = column column_nogroff notype badargs tag
+LINT_TARGETS	 = inset diag column column_nogroff notype badargs tag
 LINT_TARGETS	+= empty noIt emptyhead emptytag emptyitem
 LINT_TARGETS	+= bareIt bareTa break breakingIt broken
 
diff --git a/regress/mdoc/Bl/diag.in b/regress/mdoc/Bl/diag.in
index de09d465..f584f4f3 100644
--- a/regress/mdoc/Bl/diag.in
+++ b/regress/mdoc/Bl/diag.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diag.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.\" $OpenBSD: diag.in,v 1.7 2017/07/16 17:53:29 schwarze Exp $
 .Dd $Mdocdate$
 .Dt BL-DIAG 1
 .Os
@@ -38,10 +38,11 @@ x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .It zehn__zehn
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
-.Bl -diag
+.Bl -diag -width 10n
 .It This is a very long text contained in the diag item head, it is \
 so long that it overruns the line -
-and here comes the item body.
+and here comes the item body,
+which is also long enough to break the line again.
 .El
 .Pp
 Check that It is not parsed in Bl:
diff --git a/regress/mdoc/Bl/diag.out_ascii b/regress/mdoc/Bl/diag.out_ascii
index 8ed0651c..f4cfb777 100644
--- a/regress/mdoc/Bl/diag.out_ascii
+++ b/regress/mdoc/Bl/diag.out_ascii
@@ -29,11 +29,12 @@ DDEESSCCRRIIPPTTIIOONN
      x x x x x x x x x
 
      TThhiiss iiss aa vveerryy lloonngg tteexxtt ccoonnttaaiinneedd iinn tthhee ddiiaagg iitteemm hheeaadd,, iitt iiss ssoo lloonngg
-     tthhaatt iitt oovveerrrruunnss tthhee lliinnee --  and here comes the item body.
+     tthhaatt iitt oovveerrrruunnss tthhee lliinnee --  and here comes the item body, which is also
+     long enough to break the line again.
 
      Check that It is not parsed in Bl:
      NNxx  NetBSD
      OOxx  OpenBSD
      FFxx  FreeBSD
 
-OpenBSD                          July 4, 2017                          OpenBSD
+OpenBSD                          July 16, 2017                         OpenBSD
diff --git a/regress/mdoc/Bl/diag.out_lint b/regress/mdoc/Bl/diag.out_lint
new file mode 100644
index 00000000..2c8c24e2
--- /dev/null
+++ b/regress/mdoc/Bl/diag.out_lint
@@ -0,0 +1,4 @@
+mandoc: diag.in:51:2: WARNING: skipping empty macro: No
+mandoc: diag.in:53:2: WARNING: skipping empty macro: No
+mandoc: diag.in:55:2: WARNING: skipping empty macro: No
+mandoc: diag.in:41:11: WARNING: skipping -width argument: Bl -diag
diff --git a/regress/mdoc/Bl/diag.out_markdown b/regress/mdoc/Bl/diag.out_markdown
index 22c4aed0..aa8e780a 100644
--- a/regress/mdoc/Bl/diag.out_markdown
+++ b/regress/mdoc/Bl/diag.out_markdown
@@ -31,7 +31,8 @@ zehn\_\_zehn
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 
 This is a very long text contained in the diag item head, it is so long that it overruns the line -
-and here comes the item body.
+and here comes the item body,
+which is also long enough to break the line again.
 
 Check that It is not parsed in Bl:
 
@@ -42,4 +43,4 @@ OpenBSD
 Fx
 FreeBSD
 
-OpenBSD - July 4, 2017
+OpenBSD - July 16, 2017
diff --git a/regress/mdoc/Bl/inset.in b/regress/mdoc/Bl/inset.in
index 40cb85ab..997b4e12 100644
--- a/regress/mdoc/Bl/inset.in
+++ b/regress/mdoc/Bl/inset.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inset.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.\" $OpenBSD: inset.in,v 1.6 2017/07/16 17:53:29 schwarze Exp $
 .Dd $Mdocdate$
 .Dt BL-INSET 1
 .Os
@@ -39,7 +39,7 @@ x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
 .El
 .\" Trailing white space in the head.
-.Bl -inset
+.Bl -inset -width 10n
 .It "a"
 b
 .It "a "
diff --git a/regress/mdoc/Bl/inset.out_ascii b/regress/mdoc/Bl/inset.out_ascii
index 51320009..509747cb 100644
--- a/regress/mdoc/Bl/inset.out_ascii
+++ b/regress/mdoc/Bl/inset.out_ascii
@@ -34,4 +34,4 @@ DDEESSCCRRIIPPTTIIOONN
 
      a   b
 
-OpenBSD                          July 4, 2017                          OpenBSD
+OpenBSD                          July 16, 2017                         OpenBSD
diff --git a/regress/mdoc/Bl/inset.out_lint b/regress/mdoc/Bl/inset.out_lint
new file mode 100644
index 00000000..32b4aafd
--- /dev/null
+++ b/regress/mdoc/Bl/inset.out_lint
@@ -0,0 +1 @@
+mandoc: inset.in:42:12: WARNING: skipping -width argument: Bl -inset
diff --git a/regress/mdoc/Bl/inset.out_markdown b/regress/mdoc/Bl/inset.out_markdown
index 5dcf3846..da973141 100644
--- a/regress/mdoc/Bl/inset.out_markdown
+++ b/regress/mdoc/Bl/inset.out_markdown
@@ -39,4 +39,4 @@ b
 a  ‌
 b
 
-OpenBSD - July 4, 2017
+OpenBSD - July 16, 2017