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/RS/Makefile            |  6 +++---
 regress/man/RS/paragraph.in        | 23 +++++++++++++++++++++++
 regress/man/RS/paragraph.out_ascii | 21 +++++++++++++++++++++
 regress/man/RS/paragraph.out_html  |  8 ++++++++
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 regress/man/RS/paragraph.in
 create mode 100644 regress/man/RS/paragraph.out_ascii
 create mode 100644 regress/man/RS/paragraph.out_html

(limited to 'regress/man/RS')

diff --git a/regress/man/RS/Makefile b/regress/man/RS/Makefile
index 34c0029c..e7b64ab1 100644
--- a/regress/man/RS/Makefile
+++ b/regress/man/RS/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2019/01/05 20:00:33 schwarze Exp $
+# $OpenBSD: Makefile,v 1.14 2019/01/06 04:41:15 schwarze Exp $
 
 REGRESS_TARGETS	 = an-margin breaking broken empty literal lonelyRE
-REGRESS_TARGETS	+= nested noRE nowidth REarg width
+REGRESS_TARGETS	+= nested noRE nowidth paragraph REarg width
 LINT_TARGETS	 = empty lonelyRE noRE REarg
-HTML_TARGETS	 = literal
+HTML_TARGETS	 = literal paragraph
 
 .include <bsd.regress.mk>
diff --git a/regress/man/RS/paragraph.in b/regress/man/RS/paragraph.in
new file mode 100644
index 00000000..01f90f04
--- /dev/null
+++ b/regress/man/RS/paragraph.in
@@ -0,0 +1,23 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $
+.TH RS-PARAGRAPH 1 "January 6, 2019"
+.SH NAME
+RS-paragraph \- interaction between regular and indented paragraphs
+.SH DESCRIPTION
+BEGINTEST
+before paragraph
+.PP
+regular
+paragraph
+.RS
+indented
+paragraph
+.PP
+nested
+paragraph
+.RE
+regular text
+after display
+.br
+ENDTEST
+.br
+end of file
diff --git a/regress/man/RS/paragraph.out_ascii b/regress/man/RS/paragraph.out_ascii
new file mode 100644
index 00000000..91e0ee3e
--- /dev/null
+++ b/regress/man/RS/paragraph.out_ascii
@@ -0,0 +1,21 @@
+RS-PARAGRAPH(1)             General Commands Manual            RS-PARAGRAPH(1)
+
+
+
+NNAAMMEE
+       RS-paragraph - interaction between regular and indented paragraphs
+
+DDEESSCCRRIIPPTTIIOONN
+       BEGINTEST before paragraph
+
+       regular paragraph
+              indented paragraph
+
+              nested paragraph
+       regular text after display
+       ENDTEST
+       end of file
+
+
+
+OpenBSD                         January 6, 2019                RS-PARAGRAPH(1)
diff --git a/regress/man/RS/paragraph.out_html b/regress/man/RS/paragraph.out_html
new file mode 100644
index 00000000..8b518698
--- /dev/null
+++ b/regress/man/RS/paragraph.out_html
@@ -0,0 +1,8 @@
+BEGINTEST before paragraph
+<p class="Pp">regular paragraph</p>
+<div class="Bd-indent">indented paragraph
+<p class="Pp">nested paragraph</p>
+</div>
+regular text after display
+<br/>
+ENDTEST
-- 
cgit v1.2.3