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/HP/Makefile          |  3 ++-
 regress/man/HP/literal.in        | 21 +++++++++++++--------
 regress/man/HP/literal.out_ascii | 15 +++++++++------
 regress/man/HP/literal.out_html  | 20 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 regress/man/HP/literal.out_html

(limited to 'regress/man/HP')

diff --git a/regress/man/HP/Makefile b/regress/man/HP/Makefile
index e0d2a3b4..1e33cfb4 100644
--- a/regress/man/HP/Makefile
+++ b/regress/man/HP/Makefile
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2014/04/08 04:45:50 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2019/01/06 04:41:15 schwarze Exp $
 
 REGRESS_TARGETS = break literal macrotag manyargs spacing
+HTML_TARGETS	= literal
 
 .include <bsd.regress.mk>
diff --git a/regress/man/HP/literal.in b/regress/man/HP/literal.in
index 0f256638..e5d1b71a 100644
--- a/regress/man/HP/literal.in
+++ b/regress/man/HP/literal.in
@@ -1,27 +1,32 @@
-.\" $OpenBSD: literal.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
-.TH HP-LITERAL 1 "January 4, 2011"
+.\" $OpenBSD: literal.in,v 1.3 2019/01/06 04:41:15 schwarze Exp $
+.TH HP-LITERAL 1 "January 6, 2019"
 .SH NAME
 HP-literal \- hanged paragraphs in literal context
 .SH DESCRIPTION
-regular
-text
+BEGINTEST
+before hanged paragraph
 .HP 10n
 tag
 indented
 text
 .PP
 regular
-text
+paragraph
 .nf
 literal
 text
 .HP 10n
 tag
-indented
-text
+literal
+hanged
+paragraph
 .PP
 literal
-text
+paragraph
 .fi
 regular
 text
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/man/HP/literal.out_ascii b/regress/man/HP/literal.out_ascii
index ff7aabf7..1e27b1ae 100644
--- a/regress/man/HP/literal.out_ascii
+++ b/regress/man/HP/literal.out_ascii
@@ -6,22 +6,25 @@ NNAAMMEE
        HP-literal - hanged paragraphs in literal context
 
 DDEESSCCRRIIPPTTIIOONN
-       regular text
+       BEGINTEST before hanged paragraph
 
        tag indented text
 
-       regular text
+       regular paragraph
        literal
        text
 
        tag
-                 indented
-                 text
+                 literal
+                 hanged
+                 paragraph
 
        literal
-       text
+       paragraph
        regular text
+       ENDTEST
+       end of file
 
 
 
-OpenBSD                         January 4, 2011                  HP-LITERAL(1)
+OpenBSD                         January 6, 2019                  HP-LITERAL(1)
diff --git a/regress/man/HP/literal.out_html b/regress/man/HP/literal.out_html
new file mode 100644
index 00000000..d40ee9a5
--- /dev/null
+++ b/regress/man/HP/literal.out_html
@@ -0,0 +1,20 @@
+BEGINTEST before hanged paragraph
+<p class="Pp HP">tag indented text</p>
+<p class="Pp">regular paragraph</p>
+<pre>
+literal
+text
+</pre>
+<pre>
+tag
+literal
+hanged
+paragraph
+</pre>
+<pre>
+literal
+paragraph
+</pre>
+regular text
+<br/>
+ENDTEST
-- 
cgit v1.2.3-56-ge451