after several improvements to -Tman went in,

enable lots of related regression tests

27 files changed, 172 insertions, 30 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bd/Makefile b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
index 7a23b65fb19..5b270baab53 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.5 2011/12/01 23:57:51 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=empty blank offset-empty spacing
 
-SKIP_TMAN ?= empty offset-empty spacing
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in
index 0ee495a9b5b..816920b0129 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.in
@@ -1,4 +1,4 @@
-.Dd October 19, 2009
+.Dd July 6, 2012
 .Dt BD-OFFSET-EMPTY 1
 .Os OpenBSD
 .Sh NAME
@@ -8,6 +8,18 @@
 .Bd -literal -offset
 Bd literal offset empty
 .Ed
+.Bd -literal -offset left
+Bd literal offset left
+.Ed
+.Bd -literal -offset indent
+Bd literal offset indent
+.Ed
+.Bd -literal -offset indent-two
+Bd literal offset indent-two
+.Ed
 .Bd -literal -offset 4n
 Bd literal offset 4n
 .Ed
+.Bd -literal -offset mystring
+Bd literal offset mystring
+.Ed
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
index 569a50ce5c0..6b675340471 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
@@ -6,6 +6,14 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
      Bd literal offset empty
 
+     Bd literal offset left
+
+           Bd literal offset indent
+
+                 Bd literal offset indent-two
+
          Bd literal offset 4n
 
-OpenBSD                        October 19, 2009                        OpenBSD
+             Bd literal offset mystring
+
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/spacing.in b/regress/usr.bin/mandoc/mdoc/Bd/spacing.in
index 4e925a788ef..95d899357c5 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/spacing.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/spacing.in
@@ -1,4 +1,4 @@
-.Dd November 22, 2011
+.Dd July 6, 2012
 .Dt BD-SPACING 1
 .Os OpenBSD
 .Sh NAME
@@ -9,4 +9,8 @@ preceding text
 .Bd -ragged -offset indent
 display block
 .Ed
+text between displays
+.Bd -ragged -offset indent -compact
+compact display block
+.Ed
 following text
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
index b18ea98e38e..4c1c4ee14ec 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
@@ -7,6 +7,8 @@ DDEESSCCRRIIPPTTIIOONN
      preceding text
 
            display block
+     text between displays
+           compact display block
      following text
 
-OpenBSD                        November 22, 2011                       OpenBSD
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/Makefile b/regress/usr.bin/mandoc/mdoc/Bk/Makefile
index 66cdaf9fb18..9009a4f6255 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bk/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=break badarg
 
-SKIP_TMAN ?= ALL
+SKIP_TMAN ?= badarg
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/Makefile b/regress/usr.bin/mandoc/mdoc/Cm/Makefile
new file mode 100644
index 00000000000..4ea90ef158a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Cm/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2012/07/07 14:10:55 schwarze Exp $
+
+REGRESS_TARGETS=basic
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/basic.in b/regress/usr.bin/mandoc/mdoc/Cm/basic.in
new file mode 100644
index 00000000000..2fba179c66f
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Cm/basic.in
@@ -0,0 +1,12 @@
+.Dd July 6, 2012
+.Dt CM-BASIC 1
+.Os OpenBSD
+.Sh NAME
+.Nm Cm-basic
+.Nd basic usage of the Cm macro
+.Sh DESCRIPTION
+end of line:
+.Nm mt Fl f Ar device Cm rewind
+.Pp
+middle of line:
+.Nm ps Fl o Cm pid , Ns Cm command
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii b/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii
new file mode 100644
index 00000000000..4b7667d2065
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii
@@ -0,0 +1,11 @@
+CM-BASIC(1)                OpenBSD Reference Manual                CM-BASIC(1)
+
+NNAAMMEE
+     CCmm--bbaassiicc - basic usage of the Cm macro
+
+DDEESSCCRRIIPPTTIIOONN
+     end of line: mmtt --ff _d_e_v_i_c_e rreewwiinndd
+
+     middle of line: ppss --oo ppiidd,ccoommmmaanndd
+
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/D1/Makefile b/regress/usr.bin/mandoc/mdoc/D1/Makefile
new file mode 100644
index 00000000000..bb15b39277e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/D1/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2012/07/07 14:10:55 schwarze Exp $
+
+REGRESS_TARGETS=spacing
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.in b/regress/usr.bin/mandoc/mdoc/D1/spacing.in
new file mode 100644
index 00000000000..bb74a11718f
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.in
@@ -0,0 +1,10 @@
+.Dd July 6, 2012
+.Dt D1-SPACING 1
+.Os OpenBSD
+.Sh NAME
+.Nm D1-spacing
+.Nd spacing in and around one-line displays
+.Sh DESCRIPTION
+preceding text
+.D1 spacing  in  and around one-line displays
+following text
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
new file mode 100644
index 00000000000..36b3fa1a325
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
@@ -0,0 +1,11 @@
+D1-SPACING(1)              OpenBSD Reference Manual              D1-SPACING(1)
+
+NNAAMMEE
+     DD11--ssppaacciinngg - spacing in and around one-line displays
+
+DDEESSCCRRIIPPTTIIOONN
+     preceding text
+           spacing in and around one-line displays
+     following text
+
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Dl/Makefile b/regress/usr.bin/mandoc/mdoc/Dl/Makefile
new file mode 100644
index 00000000000..bb15b39277e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Dl/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2012/07/07 14:10:55 schwarze Exp $
+
+REGRESS_TARGETS=spacing
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Dl/spacing.in b/regress/usr.bin/mandoc/mdoc/Dl/spacing.in
new file mode 100644
index 00000000000..ea93909d856
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Dl/spacing.in
@@ -0,0 +1,10 @@
+.Dd July 6, 2012
+.Dt Dl-SPACING 1
+.Os OpenBSD
+.Sh NAME
+.Nm Dl-spacing
+.Nd spacing in and around one-line literal displays
+.Sh DESCRIPTION
+preceding text
+.Dl spacing  in  and around one-line literal displays
+following text
diff --git a/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii
new file mode 100644
index 00000000000..1c2d043103b
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii
@@ -0,0 +1,11 @@
+Dl-SPACING(1)              OpenBSD Reference Manual              Dl-SPACING(1)
+
+NNAAMMEE
+     DDll--ssppaacciinngg - spacing in and around one-line literal displays
+
+DDEESSCCRRIIPPTTIIOONN
+     preceding text
+           spacing in and around one-line literal displays
+     following text
+
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/Makefile b/regress/usr.bin/mandoc/mdoc/Fl/Makefile
index e88c75acba6..4630f4af057 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Fl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=noarg multiarg parsed punct
 
@@ -8,6 +8,4 @@ REGRESS_TARGETS=noarg multiarg parsed punct
 
 SKIP_GROFF ?= punct
 
-SKIP_TMAN ?= noarg parsed
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/Makefile b/regress/usr.bin/mandoc/mdoc/Lb/Makefile
index 2bf7618ed88..b3a6bc02761 100644
--- a/regress/usr.bin/mandoc/mdoc/Lb/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Lb/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=break badargs
 
-SKIP_TMAN ?= ALL
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile
index 332ff8b316d..bda3aa3af95 100644
--- a/regress/usr.bin/mandoc/mdoc/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2011/12/04 03:12:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.18 2012/07/07 14:10:55 schwarze Exp $
 
-SUBDIR+= Ad Ap Aq Ar At Bd Bk Bl Brq Bx Cd Dq Dv Er Ev Fl Fo Ic In
-SUBDIR+= Lb Li Ms Mt Nd Nm No Ns Op Ox Pf Pp Qq Rs Sm Sq St Sx Sy Tn Ux Vt Xr
-SUBDIR+= blank
+SUBDIR += Ad Ap Aq Ar At Bd Bk Bl Brq Bx Cd Cm D1 Dl Dq Dv Er Ev Fl Fo
+SUBDIR += Ic In Lb Li Ms Mt Nd Nm No Ns Oo Op Ox Pf Pp Qq Rs
+SUBDIR += Sm Sq St Sx Sy Tn Ux Vt Xr blank
 
 # disabled, mandoc must be fixed:
 # Pa
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/Makefile b/regress/usr.bin/mandoc/mdoc/Nm/Makefile
index d3fa5f2a83e..4891d3cef47 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Nm/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=empty
 
-SKIP_TMAN ?= empty
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/empty.in b/regress/usr.bin/mandoc/mdoc/Nm/empty.in
index 4db0d60a719..d135c5c08b9 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/empty.in
+++ b/regress/usr.bin/mandoc/mdoc/Nm/empty.in
@@ -7,3 +7,7 @@
 .Sh SYNOPSIS
 .Nm
 .Nm
+.Sh DESCRIPTION
+The
+.Nm
+utility ...
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
index 45beea073e6..0b91bfdf7cb 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
@@ -7,4 +7,7 @@ SSYYNNOOPPSSIISS
      NNmm--eemmppttyy
      NNmm--eemmppttyy
 
+DDEESSCCRRIIPPTTIIOONN
+     The NNmm--eemmppttyy utility ...
+
 OpenBSD                          June 30, 2010                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/Makefile b/regress/usr.bin/mandoc/mdoc/Ns/Makefile
index 582c7ac49a8..5117b56c9bc 100644
--- a/regress/usr.bin/mandoc/mdoc/Ns/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Ns/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=position punct
 
-SKIP_TMAN ?= position
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Oo/Makefile b/regress/usr.bin/mandoc/mdoc/Oo/Makefile
new file mode 100644
index 00000000000..086f9bdfc9e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Oo/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2012/07/07 14:10:55 schwarze Exp $
+
+REGRESS_TARGETS=punct
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.in b/regress/usr.bin/mandoc/mdoc/Oo/punct.in
new file mode 100644
index 00000000000..c9e9d7327ae
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.in
@@ -0,0 +1,23 @@
+.Dd July 6, 2012
+.Dt OO-PUNCT 1
+.Os OpenBSD
+.Sh NAME
+.Nm Oo-punct
+.Nd punctuation handling by the Oo macro
+.Sh DESCRIPTION
+at the beginning:
+.Oo ( z
+.Oo | z
+.Oo . z
+.Oc Oc Oc
+.Pp
+in the middle:
+.Oo a ( z
+.Oo a | z
+.Oo a . z
+.Oc Oc Oc
+.Pp
+at the end:
+.Oo Oo a (
+.Oc |
+.Oc
diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii
new file mode 100644
index 00000000000..2536ca206ff
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii
@@ -0,0 +1,13 @@
+OO-PUNCT(1)                OpenBSD Reference Manual                OO-PUNCT(1)
+
+NNAAMMEE
+     OOoo--ppuunncctt - punctuation handling by the Oo macro
+
+DDEESSCCRRIIPPTTIIOONN
+     at the beginning: ([z [| z [. z]]]
+
+     in the middle: [a (z [a | z [a. z]]]
+
+     at the end: [[a (] |]
+
+OpenBSD                          July 6, 2012                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/Makefile b/regress/usr.bin/mandoc/mdoc/Pp/Makefile
index 6d4e5620842..4eacaf5271f 100644
--- a/regress/usr.bin/mandoc/mdoc/Pp/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Pp/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=arg
 
-SKIP_TMAN ?= arg
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/Makefile b/regress/usr.bin/mandoc/mdoc/Sm/Makefile
index 923f2699dec..6dd7203dd68 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sm/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS=scope spacing-No spacing-Op
 
-SKIP_TMAN ?= ALL
+SKIP_TMAN ?= scope
 
 .include <bsd.regress.mk>