summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2019-01-07 06:51:38 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2019-01-07 06:51:38 +0000
commitb32180427081e7e9360f94530322401025af29d0 (patch)
treeed1f8538c2d58171b370d1982f0056f90b65688c /regress/usr.bin
parentce2f1a9cf17d0cc86875750878ae691ecbc03da7 (diff)
Represent mdoc(7) .Pp (and .sp, and some SYNOPSIS and .Rs features)
by the <p> HTML element and use the html_fillmode() mechanism for .Bd -unfilled, just like it was done for man(7) earlier, finally getting rid both of the horrible <div class="Pp"></div> hack and of the worst HTML syntax violations caused by nested displays. Care is needed because in some situations, paragraphs have to remain open across several subsequent macros, whereas in other situations, they must get closed together with a block containing them. Some implementation details include: * Always close paragraphs before emitting HTML flow content. * Let html_close_paragraph() also close <pre> for extra safety. * Drop the old, now unused function print_paragraph(). * Minor adjustments in the top-level man(7) node formatter for symmetry. * Bugfix: .Ss heads suspend no-fill mode, even though .Ss doesn't end it. * Bugfix: give up on .Op semantic markup for now, see the comment.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/mandoc/char/unicode/invalid.out_html14
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/Makefile5
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/nf.in9
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/nf.out_ascii6
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/nf.out_html22
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/nf.out_markdown7
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/paragraph.in39
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_ascii27
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html19
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_markdown39
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/Makefile7
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/paragraph.in22
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_ascii14
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html6
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/Makefile3
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.in13
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii8
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.out_html8
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.out_markdown11
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/Makefile5
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/paragraph.in37
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_ascii23
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html17
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_markdown32
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/Makefile5
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/paragraph.in19
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_ascii20
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html7
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_markdown24
-rw-r--r--regress/usr.bin/mandoc/roff/string/dotT.in12
-rw-r--r--regress/usr.bin/mandoc/roff/string/dotT.out_ascii8
-rw-r--r--regress/usr.bin/mandoc/roff/string/dotT.out_html8
-rw-r--r--regress/usr.bin/mandoc/roff/string/dotT.out_markdown10
-rw-r--r--regress/usr.bin/mandoc/roff/string/dotT.out_utf88
35 files changed, 453 insertions, 63 deletions
diff --git a/regress/usr.bin/mandoc/char/unicode/invalid.out_html b/regress/usr.bin/mandoc/char/unicode/invalid.out_html
index c4761ea608c..0de972f1836 100644
--- a/regress/usr.bin/mandoc/char/unicode/invalid.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/invalid.out_html
@@ -1,8 +1,8 @@
-BEGINTEST
-too short: &gt;.&lt;
-just right: &gt;+&lt;
-too long: &gt;..&lt;
-too large: &gt;..&lt;
-trailing garbage: &gt;&lt;
-not unicode: &gt;_.&#x2191;.&#x21D1;&lt;
+BEGINTEST
+too short: &gt;.&lt;
+just right: &gt;+&lt;
+too long: &gt;..&lt;
+too large: &gt;..&lt;
+trailing garbage: &gt;&lt;
+not unicode: &gt;_.&#x2191;.&#x21D1;&lt;
ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/Makefile b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
index 0d0b2fb99ce..f05f54b02fa 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2019/01/04 03:54:50 schwarze Exp $
+# $OpenBSD: Makefile,v 1.22 2019/01/07 06:51:37 schwarze Exp $
-REGRESS_TARGETS = beforeNAME blank centered nested nf spacing
+REGRESS_TARGETS = beforeNAME blank centered nested nf paragraph spacing
REGRESS_TARGETS += badargs empty offset-empty offset-neg
REGRESS_TARGETS += break broken unclosed
LINT_TARGETS = beforeNAME blank nested badargs break broken unclosed
+HTML_TARGETS = nf paragraph
SKIP_TMAN = beforeNAME centered
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nf.in b/regress/usr.bin/mandoc/mdoc/Bd/nf.in
index 884825e2500..2a2c44d83a8 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/nf.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nf.in
@@ -1,11 +1,12 @@
-.\" $OpenBSD: nf.in,v 1.1 2019/01/04 03:54:50 schwarze Exp $
-.Dd $Mdocdate: January 4 2019 $
+.\" $OpenBSD: nf.in,v 1.2 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
.Dt BD-NF 1
.Os
.Sh NAME
.Nm Bd-nf
.Nd interaction of no-fill blocks and requests
.Sh DESCRIPTION
+BEGINTEST
initial
text
.nf
@@ -32,3 +33,7 @@ in filled block
.Ed
after end
of filled block
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_ascii
index 4a42fe826cd..d8ceb0c9f63 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
BBdd--nnff - interaction of no-fill blocks and requests
DDEESSCCRRIIPPTTIIOONN
- initial text
+ BEGINTEST initial text
after .nf
request
after .fi request
@@ -18,5 +18,7 @@ DDEESSCCRRIIPPTTIIOONN
after .nf request
in filled block
after end of filled block
+ ENDTEST
+ end of file
-OpenBSD January 4, 2019 OpenBSD
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html
new file mode 100644
index 00000000000..31642e07054
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html
@@ -0,0 +1,22 @@
+BEGINTEST initial text
+<pre>
+after .nf
+request
+</pre>
+after .fi request
+<div class="Bd Pp">
+<pre>
+in unfilled
+block
+</pre>
+after .fi request in unfilled block</div>
+after end of unfilled block
+<div class="Bd Pp">in filled block
+<pre>
+after .nf request
+in filled block
+</pre>
+</div>
+after end of filled block
+<br/>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_markdown b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_markdown
index 382bb786261..46ece0a2944 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_markdown
@@ -6,6 +6,7 @@ BD-NF(1) - General Commands Manual
# DESCRIPTION
+BEGINTEST
initial
text
after .nf
@@ -27,6 +28,8 @@ of unfilled block
> in filled block
after end
-of filled block
+of filled block
+ENDTEST
+end of file
-OpenBSD - January 4, 2019
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.in b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.in
new file mode 100644
index 00000000000..e1ebfd01a04
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.in
@@ -0,0 +1,39 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
+.Dt BD-PARAGRAPH 1
+.Os
+.Sh NAME
+.Nm Bd-paragraph
+.Nd interaction of paragraphs and displays
+.Sh DESCRIPTION
+BEGINTEST
+initial
+text
+.Pp
+normal
+paragraph
+.Bd -filled
+filled
+display
+.Pp
+paragraph
+in display
+.Ed
+back
+to normal
+.Pp
+another
+paragraph
+.Bd -unfilled
+unfilled
+display
+.Pp
+unfilled
+paragraph
+.Ed
+again back
+to normal
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_ascii
new file mode 100644
index 00000000000..216f4530b35
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_ascii
@@ -0,0 +1,27 @@
+BD-PARAGRAPH(1) General Commands Manual BD-PARAGRAPH(1)
+
+NNAAMMEE
+ BBdd--ppaarraaggrraapphh - interaction of paragraphs and displays
+
+DDEESSCCRRIIPPTTIIOONN
+ BEGINTEST initial text
+
+ normal paragraph
+
+ filled display
+
+ paragraph in display
+ back to normal
+
+ another paragraph
+
+ unfilled
+ display
+
+ unfilled
+ paragraph
+ again back to normal
+ ENDTEST
+ end of file
+
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html
new file mode 100644
index 00000000000..c2c6993ed62
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html
@@ -0,0 +1,19 @@
+BEGINTEST initial text
+<p class="Pp">normal paragraph</p>
+<div class="Bd Pp">filled display
+<p class="Pp">paragraph in display</p>
+</div>
+back to normal
+<p class="Pp">another paragraph</p>
+<div class="Bd Pp">
+<pre>
+unfilled
+display
+
+unfilled
+paragraph
+</pre>
+</div>
+again back to normal
+<br/>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_markdown b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_markdown
new file mode 100644
index 00000000000..13e43f1137e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_markdown
@@ -0,0 +1,39 @@
+BD-PARAGRAPH(1) - General Commands Manual
+
+# NAME
+
+**Bd-paragraph** - interaction of paragraphs and displays
+
+# DESCRIPTION
+
+BEGINTEST
+initial
+text
+
+normal
+paragraph
+
+> filled
+> display
+
+> paragraph
+> in display
+
+back
+to normal
+
+another
+paragraph
+
+ unfilled
+ display
+
+ unfilled
+ paragraph
+
+again back
+to normal
+ENDTEST
+end of file
+
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/Makefile b/regress/usr.bin/mandoc/mdoc/Bf/Makefile
index cc025ffcc2c..da5b2d915d9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bf/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2017/03/08 22:53:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2019/01/07 06:51:37 schwarze Exp $
-REGRESS_TARGETS = nest multiargs badargs break broken
-LINT_TARGETS = multiargs badargs break broken
+REGRESS_TARGETS = badargs break broken multiargs nest paragraph
+LINT_TARGETS = badargs break broken multiargs
+HTML_TARGETS = paragraph
# mandoc -T markdown ignores .Bf, at least for now
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/paragraph.in b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.in
new file mode 100644
index 00000000000..3dcdabb8733
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.in
@@ -0,0 +1,22 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
+.Dt BF-PARAGRAPH 1
+.Os
+.Sh NAME
+.Nm Bf-paragraph
+.Nd interaction of paragraphs and font blocks
+.Sh DESCRIPTION
+BEGINTEST
+.Pp
+normal
+text
+.Bf -literal
+literal
+text
+.Pp
+literal
+paragraph
+.Ef
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_ascii
new file mode 100644
index 00000000000..25b2fd89cfa
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_ascii
@@ -0,0 +1,14 @@
+BF-PARAGRAPH(1) General Commands Manual BF-PARAGRAPH(1)
+
+NNAAMMEE
+ BBff--ppaarraaggrraapphh - interaction of paragraphs and font blocks
+
+DDEESSCCRRIIPPTTIIOONN
+ BEGINTEST
+
+ normal text literal text
+
+ literal paragraph ENDTEST
+ end of file
+
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html
new file mode 100644
index 00000000000..e86b979a463
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html
@@ -0,0 +1,6 @@
+BEGINTEST
+<p class="Pp">normal text</p>
+<div class="Bf Li">literal text
+<p class="Pp">literal paragraph</p>
+</div>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/D1/Makefile b/regress/usr.bin/mandoc/mdoc/D1/Makefile
index 9ee827f6a59..b94d572709d 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/D1/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2017/03/08 22:53:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2019/01/07 06:51:37 schwarze Exp $
REGRESS_TARGETS = spacing
LINT_TARGETS = spacing
+HTML_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
index e77332980d9..c0f293c4de4 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.in
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.in
@@ -1,13 +1,20 @@
-.\" $OpenBSD: spacing.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
-.Dd $Mdocdate: July 4 2017 $
+.\" $OpenBSD: spacing.in,v 1.4 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
.Dt D1-SPACING 1
.Os
.Sh NAME
.Nm D1-spacing
.Nd spacing in and around one-line displays
.Sh DESCRIPTION
-preceding text
+BEGINTEST
+.Pp
+preceding
+paragraph
.D1 spacing in and around one-line displays
empty display:
.D1
following text
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
index 40945936b20..c0d1556dbeb 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
@@ -4,9 +4,13 @@ NNAAMMEE
DD11--ssppaacciinngg - spacing in and around one-line displays
DDEESSCCRRIIPPTTIIOONN
- preceding text
+ BEGINTEST
+
+ preceding paragraph
spacing in and around one-line displays
empty display:
following text
+ ENDTEST
+ end of file
-OpenBSD July 4, 2017 OpenBSD
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html
new file mode 100644
index 00000000000..b1a1d4dabb6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html
@@ -0,0 +1,8 @@
+BEGINTEST
+<p class="Pp">preceding paragraph</p>
+<div class="Bd Bd-indent">spacing in and around one-line displays</div>
+empty display:
+<div class="Bd Bd-indent"></div>
+following text
+<br/>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_lint b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_lint
index 5ac4d0c0e76..0a2790bb158 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_lint
@@ -1 +1 @@
-mandoc: spacing.in:12:2: WARNING: empty block: D1
+mandoc: spacing.in:15:2: WARNING: empty block: D1
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_markdown b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_markdown
index eac16dfe35f..d1f12f63fc8 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_markdown
@@ -6,12 +6,17 @@ D1-SPACING(1) - General Commands Manual
# DESCRIPTION
-preceding text
+BEGINTEST
+
+preceding
+paragraph
> spacing in and around one-line displays
empty display:
-following text
+following text
+ENDTEST
+end of file
-OpenBSD - July 4, 2017
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/Makefile b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
index 9f8bae1ed6b..2881b87426e 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Rs/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/03/08 22:53:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.11 2019/01/07 06:51:37 schwarze Exp $
-REGRESS_TARGETS = allch args break empty three_authors
+REGRESS_TARGETS = allch args break empty paragraph three_authors
UTF8_TARGETS = allch break empty three_authors
LINT_TARGETS = allch args empty
+HTML_TARGETS = paragraph
# groff-1.22.3 defect:
# - arguments after .Rs cause the macro to be ignored
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.in b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.in
new file mode 100644
index 00000000000..a64e1b82d6e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.in
@@ -0,0 +1,37 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
+.Dt RS-PARAGRAPH 1
+.Os
+.Sh NAME
+.Nm Rs-paragraph
+.Nd interaction of paragraphs and reference blocks
+.Sh DESCRIPTION
+BEGINTEST
+.br
+initial reference:
+.Rs
+.%A author name
+.%B book title
+.Re
+.Pp
+in a paragraph:
+.Rs
+.%A another author
+.%B another book
+.Re
+.Sh SEE ALSO
+initial reference:
+.Rs
+.%A author name
+.%B book title
+.Re
+.Pp
+in a paragraph:
+.Rs
+.%A another author
+.%B another book
+.Re
+.nf
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_ascii
new file mode 100644
index 00000000000..821e721d7d1
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_ascii
@@ -0,0 +1,23 @@
+RS-PARAGRAPH(1) General Commands Manual RS-PARAGRAPH(1)
+
+NNAAMMEE
+ RRss--ppaarraaggrraapphh - interaction of paragraphs and reference blocks
+
+DDEESSCCRRIIPPTTIIOONN
+ BEGINTEST
+ initial reference: author name, _b_o_o_k _t_i_t_l_e.
+
+ in a paragraph: another author, _a_n_o_t_h_e_r _b_o_o_k.
+
+SSEEEE AALLSSOO
+ initial reference:
+
+ author name, _b_o_o_k _t_i_t_l_e.
+
+ in a paragraph:
+
+ another author, _a_n_o_t_h_e_r _b_o_o_k.
+ ENDTEST
+ end of file
+
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html
new file mode 100644
index 00000000000..19e9362caca
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html
@@ -0,0 +1,17 @@
+BEGINTEST
+<br/>
+initial reference: <cite class="Rs" title="Rs"><span class="RsA">author
+ name</span>, <i class="RsB">book title</i>.</cite>
+<p class="Pp">in a paragraph:
+ <cite class="Rs" title="Rs"><span class="RsA">another author</span>,
+ <i class="RsB">another book</i>.</cite></p>
+<h1 class="Sh" title="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
+ ALSO</a></h1>
+initial reference:
+<p class="Pp"><cite class="Rs" title="Rs"><span class="RsA">author name</span>,
+ <i class="RsB">book title</i>.</cite></p>
+<p class="Pp">in a paragraph:</p>
+<p class="Pp"><cite class="Rs" title="Rs"><span class="RsA">another
+ author</span>, <i class="RsB">another book</i>.</cite></p>
+<pre>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_markdown b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_markdown
new file mode 100644
index 00000000000..c8bb4429ff7
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_markdown
@@ -0,0 +1,32 @@
+RS-PARAGRAPH(1) - General Commands Manual
+
+# NAME
+
+**Rs-paragraph** - interaction of paragraphs and reference blocks
+
+# DESCRIPTION
+
+BEGINTEST
+initial reference:
+author name,
+*book title*.
+
+in a paragraph:
+another author,
+*another book*.
+
+# SEE ALSO
+
+initial reference:
+
+author name,
+*book title*.
+
+in a paragraph:
+
+another author,
+*another book*.
+ENDTEST
+end of file
+
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/Makefile b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
index c6849d8b69b..1c20f13fb44 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/04/28 16:23:30 schwarze Exp $
+# $OpenBSD: Makefile,v 1.11 2019/01/07 06:51:37 schwarze Exp $
REGRESS_TARGETS = badNAME before empty emptyNAME first nohead order
-REGRESS_TARGETS += orderNAME parbefore parborder punctNAME subbefore
+REGRESS_TARGETS += orderNAME paragraph parbefore parborder punctNAME subbefore
LINT_TARGETS = badNAME before empty emptyNAME first nohead order
LINT_TARGETS += orderNAME parbefore parborder punctNAME subbefore
+HTML_TARGETS = paragraph
# groff-1.22.3 defects:
# - .Pp before .Sh NAME causes a blank line before the header line
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.in b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.in
new file mode 100644
index 00000000000..8adea45cbe0
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.in
@@ -0,0 +1,19 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
+.Dt SH-PARAGRAPH 1
+.Os
+.Sh NAME
+.Nm Sh-paragraph
+.Nd interaction of paragraph and section macros
+.Sh DESCRIPTION
+BEGINTEST
+.Pp
+descriptive text
+.Ss Subsection
+initial subsection text
+.Pp
+subsection paragraph
+.Sh EXAMPLES
+ENDTEST
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_ascii
new file mode 100644
index 00000000000..0ef1787fea1
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_ascii
@@ -0,0 +1,20 @@
+SH-PARAGRAPH(1) General Commands Manual SH-PARAGRAPH(1)
+
+NNAAMMEE
+ SShh--ppaarraaggrraapphh - interaction of paragraph and section macros
+
+DDEESSCCRRIIPPTTIIOONN
+ BEGINTEST
+
+ descriptive text
+
+ SSuubbsseeccttiioonn
+ initial subsection text
+
+ subsection paragraph
+
+EEXXAAMMPPLLEESS
+ ENDTEST
+ end of file
+
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html
new file mode 100644
index 00000000000..3eeb9fe8d2a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html
@@ -0,0 +1,7 @@
+BEGINTEST
+<p class="Pp">descriptive text</p>
+<h2 class="Ss" title="Ss" id="Subsection"><a class="permalink" href="#Subsection">Subsection</a></h2>
+initial subsection text
+<p class="Pp">subsection paragraph</p>
+<h1 class="Sh" title="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
+ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_markdown b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_markdown
new file mode 100644
index 00000000000..4f0affe4a2d
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_markdown
@@ -0,0 +1,24 @@
+SH-PARAGRAPH(1) - General Commands Manual
+
+# NAME
+
+**Sh-paragraph** - interaction of paragraph and section macros
+
+# DESCRIPTION
+
+BEGINTEST
+
+descriptive text
+
+## Subsection
+
+initial subsection text
+
+subsection paragraph
+
+# EXAMPLES
+
+ENDTEST
+end of file
+
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.in b/regress/usr.bin/mandoc/roff/string/dotT.in
index 06c544de29c..62b4a959303 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.in
+++ b/regress/usr.bin/mandoc/roff/string/dotT.in
@@ -1,20 +1,18 @@
-.\" $OpenBSD: dotT.in,v 1.1 2018/08/16 13:49:40 schwarze Exp $
-.Dd $Mdocdate: August 16 2018 $
+.\" $OpenBSD: dotT.in,v 1.2 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate: January 7 2019 $
.Dt STRING-DOTT 1
.Os
.Sh NAME
.Nm string-dotT
.Nd interpolating the device name
.Sh DESCRIPTION
-initial text
-.Pp
BEGINTEST
.Pp
We are using the \*(.T device.
.Pp
.ds .T name
The device \*(.T can be overridden.
-.Pp
+.nf
ENDTEST
-.Pp
-final text
+.br
+end of file
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.out_ascii b/regress/usr.bin/mandoc/roff/string/dotT.out_ascii
index e1737090f96..26f53380058 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.out_ascii
+++ b/regress/usr.bin/mandoc/roff/string/dotT.out_ascii
@@ -4,16 +4,12 @@ NNAAMMEE
ssttrriinngg--ddoottTT - interpolating the device name
DDEESSCCRRIIPPTTIIOONN
- initial text
-
BEGINTEST
We are using the ascii device.
The device name can be overridden.
-
ENDTEST
+ end of file
- final text
-
-OpenBSD August 16, 2018 OpenBSD
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.out_html b/regress/usr.bin/mandoc/roff/string/dotT.out_html
index 67cb1eede64..8143fd889c4 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.out_html
+++ b/regress/usr.bin/mandoc/roff/string/dotT.out_html
@@ -1,7 +1,5 @@
BEGINTEST
-<div class="Pp"></div>
-We are using the html device.
-<div class="Pp"></div>
-The device name can be overridden.
-<div class="Pp"></div>
+<p class="Pp">We are using the html device.</p>
+<p class="Pp">The device name can be overridden.</p>
+<pre>
ENDTEST
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.out_markdown b/regress/usr.bin/mandoc/roff/string/dotT.out_markdown
index 5a1f8d0983e..d7400eaaaaa 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.out_markdown
+++ b/regress/usr.bin/mandoc/roff/string/dotT.out_markdown
@@ -6,16 +6,12 @@ STRING-DOTT(1) - General Commands Manual
# DESCRIPTION
-initial text
-
BEGINTEST
We are using the markdown device.
The device name can be overridden.
+ENDTEST
+end of file
-ENDTEST
-
-final text
-
-OpenBSD - August 16, 2018
+OpenBSD - January 7, 2019
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.out_utf8 b/regress/usr.bin/mandoc/roff/string/dotT.out_utf8
index 827b3994b8c..63bbf5fdf95 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.out_utf8
+++ b/regress/usr.bin/mandoc/roff/string/dotT.out_utf8
@@ -4,16 +4,12 @@ NNAAMMEE
ssttrriinngg--ddoottTT – interpolating the device name
DDEESSCCRRIIPPTTIIOONN
- initial text
-
BEGINTEST
We are using the utf8 device.
The device name can be overridden.
-
ENDTEST
+ end of file
- final text
-
-OpenBSD August 16, 2018 OpenBSD
+OpenBSD January 7, 2019 OpenBSD