major update of the mandoc test suite:

* add various new and extend a few existing tests
* stop using Mdocdate to ease syncing with NetBSD

33 files changed, 302 insertions, 43 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Ar/Makefile b/regress/usr.bin/mandoc/mdoc/Ar/Makefile
new file mode 100644
index 00000000000..60ad9fe1cb6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ar/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2010/07/01 05:29:57 schwarze Exp $
+
+REGRESS_TARGETS=punct
+GROFF_TARGETS=punct
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.in b/regress/usr.bin/mandoc/mdoc/Ar/punct.in
new file mode 100644
index 00000000000..80823cbae5d
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.in
@@ -0,0 +1,17 @@
+.Dd April 7, 2010
+.Dt AR-PUNCT 1
+.Os
+.Sh NAME
+.Nm Ar-punct
+.Nd punctuation handling by the Ar macro
+.Sh DESCRIPTION
+closing punctuation
+.Ar a )
+only one
+.Ar )
+only more than one
+.Ar ) )
+middle
+.Ar a ) z
+start
+.Ar ) z
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/Makefile b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
index 58084d5b4cd..adab6bd62ca 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.1 2010/04/12 23:02:03 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2010/07/01 05:29:57 schwarze Exp $
 
-REGRESS_TARGETS=blank
-GROFF_TARGETS=blank
+REGRESS_TARGETS=blank offset-empty
+GROFF_TARGETS=blank offset-empty
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/blank.in b/regress/usr.bin/mandoc/mdoc/Bd/blank.in
index c165b20c31e..46384fce8b0 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/blank.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/blank.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 12 2010 $
+.Dd February 17, 2010
 .Dt BD-BLANK 1
 .Os
 .Sh NAME
@@ -6,11 +6,16 @@
 .Nd handling of blank lines in literal displays
 .Sh DESCRIPTION
 .Bd -literal
-one completely blank line:
-
-two blank lines:
-
+completely blank line:
 
+line containing a blank character:
+ 
+line containing two blank characters:
+  
+line starting with a blank character:
+ x
+line starting with two blank characters:
+  x
 finally, a trailing blank line:
 
 .Ed
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in
new file mode 100644
index 00000000000..89e5d5ec291
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in
@@ -0,0 +1,13 @@
+.Dd October 19, 2009
+.Dt BD-OFFSET-EMPTY 1
+.Os
+.Sh NAME
+.Nm Bd-offset-empty
+.Nd no argument specified to Bd offset
+.Sh DESCRIPTION
+.Bd -literal -offset
+Bd literal offset empty
+.Ed
+.Bd -literal -offset 4n
+Bd literal offset 4n
+.Ed
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/Makefile b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
index 7439062b8b4..d5f15c57f7c 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
@@ -1,20 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2010/04/13 22:49:47 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2010/07/01 05:29:57 schwarze Exp $
 
-REGRESS_TARGETS=tag inset hang diag column multitag nested
-GROFF_TARGETS=tag inset hang diag column multitag nested
+REGRESS_TARGETS=tag inset hang diag column multitag extend nested multitype
+GROFF_TARGETS=tag inset hang diag column multitag extend nested multitype
 
-REGRESS_TARGETS+=EMULTILIST ENOTYPE
+REGRESS_TARGETS+=EMULTILIST
 REGRESS_SLOW_TARGETS=EMULTILIST
 
-# broken:
-# different rendering of bullet
-# and different indentation
-#REGRESS_TARGETS+=bullet
-#GROFF_TARGETS+=bullet.out_ascii
-
-# broken:
-# different indentation
-#REGRESS_TARGETS+=enum
-#GROFF_TARGETS+=enum.out_ascii
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.in b/regress/usr.bin/mandoc/mdoc/Bl/column.in
index 83daeb670cf..93012d959b7 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: December 24 2009 $
+.Dd December 24, 2009
 .Dt BL-COLUMN 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/diag.in b/regress/usr.bin/mandoc/mdoc/Bl/diag.in
index a35dbe11d40..fbfbc735cbc 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/diag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/diag.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: October 28 2009 $
+.Dd October 28, 2009
 .Dt BL-DIAG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/extend.in b/regress/usr.bin/mandoc/mdoc/Bl/extend.in
new file mode 100644
index 00000000000..13dd27abe0b
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bl/extend.in
@@ -0,0 +1,31 @@
+.Dd April 12, 2010
+.Dt BL-EXTEND 1
+.Os
+.Sh NAME
+.Nm Bl-extend
+.Nd extending block headers
+.Sh DESCRIPTION
+.\" explicit quoting does not require macro lines per se
+.Ao
+plain quoted text
+.Ac
+.Bl -tag -width Ds
+.It normal tag
+normal text
+.\" when extending It headers, plain text lines fall back
+.\" into the previous It body; so macro lines are required
+.It Ao
+.No extended tag
+.Ac
+extended text
+.It prefix Ao
+.No prefixed tag
+.Ac
+prefixed text
+.\" postfix after closing macro does not work in old groff
+.\" the whole It header gets lost
+.\" .It prefix Ao
+.\" .No braced tag
+.\" .Ac postfix
+.\" braced text
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/hang.in b/regress/usr.bin/mandoc/mdoc/Bl/hang.in
index 238c911adc7..d8a6d2e0bff 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/hang.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/hang.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: October 28 2009 $
+.Dd October 28, 2009
 .Dt BL-HANG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/inset.in b/regress/usr.bin/mandoc/mdoc/Bl/inset.in
index 19e83cf5c81..c1a1ebc1c03 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/inset.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/inset.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: October 28 2009 $
+.Dd October 28, 2009
 .Dt BL-INSET 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/multitag.in b/regress/usr.bin/mandoc/mdoc/Bl/multitag.in
index 4a1daef5b95..009b4130a20 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/multitag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/multitag.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 13 2010 $
+.Dd April 13, 2010
 .Dt BL-MULTITAG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/multitype.in b/regress/usr.bin/mandoc/mdoc/Bl/multitype.in
new file mode 100644
index 00000000000..b4b6015a095
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bl/multitype.in
@@ -0,0 +1,11 @@
+.Dd October 28, 2009
+.Dt BL-MULTITYPE 1
+.Os
+.Sh NAME
+.Nm Bl-multitype
+.Nd list with multiple types
+.Sh DESCRIPTION
+.Bl -dash -bullet -offset indent
+.It
+Some text.
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/nested.in b/regress/usr.bin/mandoc/mdoc/Bl/nested.in
index edc81795d34..98319dc3777 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/nested.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/nested.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 12 2010 $
+.Dd April 12, 2010
 .Dt BL-NESTED 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.in b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
index a926e0da2c3..6e91aa1527d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: October 28 2009 $
+.Dd October 28, 2009
 .Dt BL-TAG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/Makefile b/regress/usr.bin/mandoc/mdoc/Fl/Makefile
index 4f09297db0b..235122d1e9c 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Fl/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2010/01/01 20:08:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2010/07/01 05:29:57 schwarze Exp $
 
-REGRESS_TARGETS=noarg multiarg
-GROFF_TARGETS=noarg multiarg
+REGRESS_TARGETS=noarg multiarg punct
+GROFF_TARGETS=noarg multiarg punct
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/multiarg.in b/regress/usr.bin/mandoc/mdoc/Fl/multiarg.in
index 6e53e1824e8..e26edc5c8d8 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/multiarg.in
+++ b/regress/usr.bin/mandoc/mdoc/Fl/multiarg.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: December 24 2009 $
+.Dd December 24, 2009
 .Dt FL-MULTIARG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/noarg.in b/regress/usr.bin/mandoc/mdoc/Fl/noarg.in
index decae88174c..c135063a295 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/noarg.in
+++ b/regress/usr.bin/mandoc/mdoc/Fl/noarg.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 7 2010 $
+.Dd April 7, 2010
 .Dt FL-NOARG 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.in b/regress/usr.bin/mandoc/mdoc/Fl/punct.in
new file mode 100644
index 00000000000..099be8b99fc
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.in
@@ -0,0 +1,37 @@
+.Dd April 7, 2010
+.Dt FL-PUNCT 1
+.Os
+.Sh NAME
+.Nm Fl-punct
+.Nd punctuation handling by the Fl macro
+.Sh DESCRIPTION
+closing punctuation
+.Fl a )
+only one
+.Fl )
+only more than one
+.Fl ) )
+middle
+.Fl a ) z
+dot
+.Fl . z
+comma
+.Fl , z
+semicolon
+.Fl ; z
+colon
+.Fl : z
+quest
+.Fl ? z
+excl
+.Fl ! z
+paren
+.Fl ) z
+bracket
+.Fl ] z
+bar
+.Fl | m
+op paren
+.Fl ( a
+op bracket
+.Fl [ a
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/Makefile b/regress/usr.bin/mandoc/mdoc/Fo/Makefile
new file mode 100644
index 00000000000..88c7673e6b0
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Fo/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2010/07/01 05:29:57 schwarze Exp $
+
+REGRESS_TARGETS=section
+GROFF_TARGETS=section
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/section.in b/regress/usr.bin/mandoc/mdoc/Fo/section.in
new file mode 100644
index 00000000000..3c61bcccd45
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Fo/section.in
@@ -0,0 +1,83 @@
+.Dd April 7, 2010
+.Dt FN-SECTION 3
+.Os
+.Sh NAME
+.Nm Fn-section
+.Nd special handling of Fn in various sections
+.Sh SYNOPSIS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh DESCRIPTION
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh RETURN VALUES
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh ENVIRONMENT
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh FILES
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh EXAMPLES
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh DIAGNOSTICS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh ERRORS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh SEE ALSO
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh STANDARDS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh HISTORY
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh AUTHORS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh CAVEATS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh BUGS
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.Sh CUSTOM
+.nr nS 1
+.Ft int
+.Fn abs "int j"
+.Ft double
+.Fn sin "double x"
+.nr nS 0
diff --git a/regress/usr.bin/mandoc/mdoc/In/break.in b/regress/usr.bin/mandoc/mdoc/In/break.in
index 5847a53c410..429009a0eae 100644
--- a/regress/usr.bin/mandoc/mdoc/In/break.in
+++ b/regress/usr.bin/mandoc/mdoc/In/break.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: June 6 2010 $
+.Dd June 6, 2010
 .Dt IN-BREAK 2
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.in b/regress/usr.bin/mandoc/mdoc/Li/punct.in
index 5dfa44b5c94..b951bb4d681 100644
--- a/regress/usr.bin/mandoc/mdoc/Li/punct.in
+++ b/regress/usr.bin/mandoc/mdoc/Li/punct.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 8 2010 $
+.Dd April 8, 2010
 .Dt LI-PUNCT 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile
index 80e4898ddf6..e2de1b8c178 100644
--- a/regress/usr.bin/mandoc/mdoc/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Makefile
@@ -1,6 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2010/04/12 23:02:03 schwarze Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/01 05:29:57 schwarze Exp $
 
-SUBDIR+= Bd Bl Fl In Li Pa Rs Sm Xr
+SUBDIR+= Ar Bd Bl Fl Fo In Li Op Rs Sm Xr
+SUBDIR+= blank
+
+# disabled, mandoc must be fixed:
+# Pa
 
 groff groff-clean: _SUBDIRUSE
 
diff --git a/regress/usr.bin/mandoc/mdoc/Op/Makefile b/regress/usr.bin/mandoc/mdoc/Op/Makefile
new file mode 100644
index 00000000000..60ad9fe1cb6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Op/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2010/07/01 05:29:57 schwarze Exp $
+
+REGRESS_TARGETS=punct
+GROFF_TARGETS=punct
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.in b/regress/usr.bin/mandoc/mdoc/Op/punct.in
new file mode 100644
index 00000000000..76c873d2342
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Op/punct.in
@@ -0,0 +1,17 @@
+.Dd April 7, 2010
+.Dt OP-PUNCT 1
+.Os
+.Sh NAME
+.Nm Op-punct
+.Nd punctuation handling by the Op macro
+.Sh DESCRIPTION
+closing punctuation
+.Op a .
+only one
+.Op .
+only more than one
+.Op . .
+middle
+.Op a . z
+start
+.Op . z
diff --git a/regress/usr.bin/mandoc/mdoc/Pa/FILES.in b/regress/usr.bin/mandoc/mdoc/Pa/FILES.in
index c20e2b3d166..bc261b06178 100644
--- a/regress/usr.bin/mandoc/mdoc/Pa/FILES.in
+++ b/regress/usr.bin/mandoc/mdoc/Pa/FILES.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: December 25 2009 $
+.Dd December 25, 2009
 .Dt PA-FILES 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.in b/regress/usr.bin/mandoc/mdoc/Rs/break.in
index cee12deb335..2bc5465d1d9 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.in
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: October 28 2009 $
+.Dd October 28, 2009
 .Dt RS-BREAK 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/scope.in b/regress/usr.bin/mandoc/mdoc/Sm/scope.in
index 04da8dee76f..ce029beff6c 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/scope.in
+++ b/regress/usr.bin/mandoc/mdoc/Sm/scope.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: January 2 2010 $
+.Dd January 2, 2010
 .Dt SM-SCOPE 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.in b/regress/usr.bin/mandoc/mdoc/Xr/args.in
index 10e71508ed9..c5d4c426764 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.in
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.in
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: April 23 2010 $
+.Dd April 23, 2010
 .Dt XR-ARGS 1
 .Os
 .Sh NAME
diff --git a/regress/usr.bin/mandoc/mdoc/blank/Makefile b/regress/usr.bin/mandoc/mdoc/blank/Makefile
new file mode 100644
index 00000000000..8e0cc925071
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/blank/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2010/07/01 05:29:57 schwarze Exp $
+
+REGRESS_TARGETS=line comment
+GROFF_TARGETS=line comment
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/blank/comment.in b/regress/usr.bin/mandoc/mdoc/blank/comment.in
new file mode 100644
index 00000000000..1e640968519
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/blank/comment.in
@@ -0,0 +1,15 @@
+.Dd February 17, 2010
+.Dt BLANK-COMMENT 1
+.Os
+.Sh NAME
+.Nm blank-comment
+.Nd normal and bogus comments
+.Sh DESCRIPTION
+normal comment
+.\" normal
+bogus comment
+\."
+end of text
+.Pp
+text      \" comment
+text
diff --git a/regress/usr.bin/mandoc/mdoc/blank/line.in b/regress/usr.bin/mandoc/mdoc/blank/line.in
new file mode 100644
index 00000000000..ff37d305fbd
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/blank/line.in
@@ -0,0 +1,13 @@
+.Dd February 17, 2010
+.Dt BLANK-LINE 1
+.Os
+.Sh NAME
+.Nm blank-line
+.Nd handling of blank line
+.Sh DESCRIPTION
+Let us ignore this
+
+blank line, an these two
+
+
+as well.