more tests found in my other tree

34 files changed, 567 insertions, 14 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.in b/regress/usr.bin/mandoc/mdoc/Bl/column.in
index 93012d959b7..45652bde803 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.in
@@ -53,3 +53,12 @@
 .It          x13xxxxxxxxxx Ta x12xxxxxxxxx Ta x12xxxxxxxxx Ta x12xxxxxxxxx Ta x12xxxxxxxxx
 .It a Ta b Ta c Ta d Ta e
 .El
+.\" Trailing white space in phrases.
+.Bl -column "aaaa" "bbbb"
+.It "a" Ta "b"
+.It "a " Ta "b"
+.It "a  " Ta "b"
+.It a	b
+.It a 	b
+.It a  	b
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
index 1ab7a166b13..cd6790f50b8 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
@@ -34,3 +34,10 @@ DDEESSCCRRIIPPTTIIOONN
      x13xxxxxxxxxx   x12xxxxxxxxx   x12xxxxxxxxx   x12xxxxxxxxx   x12xxxxxxxxx
      a               b              c              d              e
 
+     a       b
+     a       b
+     a       b
+     a       b
+     a       b
+     a       b
+
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/inset.in b/regress/usr.bin/mandoc/mdoc/Bl/inset.in
index c1a1ebc1c03..eff73410abd 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/inset.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/inset.in
@@ -37,3 +37,12 @@ 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
+.\" Trailing white space in the head.
+.Bl -inset
+.It "a"
+b
+.It "a "
+b
+.It "a  "
+b
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
index 4ecb7700486..1a3dfb6bdc9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
@@ -28,3 +28,9 @@ DDEESSCCRRIIPPTTIIOONN
      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
 
+     a b
+
+     a  b
+
+     a   b
+
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.in b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
index 6e91aa1527d..764b8ce8ffd 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.in
@@ -37,3 +37,12 @@ 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
+.\" Trailing white space in the head.
+.Bl -tag -width 5n
+.It "a"
+b
+.It "a "
+b
+.It "a  "
+b
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
index 37adc2efcb1..001c0c6c7f9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
@@ -33,3 +33,9 @@ DDEESSCCRRIIPPTTIIOONN
             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
 
+     a      b
+
+     a      b
+
+     a      b
+
diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile
index 3bd68247598..edd6cf873a6 100644
--- a/regress/usr.bin/mandoc/mdoc/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.12 2011/02/05 18:19:11 schwarze Exp $
+# $OpenBSD: Makefile,v 1.13 2011/02/06 00:18:58 schwarze Exp $
 
 SUBDIR+= Ad Ar At Bd Bk Bl Bx Cd Er Fl Fo Ic In
-SUBDIR+= Lb Li Ms Mt Nd Nm Op Rs Sm St Sx Sy Tn Vt Xr
+SUBDIR+= Lb Li Ms Mt Nd Nm No Ns Op Pf Pp Rs Sm St Sx Sy Tn Vt Xr
 SUBDIR+= blank
 
 # disabled, mandoc must be fixed:
diff --git a/regress/usr.bin/mandoc/mdoc/No/Makefile b/regress/usr.bin/mandoc/mdoc/No/Makefile
new file mode 100644
index 00000000000..ad2ffcfc034
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/No/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2011/02/06 00:18:58 schwarze Exp $
+
+REGRESS_TARGETS=punct spacing
+GROFF_TARGETS=punct spacing
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.in b/regress/usr.bin/mandoc/mdoc/No/punct.in
new file mode 100644
index 00000000000..1d114af5bef
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/No/punct.in
@@ -0,0 +1,25 @@
+.Dd October 1, 2010
+.Dt NO-PUNCT 1
+.Os
+.Sh NAME
+.Nm No-punct
+.Nd punctuation after the normal macro
+.Sh DESCRIPTION
+One arg:
+.No one
+Two args:
+.No one two
+Trailing punctuation:
+.No arg .
+Leading punctuation:
+.No ( arg
+Multiple punctuation:
+.No [ ( arg ) ] .
+Isolated opening punctuation:
+.No pre No ( No post .
+Isolated closing punctuation:
+.No pre No ) No post .
+Multiple opening punctuation:
+.No pre No ( [ No post .
+Multiple closing punctuation:
+.No pre No ) ] No post .
diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii
new file mode 100644
index 00000000000..542d0fe4c1c
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii
@@ -0,0 +1,12 @@
+NO-PUNCT(1)                OpenBSD Reference Manual                NO-PUNCT(1)
+
+NNAAMMEE
+     NNoo--ppuunncctt - punctuation after the normal macro
+
+DDEESSCCRRIIPPTTIIOONN
+     One arg: one Two args: one two Trailing punctuation: arg.  Leading
+     punctuation: (arg Multiple punctuation: [(arg)].  Isolated opening
+     punctuation: pre (post.  Isolated closing punctuation: pre ) post.
+     Multiple opening punctuation: pre ([post.  Multiple closing punctuation:
+     pre )] post.
+
diff --git a/regress/usr.bin/mandoc/mdoc/No/spacing.in b/regress/usr.bin/mandoc/mdoc/No/spacing.in
new file mode 100644
index 00000000000..2b3295b02e6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/No/spacing.in
@@ -0,0 +1,24 @@
+.Dd October 1, 2010
+.Dt NO-SPACING 1
+.Os
+.Sh NAME
+.Nm No-spacing
+.Nd spacing around the normal macro
+.Sh DESCRIPTION
+Text before
+.No and
+after the macro.
+Macros on the line
+.Op before
+.No and
+.Op after
+the macro.
+Macros
+.Em before No and Em after
+the macro on the same line.
+Punctuation before (
+.No and
+) after the macro.
+The macro
+.Op No in
+an enclosure.
diff --git a/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii
new file mode 100644
index 00000000000..7141cce3e3a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii
@@ -0,0 +1,10 @@
+NO-SPACING(1)              OpenBSD Reference Manual              NO-SPACING(1)
+
+NNAAMMEE
+     NNoo--ssppaacciinngg - spacing around the normal macro
+
+DDEESSCCRRIIPPTTIIOONN
+     Text before and after the macro.  Macros on the line [before] and [after]
+     the macro.  Macros _b_e_f_o_r_e and _a_f_t_e_r the macro on the same line.
+     Punctuation before ( and ) after the macro.  The macro [in] an enclosure.
+
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/Makefile b/regress/usr.bin/mandoc/mdoc/Ns/Makefile
new file mode 100644
index 00000000000..5a71b25cf28
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ns/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2011/02/06 00:18:58 schwarze Exp $
+
+REGRESS_TARGETS=punct
+GROFF_TARGETS=punct
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/punct.in b/regress/usr.bin/mandoc/mdoc/Ns/punct.in
new file mode 100644
index 00000000000..ca5714dd26c
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ns/punct.in
@@ -0,0 +1,13 @@
+.Dd October 1, 2010
+.Dt NS-PUNCT 1
+.Os
+.Sh NAME
+.Nm Ns-punct
+.Nd punctuation after the no space macro
+.Sh DESCRIPTION
+Normal words:
+.No no Ns ns No no
+Opening punctuation:
+.No no Ns ( ns No no
+Closing punctuation:
+.No no Ns ns ) No no
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii
new file mode 100644
index 00000000000..cf94b69f76f
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii
@@ -0,0 +1,9 @@
+NS-PUNCT(1)                OpenBSD Reference Manual                NS-PUNCT(1)
+
+NNAAMMEE
+     NNss--ppuunncctt - punctuation after the no space macro
+
+DDEESSCCRRIIPPTTIIOONN
+     Normal words: nons no Opening punctuation: no(ns no Closing punctuation:
+     nons) no
+
diff --git a/regress/usr.bin/mandoc/mdoc/Pf/Makefile b/regress/usr.bin/mandoc/mdoc/Pf/Makefile
new file mode 100644
index 00000000000..aca8564f0fb
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pf/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2011/02/06 00:18:58 schwarze Exp $
+
+REGRESS_TARGETS=spacing
+GROFF_TARGETS=spacing
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Pf/spacing.in b/regress/usr.bin/mandoc/mdoc/Pf/spacing.in
new file mode 100644
index 00000000000..9664b6a9daa
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pf/spacing.in
@@ -0,0 +1,20 @@
+.Dd October 1, 2010
+.Dt PF-SPACING 1
+.Os
+.Sh NAME
+.Nm Pf-spacing
+.Nd spacing around the prefix macro
+.Sh DESCRIPTION
+Closing punctuation goes
+.Pf . right .
+But
+.Pf . . double
+prefixes don't work.
+Opening punctuation goes
+.Pf ( right as
+well.
+But again, prefix
+.Pf ( ) pairs
+don't work.
+Even normal text gets
+.Pf pre fixed .
diff --git a/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii
new file mode 100644
index 00000000000..ff8587285e1
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii
@@ -0,0 +1,10 @@
+PF-SPACING(1)              OpenBSD Reference Manual              PF-SPACING(1)
+
+NNAAMMEE
+     PPff--ssppaacciinngg - spacing around the prefix macro
+
+DDEESSCCRRIIPPTTIIOONN
+     Closing punctuation goes .right.  But .. double prefixes don't work.
+     Opening punctuation goes (right as well.  But again, prefix () pairs
+     don't work.  Even normal text gets prefixed.
+
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/Makefile b/regress/usr.bin/mandoc/mdoc/Pp/Makefile
new file mode 100644
index 00000000000..2ecaa5d698a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pp/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2011/02/06 00:18:58 schwarze Exp $
+
+REGRESS_TARGETS=arg
+GROFF_TARGETS=arg
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/arg.in b/regress/usr.bin/mandoc/mdoc/Pp/arg.in
new file mode 100644
index 00000000000..701e27afd90
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pp/arg.in
@@ -0,0 +1,10 @@
+.Dd September 20, 2010
+.Dt PP-ARG 1
+.Os
+.Sh NAME
+.Nm Pp-arg
+.Nd paragraph macro with arguments
+.Sh DESCRIPTION
+line 1
+.Pp drop this
+line 2
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii
new file mode 100644
index 00000000000..fa422183edd
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii
@@ -0,0 +1,10 @@
+PP-ARG(1)                  OpenBSD Reference Manual                  PP-ARG(1)
+
+NNAAMMEE
+     PPpp--aarrgg - paragraph macro with arguments
+
+DDEESSCCRRIIPPTTIIOONN
+     line 1
+
+     line 2
+
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/Makefile b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
index 0fe06d4ac63..3de1e8a6942 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2009/10/28 03:20:42 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2011/02/06 00:18:58 schwarze Exp $
 
-REGRESS_TARGETS=break
-GROFF_TARGETS=break
+REGRESS_TARGETS=break three_authors
+GROFF_TARGETS=break three_authors
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/three_authors.in b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.in
new file mode 100644
index 00000000000..1bb0d719495
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.in
@@ -0,0 +1,13 @@
+.Dd May 1, 2009
+.Dt RS-THREE_AUTHORS 1
+.Os
+.Sh NAME
+.Nm Rs-three_authors
+.Nd listing three authors in a reference block
+.Sh AUTHORS
+.Rs
+.%A kristaps
+.%A joerg
+.%A ingo
+.%T mandoc
+.Re
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii
new file mode 100644
index 00000000000..f451ac94136
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii
@@ -0,0 +1,8 @@
+RS-THREE_AUTHORS(1)        OpenBSD Reference Manual        RS-THREE_AUTHORS(1)
+
+NNAAMMEE
+     RRss--tthhrreeee__aauutthhoorrss - listing three authors in a reference block
+
+AAUUTTHHOORRSS
+     kristaps, joerg, and ingo, _m_a_n_d_o_c.
+
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/Makefile b/regress/usr.bin/mandoc/mdoc/Sm/Makefile
index b90637afe45..960aa59b541 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sm/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2010/01/02 02:35:53 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2011/02/06 00:18:58 schwarze Exp $
 
-REGRESS_TARGETS=scope
-GROFF_TARGETS=scope
+REGRESS_TARGETS=scope spacing-No spacing-Op
+GROFF_TARGETS=scope spacing-No spacing-Op
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.in b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.in
new file mode 100644
index 00000000000..bdff9c8a902
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.in
@@ -0,0 +1,60 @@
+.Dd July 4, 2010
+.Dt SM-SPACING 1
+.Os
+.Sh NAME
+.Nm Sm-spacing
+.Nd basic tests of spacing mode
+.Sh SYNOPSIS
+.Nm mandoc
+.Sm off
+.Fl T Ar mode
+.Sm on
+.Ar
+.Sh DESCRIPTION
+text1
+.Sm off
+text2 text3
+.Sm on
+text4
+.Pp
+text1
+.Sm off
+text2 text3
+.Sm on
+.No macro4
+.Pp
+text1
+.Sm off
+.No macro2 macro3
+.Sm on
+text4
+.Pp
+text1
+.Sm off
+.No macro2 No macro3
+.Sm on
+.No macro4
+.Pp
+.No macro1
+.Sm off
+text2 text3
+.Sm on
+text4
+.Pp
+.No macro1
+.Sm off
+text2 text3
+.Sm on
+.No macro4
+.Pp
+.No macro1
+.Sm off
+.No macro2 No macro3
+.Sm on
+text4
+.Pp
+.No macro1
+.Sm off
+.No macro2 No macro3
+.Sm on
+.No macro4
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii
new file mode 100644
index 00000000000..b836198208a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii
@@ -0,0 +1,25 @@
+SM-SPACING(1)              OpenBSD Reference Manual              SM-SPACING(1)
+
+NNAAMMEE
+     SSmm--ssppaacciinngg - basic tests of spacing mode
+
+SSYYNNOOPPSSIISS
+     mmaannddoocc --TT_m_o_d_e _f_i_l_e _._._.
+
+DDEESSCCRRIIPPTTIIOONN
+     text1 text2 text3 text4
+
+     text1 text2 text3 macro4
+
+     text1 macro2macro3 text4
+
+     text1 macro2macro3 macro4
+
+     macro1 text2 text3 text4
+
+     macro1 text2 text3 macro4
+
+     macro1 macro2macro3 text4
+
+     macro1 macro2macro3 macro4
+
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.in b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.in
new file mode 100644
index 00000000000..9c856cd888a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.in
@@ -0,0 +1,63 @@
+.Dd July 4, 2010
+.Dt SM-SPACING-OP 1
+.Os
+.Sh NAME
+.Nm Sm-spacing-Op
+.Nd spacing mode, demonstrated using the .Op macro
+.Sh SYNOPSIS
+.Nm mandoc
+.Sm off
+.Fl T Ar mode
+.Sm on
+.Ar
+.Sh DESCRIPTION
+text1
+.Sm off
+text2 text3
+.Sm on
+text4
+.Pp
+text1
+.Sm off
+text2 text3
+.Sm on
+.Op macro4
+.Pp
+text1
+.Sm off
+.Op macro2 macro3
+.Sm on
+text4
+.Pp
+text1
+.Sm off
+.Op macro2 Op macro3
+.Sm on
+.Op macro4
+.Pp
+.Op macro1
+.Sm off
+text2 text3
+.Sm on
+text4
+.Pp
+.Op macro1
+.Sm off
+text2 text3
+.Sm on
+.Op macro4
+.Pp
+.Op macro1
+.Sm off
+.Op macro2 Op macro3
+.Sm on
+text4
+.Pp
+.Op macro1
+.Sm off
+.Op macro2 Op macro3
+.Sm on
+.Op macro4
+.Pp
+.Sm on
+.Op macro1
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii
new file mode 100644
index 00000000000..b01822e34fe
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii
@@ -0,0 +1,27 @@
+SM-SPACING-OP(1)           OpenBSD Reference Manual           SM-SPACING-OP(1)
+
+NNAAMMEE
+     SSmm--ssppaacciinngg--OOpp - spacing mode, demonstrated using the .Op macro
+
+SSYYNNOOPPSSIISS
+     mmaannddoocc --TT_m_o_d_e _f_i_l_e _._._.
+
+DDEESSCCRRIIPPTTIIOONN
+     text1 text2 text3 text4
+
+     text1 text2 text3 [macro4]
+
+     text1 [macro2macro3] text4
+
+     text1 [macro2[macro3]] [macro4]
+
+     [macro1] text2 text3 text4
+
+     [macro1] text2 text3 [macro4]
+
+     [macro1] [macro2[macro3]] text4
+
+     [macro1] [macro2[macro3]] [macro4]
+
+     [macro1]
+
diff --git a/regress/usr.bin/mandoc/mdoc/blank/line.in b/regress/usr.bin/mandoc/mdoc/blank/line.in
index ff37d305fbd..a2d4ea46046 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/line.in
+++ b/regress/usr.bin/mandoc/mdoc/blank/line.in
@@ -5,9 +5,60 @@
 .Nm blank-line
 .Nd handling of blank line
 .Sh DESCRIPTION
-Let us ignore this
+Single br:
+.br
+Single Pp:
+.Pp
+Single sp:
+.sp
+Single blank:
 
-blank line, an these two
+Double br:
+.br
+.br
+br Pp:
+.br
+.Pp
+Pp br:
+.Pp
+.br
+Double Pp:
+.Pp
+.Pp
+br sp:
+.br
+.sp
+sp br:
+.sp
+.br
+Pp sp:
+.Pp
+.sp
+sp Pp:
+.sp
+.Pp
+Double sp:
+.sp
+.sp
+br blank:
+.br
 
+blank br:
 
-as well.
+.br
+Pp blank:
+.Pp
+
+blank Pp:
+
+.Pp
+sp blank:
+.sp
+
+blank sp:
+
+.sp
+Double blank:
+
+
+End.
diff --git a/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii b/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
index 3d3037efe4e..5531927d0e4 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
@@ -4,10 +4,49 @@ NNAAMMEE
      bbllaannkk--lliinnee - handling of blank line
 
 DDEESSCCRRIIPPTTIIOONN
-     Let us ignore this
+     Single br:
+     Single Pp:
 
-     blank line, an these two
+     Single sp:
 
+     Single blank:
 
-     as well.
+     Double br:
+     br Pp:
+
+     Pp br:
+
+     Double Pp:
+
+     br sp:
+
+     sp br:
+
+     Pp sp:
+
+     sp Pp:
+
+
+     Double sp:
+
+
+     br blank:
+
+     blank br:
+
+     Pp blank:
+
+     blank Pp:
+
+
+     sp blank:
+
+
+     blank sp:
+
+
+     Double blank:
+
+
+     End.
 
diff --git a/regress/usr.bin/mandoc/roff/ds/Makefile b/regress/usr.bin/mandoc/roff/ds/Makefile
new file mode 100644
index 00000000000..48a1c16c685
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/ds/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1 2011/02/06 00:18:58 schwarze Exp $
+
+GROFF_TARGETS=quoting
+REGRESS_TARGETS=quoting
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/ds/quoting.in b/regress/usr.bin/mandoc/roff/ds/quoting.in
new file mode 100644
index 00000000000..52cd7fb551d
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/ds/quoting.in
@@ -0,0 +1,32 @@
+.Dd August 3, 2010
+.Dt DS-QUOTING 1
+.Os
+.Sh NAME
+.Nm ds-quoting
+.Nd quote handling by the define string request
+.Sh DESCRIPTION
+.ds foo initial definition
+no quoting: \*[foo]
+.br
+.ds foo redefinition
+still no quoting: \*[foo]
+.br
+.ds foo "string value
+leading quotes: \*[foo]
+.br
+.ds foo "string value"
+leading and trailing quotes: \*[foo]
+.br
+.ds foo "string" value
+leading and middle quotes: \*[foo]
+.br
+.ds foo 'string value"
+leading apostrophe, trailing quotes: \*[foo]
+.br
+.ds foo  string value"
+leading blank, trailing quotes: \*[foo]
+.br
+.ds foo
+empty string: x\*[foo]x
+.br
+end of test document
diff --git a/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii b/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii
new file mode 100644
index 00000000000..f29a33618d0
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/ds/quoting.out_ascii
@@ -0,0 +1,16 @@
+DS-QUOTING(1)              OpenBSD Reference Manual              DS-QUOTING(1)
+
+NNAAMMEE
+     ddss--qquuoottiinngg - quote handling by the define string request
+
+DDEESSCCRRIIPPTTIIOONN
+     no quoting: initial definition
+     still no quoting: redefinition
+     leading quotes: string value
+     leading and trailing quotes: string value"
+     leading and middle quotes: string" value
+     leading apostrophe, trailing quotes: 'string value"
+     leading blank, trailing quotes: string value"
+     empty string: xx
+     end of test document
+