7 files changed, 97 insertions, 12 deletions

diff --git a/regress/mdoc/Bd/Makefile b/regress/mdoc/Bd/Makefile
index 817d9fe7..0d0b2fb9 100644
--- a/regress/mdoc/Bd/Makefile
+++ b/regress/mdoc/Bd/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.18 2014/12/24 23:31:59 schwarze Exp $
+# $OpenBSD: Makefile,v 1.21 2019/01/04 03:54:50 schwarze Exp $
 
-REGRESS_TARGETS	 = beforeNAME blank centered nested spacing
+REGRESS_TARGETS	 = beforeNAME blank centered nested nf spacing
 REGRESS_TARGETS	+= badargs empty offset-empty offset-neg
 REGRESS_TARGETS	+= break broken unclosed
 
diff --git a/regress/mdoc/Bd/centered.in b/regress/mdoc/Bd/centered.in
index 6d8305c2..5db503da 100644
--- a/regress/mdoc/Bd/centered.in
+++ b/regress/mdoc/Bd/centered.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: centered.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.\" $OpenBSD: centered.in,v 1.3 2019/01/04 03:54:50 schwarze Exp $
 .Dd $Mdocdate$
 .Dt BD-CENTERED 1
 .Os
@@ -9,8 +9,6 @@
 preceding text
 .br
 .Bd -centered -offset indent
-first line of the block
-.br
-second line
+The text in this centered block is wide enough to not fit on one line.
 .Ed
 following text
diff --git a/regress/mdoc/Bd/centered.out_ascii b/regress/mdoc/Bd/centered.out_ascii
index 9a183b3a..79bdc045 100644
--- a/regress/mdoc/Bd/centered.out_ascii
+++ b/regress/mdoc/Bd/centered.out_ascii
@@ -6,8 +6,8 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
      preceding text
 
-                                 first line of the block
-                                       second line
+            The text in this centered block is wide enough to not fit on one
+                                          line.
      following text
 
-OpenBSD                          July 4, 2017                          OpenBSD
+OpenBSD                         January 4, 2019                        OpenBSD
diff --git a/regress/mdoc/Bd/centered.out_markdown b/regress/mdoc/Bd/centered.out_markdown
index 5eb0b5cc..1cab58c3 100644
--- a/regress/mdoc/Bd/centered.out_markdown
+++ b/regress/mdoc/Bd/centered.out_markdown
@@ -8,9 +8,8 @@ BD-CENTERED(1) - General Commands Manual
 
 preceding text
 
-> first line of the block  
-> second line
+> The text in this centered block is wide enough to not fit on one line.
 
 following text
 
-OpenBSD - July 4, 2017
+OpenBSD - January 4, 2019
diff --git a/regress/mdoc/Bd/nf.in b/regress/mdoc/Bd/nf.in
new file mode 100644
index 00000000..94dc2438
--- /dev/null
+++ b/regress/mdoc/Bd/nf.in
@@ -0,0 +1,34 @@
+.\" $OpenBSD: nf.in,v 1.1 2019/01/04 03:54:50 schwarze Exp $
+.Dd $Mdocdate$
+.Dt BD-NF 1
+.Os
+.Sh NAME
+.Nm Bd-nf
+.Nd interaction of no-fill blocks and requests
+.Sh DESCRIPTION
+initial
+text
+.nf
+after .nf
+request
+.fi
+after .fi
+request
+.Bd -unfilled
+in unfilled
+block
+.fi
+after .fi request
+in unfilled block
+.Ed
+after end
+of unfilled block
+.Bd -filled
+in filled
+block
+.nf
+after .nf request
+in filled block
+.Ed
+after end
+of filled block
diff --git a/regress/mdoc/Bd/nf.out_ascii b/regress/mdoc/Bd/nf.out_ascii
new file mode 100644
index 00000000..4a42fe82
--- /dev/null
+++ b/regress/mdoc/Bd/nf.out_ascii
@@ -0,0 +1,22 @@
+BD-NF(1)                    General Commands Manual                   BD-NF(1)
+
+NNAAMMEE
+     BBdd--nnff - interaction of no-fill blocks and requests
+
+DDEESSCCRRIIPPTTIIOONN
+     initial text
+     after .nf
+     request
+     after .fi request
+
+     in unfilled
+     block
+     after .fi request in unfilled block
+     after end of unfilled block
+
+     in filled block
+     after .nf request
+     in filled block
+     after end of filled block
+
+OpenBSD                         January 4, 2019                        OpenBSD
diff --git a/regress/mdoc/Bd/nf.out_markdown b/regress/mdoc/Bd/nf.out_markdown
new file mode 100644
index 00000000..382bb786
--- /dev/null
+++ b/regress/mdoc/Bd/nf.out_markdown
@@ -0,0 +1,32 @@
+BD-NF(1) - General Commands Manual
+
+# NAME
+
+**Bd-nf** - interaction of no-fill blocks and requests
+
+# DESCRIPTION
+
+initial
+text
+after .nf
+request
+after .fi
+request
+
+	in unfilled
+	block
+	after .fi request
+	in unfilled block
+
+after end
+of unfilled block
+
+> in filled
+> block
+> after .nf request
+> in filled block
+
+after end
+of filled block
+
+OpenBSD - January 4, 2019