9 files changed, 46 insertions, 14 deletions
diff --git a/regress/usr.bin/mandoc/man/Makefile b/regress/usr.bin/mandoc/man/Makefile
index 1aef7968cc9..1c0e8974615 100644
--- a/regress/usr.bin/mandoc/man/Makefile
+++ b/regress/usr.bin/mandoc/man/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2012/07/14 10:43:48 schwarze Exp $
+# $OpenBSD: Makefile,v 1.11 2012/07/18 16:55:54 schwarze Exp $
 
-SUBDIR = nf BI EX HP IP PP RS TH TP blank
+SUBDIR = BI EX HP IP PP RS TH TP TS nf blank
 
 ascii groff groff-clean obj-clean tman: _SUBDIRUSE
 
diff --git a/regress/usr.bin/mandoc/man/RS/Makefile b/regress/usr.bin/mandoc/man/RS/Makefile
index 6050025fe95..f764eb519e7 100644
--- a/regress/usr.bin/mandoc/man/RS/Makefile
+++ b/regress/usr.bin/mandoc/man/RS/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2012/07/07 17:47:59 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2012/07/18 16:55:54 schwarze Exp $
 
-REGRESS_TARGETS = breaking
+REGRESS_TARGETS = breaking empty
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/man/RS/empty.in b/regress/usr.bin/mandoc/man/RS/empty.in
new file mode 100644
index 00000000000..a7cd5829fe6
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/RS/empty.in
@@ -0,0 +1,16 @@
+.TH RS-EMPTY 1 "July 17, 2012" OpenBSD
+.SH NAME
+RS-empty \- empty margin reset blocks
+.SH DESCRIPTION
+regular
+text
+.RS 8n
+.RE
+regular
+text
+.RS 8n
+indented
+text
+.RE
+regular
+text
diff --git a/regress/usr.bin/mandoc/man/RS/empty.out_ascii b/regress/usr.bin/mandoc/man/RS/empty.out_ascii
new file mode 100644
index 00000000000..70ac3889ff7
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/RS/empty.out_ascii
@@ -0,0 +1,16 @@
+RS-EMPTY(1)                OpenBSD Reference Manual                RS-EMPTY(1)
+
+
+
+NNAAMMEE
+       RS-empty - empty margin reset blocks
+
+DDEESSCCRRIIPPTTIIOONN
+       regular text
+       regular text
+               indented text
+       regular text
+
+
+
+OpenBSD                          July 17, 2012                     RS-EMPTY(1)
diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile
index 2b614dad637..b2bd7682a86 100644
--- a/regress/usr.bin/mandoc/mdoc/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.24 2012/07/09 23:52:47 schwarze Exp $
+# $OpenBSD: Makefile,v 1.25 2012/07/18 16:55:54 schwarze Exp $
 
-SUBDIR += Ad An Ap Aq Ar At Bd Bk Bl Brq Bx Cd Cm
-SUBDIR += D1 Dl Dq Dv Eo Er Ev Fd Fl Fo Ic In Lb Lk Li
+SUBDIR  = Ad An Ap Aq Ar At Bd Bf Bk Bl Brq Bx Cd Cm
+SUBDIR += D1 Dl Dq Dv Em Eo Er Ev Fd Fl Fo Ft Ic In Lb Li Lk
 SUBDIR += Ms Mt Nd Nm No Ns Oo Op Ox Pa Pf Pp Qq Rs
 SUBDIR += Sm Sq St Sx Sy Tn Ux Va Vt Xr blank
 
diff --git a/regress/usr.bin/mandoc/mdoc/Ox/Makefile b/regress/usr.bin/mandoc/mdoc/Ox/Makefile
index ca0bb2bec4d..7f532eb1e83 100644
--- a/regress/usr.bin/mandoc/mdoc/Ox/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Ox/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/18 16:55:54 schwarze Exp $
 
-REGRESS_TARGETS=keep
-
-SKIP_TMAN ?= keep
+REGRESS_TARGETS = keep
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/Makefile b/regress/usr.bin/mandoc/roff/Makefile
index a6cdf1a7327..28a1dc82a47 100644
--- a/regress/usr.bin/mandoc/roff/Makefile
+++ b/regress/usr.bin/mandoc/roff/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 2012/07/07 18:27:36 schwarze Exp $
+# $OpenBSD: Makefile,v 1.12 2012/07/18 16:55:54 schwarze Exp $
 
-SUBDIR+= args esc cond string br cc de na ps rm sp
+SUBDIR  = args cond esc string
+SUBDIR += br cc de ds na ps rm sp
 
 ascii groff groff-clean obj-clean tman: _SUBDIRUSE
 
diff --git a/regress/usr.bin/mandoc/roff/ds/quoting.in b/regress/usr.bin/mandoc/roff/ds/quoting.in
index 52cd7fb551d..3e794d094eb 100644
--- a/regress/usr.bin/mandoc/roff/ds/quoting.in
+++ b/regress/usr.bin/mandoc/roff/ds/quoting.in
@@ -1,6 +1,6 @@
 .Dd August 3, 2010
 .Dt DS-QUOTING 1
-.Os
+.Os OpenBSD
 .Sh NAME
 .Nm ds-quoting
 .Nd quote handling by the define string request
diff --git a/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii b/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii
index f29a33618d0..1fd1c1ec56b 100644
--- a/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii
+++ b/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii
@@ -14,3 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
      empty string: xx
      end of test document
 
+OpenBSD                         August 3, 2010                         OpenBSD