some more tests regarding empty macros

11 files changed, 143 insertions, 8 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bd/Makefile b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
index adab6bd62ca..06fbb7b7258 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2010/07/01 05:29:57 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2011/01/04 02:11:32 schwarze Exp $
 
-REGRESS_TARGETS=blank offset-empty
-GROFF_TARGETS=blank offset-empty
+REGRESS_TARGETS=empty blank offset-empty
+GROFF_TARGETS=empty blank offset-empty
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/empty.in b/regress/usr.bin/mandoc/mdoc/Bd/empty.in
new file mode 100644
index 00000000000..b965773173f
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/empty.in
@@ -0,0 +1,20 @@
+.Dd January 2, 2010
+.Dt BD-EMPTY 1
+.Os
+.Sh NAME
+.Nm Bd-empty
+.Nd empty displays
+.Sh DESCRIPTION
+An empty filled display:
+.Bd -filled
+.Ed
+An empty literal display:
+.Bd -literal
+.Ed
+An empty ragged display:
+.Bd -ragged
+.Ed
+An empty unfilled display:
+.Bd -unfilled
+.Ed
+end of test document
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii
new file mode 100644
index 00000000000..de044e1c65a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii
@@ -0,0 +1,16 @@
+BD-EMPTY(1)                OpenBSD Reference Manual                BD-EMPTY(1)
+
+NNAAMMEE
+     BBdd--eemmppttyy - empty displays
+
+DDEESSCCRRIIPPTTIIOONN
+     An empty filled display:
+
+     An empty literal display:
+
+     An empty ragged display:
+
+     An empty unfilled display:
+
+     end of test document
+
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/badarg.in b/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
index 426f8318c0e..e76db3ba518 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
+++ b/regress/usr.bin/mandoc/mdoc/Bk/badarg.in
@@ -49,3 +49,8 @@
 .Bk -words -murks
 .Op o Ar a
 .Ek
+.Sh DESCRIPTION
+Here is an empty keep:
+.Bk -words
+.Ek
+End of test document.
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
index c1db931bf62..1941b707f03 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
@@ -19,3 +19,6 @@ SSYYNNOOPPSSIISS
      BBkk--bbaaddaarrgg _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
                [o _a]
 
+DDEESSCCRRIIPPTTIIOONN
+     Here is an empty keep: End of test document.
+
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/Makefile b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
index d5f15c57f7c..87be6e171ec 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
@@ -1,7 +1,16 @@
-# $OpenBSD: Makefile,v 1.5 2010/07/01 05:29:57 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2011/01/04 02:11:32 schwarze Exp $
 
-REGRESS_TARGETS=tag inset hang diag column multitag extend nested multitype
-GROFF_TARGETS=tag inset hang diag column multitag extend nested multitype
+REGRESS_TARGETS=tag inset hang diag column extend nested
+GROFF_TARGETS=tag inset diag column extend nested
+
+# mandoc still contains a compatibility hack with groff-1.15
+# regarding hang list indentation.
+
+REGRESS_TARGETS+=multitype multitag empty
+GROFF_TARGETS+=multitype multitag
+
+# groff-1.20.1 mishandles empty lists,
+# ruining indentation and sometimes cauisng empty lines.
 
 REGRESS_TARGETS+=EMULTILIST
 REGRESS_SLOW_TARGETS=EMULTILIST
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/empty.in b/regress/usr.bin/mandoc/mdoc/Bl/empty.in
new file mode 100644
index 00000000000..11f089fdb3c
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bl/empty.in
@@ -0,0 +1,41 @@
+.Dd January 2, 2011
+.Dt BL-EMPTY 1
+.Os
+.Sh NAME
+.Nm Bl-empty
+.Nd empty lists
+.Sh DESCRIPTION
+bullet list:
+.Bl -bullet
+.El
+column list:
+.Bl -column one two
+.El
+dash list:
+.Bl -dash
+.El
+diag list:
+.Bl -diag
+.El
+enum list:
+.Bl -enum
+.El
+hang list:
+.Bl -hang
+.El
+hyphen list:
+.Bl -hyphen
+.El
+inset list:
+.Bl -inset
+.El
+item list:
+.Bl -item
+.El
+ohang list:
+.Bl -ohang
+.El
+tag list:
+.Bl -tag -width Ds
+.El
+end of test document
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii
new file mode 100644
index 00000000000..e66c225d156
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii
@@ -0,0 +1,19 @@
+BL-EMPTY(1)                OpenBSD Reference Manual                BL-EMPTY(1)
+
+NNAAMMEE
+     BBll--eemmppttyy - empty lists
+
+DDEESSCCRRIIPPTTIIOONN
+     bullet list:
+     column list:
+     dash list:
+     diag list:
+     enum list:
+     hang list:
+     hyphen list:
+     inset list:
+     item list:
+     ohang list:
+     tag list:
+     end of test document
+
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/Makefile b/regress/usr.bin/mandoc/mdoc/Lb/Makefile
index 77a1fa61f31..3619596fe8b 100644
--- a/regress/usr.bin/mandoc/mdoc/Lb/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Lb/Makefile
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2010/12/04 14:49:40 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2011/01/04 02:11:32 schwarze Exp $
 
-REGRESS_TARGETS=break
+REGRESS_TARGETS=break badargs
+GROFF_TARGETS=break badargs
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.in b/regress/usr.bin/mandoc/mdoc/Lb/badargs.in
new file mode 100644
index 00000000000..8aa342632a8
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.in
@@ -0,0 +1,11 @@
+.Dd January 2, 2011
+.Dt LB-BADARGS 3
+.Os
+.Sh NAME
+.Nm Lb-badargs
+.Nd bad arguments to the library macro
+.Sh LIBRARY
+.Lb libc
+.Lb murks
+.Lb
+.Lb libc another
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii
new file mode 100644
index 00000000000..cb9bdfbc647
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii
@@ -0,0 +1,10 @@
+LB-BADARGS(3)             OpenBSD Programmer's Manual            LB-BADARGS(3)
+
+NNAAMMEE
+     LLbb--bbaaddaarrggss - bad arguments to the library macro
+
+LLIIBBRRAARRYY
+     Standard C Library (libc, -lc)
+     library ``murks''
+     Standard C Library (libc, -lc) another
+