From 9b3bcfda2071ff49dd238b2315b1cc49c09a1552 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sun, 6 Jan 2019 04:55:09 +0000
Subject: 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.
---
 regress/man/TP/Makefile          |  4 ++--
 regress/man/TP/literal.in        | 18 ++++++++++++------
 regress/man/TP/literal.out_ascii | 13 ++++++++-----
 regress/man/TP/literal.out_html  | 27 +++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 regress/man/TP/literal.out_html

(limited to 'regress/man/TP')

diff --git a/regress/man/TP/Makefile b/regress/man/TP/Makefile
index b1763652..2fc1074f 100644
--- a/regress/man/TP/Makefile
+++ b/regress/man/TP/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2015/09/21 13:24:32 schwarze Exp $
+# $OpenBSD: Makefile,v 1.15 2019/01/06 04:41:15 schwarze Exp $
 
 REGRESS_TARGETS	 = badarg broken double eof fill indent literal longhead
 REGRESS_TARGETS	+= macrotag manyargs sameline spacing width
-
 LINT_TARGETS	 = broken double eof
+HTML_TARGETS	 = literal
 
 # groff-1.22.3 defects:
 # - If .TP precedes .RE, the latter does not properly reset indentation.
diff --git a/regress/man/TP/literal.in b/regress/man/TP/literal.in
index 4fa30fd1..a2dc956f 100644
--- a/regress/man/TP/literal.in
+++ b/regress/man/TP/literal.in
@@ -1,27 +1,33 @@
-.\" $OpenBSD: literal.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
-.TH TP-LITERAL 1 "January 4, 2011"
+.\" $OpenBSD: literal.in,v 1.4 2019/01/06 04:41:15 schwarze Exp $
+.TH TP-LITERAL 1 "January 6, 2019"
 .SH NAME
 TP-literal \- indented paragraphs in literal context
 .SH DESCRIPTION
-regular
-text
+BEGINTEST
+before indentation
 .TP 10n
 tag
+regular
 indented
 text
 .PP
 regular
-text
+paragraph
 .nf
 literal
 text
 .TP 10n
 tag
 indented
+literal
 text
 .PP
 literal
-text
+paragraph
 .fi
 regular
 text
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/man/TP/literal.out_ascii b/regress/man/TP/literal.out_ascii
index b8dddb7b..6fcaeeb6 100644
--- a/regress/man/TP/literal.out_ascii
+++ b/regress/man/TP/literal.out_ascii
@@ -6,21 +6,24 @@ NNAAMMEE
        TP-literal - indented paragraphs in literal context
 
 DDEESSCCRRIIPPTTIIOONN
-       regular text
+       BEGINTEST before indentation
 
-       tag       indented text
+       tag       regular indented text
 
-       regular text
+       regular paragraph
        literal
        text
 
        tag       indented
+                 literal
                  text
 
        literal
-       text
+       paragraph
        regular text
+       ENDTEST
+       end of file
 
 
 
-OpenBSD                         January 4, 2011                  TP-LITERAL(1)
+OpenBSD                         January 6, 2019                  TP-LITERAL(1)
diff --git a/regress/man/TP/literal.out_html b/regress/man/TP/literal.out_html
new file mode 100644
index 00000000..14bfb834
--- /dev/null
+++ b/regress/man/TP/literal.out_html
@@ -0,0 +1,27 @@
+BEGINTEST before indentation
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>regular indented text</dd>
+</dl>
+<p class="Pp">regular paragraph</p>
+<pre>
+literal
+text
+</pre>
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>
+    <pre>
+indented
+literal
+text
+    </pre>
+  </dd>
+</dl>
+<pre>
+literal
+paragraph
+</pre>
+regular text
+<br/>
+ENDTEST
-- 
cgit v1.2.3-56-ge451