Finally, represent the man(7) .PP and .HP macros by the natural

choice, which is the <p> HTML element.  On top of the previous
fill-mode improvements, the key to making this possible is to
automatically close the <p> when required: before headers, subsequent
paragraphs, lists, indented blocks, synopsis blocks, tbl(7) blocks,
and before blocks using no-fill mode.

In man(7) documents, represent the .sp request by a blank line in
no-fill mode and in the same way as .PP in fill mode.

4 files changed, 79 insertions, 7 deletions

diff --git a/regress/man/IP/Makefile b/regress/man/IP/Makefile
index 9edc12e1..a677b970 100644
--- a/regress/man/IP/Makefile
+++ b/regress/man/IP/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.8 2014/07/02 05:51:49 schwarze Exp $
+# $OpenBSD: Makefile,v 1.9 2019/01/06 04:41:15 schwarze Exp $
 
 REGRESS_TARGETS = empty literal longhead manyargs spacing width
 LINT_TARGETS	= empty
+HTML_TARGETS	= literal
 
 .include <bsd.regress.mk>
diff --git a/regress/man/IP/literal.in b/regress/man/IP/literal.in
index edb8eb02..2fb459cb 100644
--- a/regress/man/IP/literal.in
+++ b/regress/man/IP/literal.in
@@ -1,10 +1,10 @@
-.\" $OpenBSD: literal.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $
-.TH IP-LITERAL 1 "January 4, 2011"
+.\" $OpenBSD: literal.in,v 1.7 2019/01/06 04:41:15 schwarze Exp $
+.TH IP-LITERAL 1 "January 6, 2019"
 .SH NAME
 IP-literal \- indented paragraphs in literal context
 .SH DESCRIPTION
-regular
-text
+BEGINTEST
+before indentation
 .IP tag 10n
 indented
 regular
@@ -63,3 +63,7 @@ paragraph
 .fi
 regular
 text
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/man/IP/literal.out_ascii b/regress/man/IP/literal.out_ascii
index db020a5e..e4984ede 100644
--- a/regress/man/IP/literal.out_ascii
+++ b/regress/man/IP/literal.out_ascii
@@ -6,7 +6,7 @@ NNAAMMEE
        IP-literal - indented paragraphs in literal context
 
 DDEESSCCRRIIPPTTIIOONN
-       regular text
+       BEGINTEST before indentation
 
        tag       indented regular text
 
@@ -47,7 +47,9 @@ DDEESSCCRRIIPPTTIIOONN
        literal
        paragraph
        regular text
+       ENDTEST
+       end of file
 
 
 
-OpenBSD                         January 4, 2011                  IP-LITERAL(1)
+OpenBSD                         January 6, 2019                  IP-LITERAL(1)
diff --git a/regress/man/IP/literal.out_html b/regress/man/IP/literal.out_html
new file mode 100644
index 00000000..ae90758b
--- /dev/null
+++ b/regress/man/IP/literal.out_html
@@ -0,0 +1,65 @@
+BEGINTEST before indentation
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>indented regular text</dd>
+</dl>
+<p class="Pp">new regular paragraph</p>
+<pre>
+literal
+text
+</pre>
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>
+    <pre>
+indented
+literal
+text
+    </pre>
+  </dd>
+</dl>
+<pre>
+new
+literal
+paragraph
+</pre>
+regular text
+<h2 class="Ss" title="Ss" id="literal_into_indented_paragraph"><a class="permalink" href="#literal_into_indented_paragraph">literal
+  into indented paragraph</a></h2>
+regular text
+<pre>
+literal
+text
+</pre>
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>
+    <pre>
+indented
+literal
+text
+    </pre>
+    indented regular text</dd>
+</dl>
+<p class="Pp">new regular paragraph</p>
+<h2 class="Ss" title="Ss" id="literal_out_of_indented_paragraph"><a class="permalink" href="#literal_out_of_indented_paragraph">literal
+  out of indented paragraph</a></h2>
+regular text
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>indented regular text
+    <pre>
+indented
+literal
+text
+    </pre>
+  </dd>
+</dl>
+<pre>
+new
+literal
+paragraph
+</pre>
+regular text
+<br/>
+ENDTEST