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/SS/Makefile            |  5 +++--
 regress/man/SS/paragraph.in        | 17 +++++++++++++++++
 regress/man/SS/paragraph.out_ascii | 23 +++++++++++++++++++++++
 regress/man/SS/paragraph.out_html  |  8 ++++++++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 regress/man/SS/paragraph.in
 create mode 100644 regress/man/SS/paragraph.out_ascii
 create mode 100644 regress/man/SS/paragraph.out_html

(limited to 'regress/man/SS')

diff --git a/regress/man/SS/Makefile b/regress/man/SS/Makefile
index 01bd7edb..0ae0fbc5 100644
--- a/regress/man/SS/Makefile
+++ b/regress/man/SS/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2015/04/04 18:52:12 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2019/01/06 04:41:15 schwarze Exp $
 
-REGRESS_TARGETS	= broken broken_eline longarg noarg
+REGRESS_TARGETS	= broken broken_eline longarg noarg paragraph
 LINT_TARGETS	= broken broken_eline noarg
+HTML_TARGETS	= paragraph
 
 # groff-1.22.3 defects:
 # - .SS without args just before EOF causes two additional blank lines.
diff --git a/regress/man/SS/paragraph.in b/regress/man/SS/paragraph.in
new file mode 100644
index 00000000..c30ee9c3
--- /dev/null
+++ b/regress/man/SS/paragraph.in
@@ -0,0 +1,17 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $
+.TH SS-PARAGRAPH 1 "January 6, 2019"
+.SH NAME
+SS-paragraph \- interaction of subsection headers with paragraphs
+.SH DESCRIPTION
+BEGINTEST
+.SS First subsection
+This text
+immediately follows
+a subsection header.
+.PP
+This is
+a paragraph.
+.SS Second subsection
+ENDTEST
+.PP
+end of file
diff --git a/regress/man/SS/paragraph.out_ascii b/regress/man/SS/paragraph.out_ascii
new file mode 100644
index 00000000..3448eedb
--- /dev/null
+++ b/regress/man/SS/paragraph.out_ascii
@@ -0,0 +1,23 @@
+SS-PARAGRAPH(1)             General Commands Manual            SS-PARAGRAPH(1)
+
+
+
+NNAAMMEE
+       SS-paragraph - interaction of subsection headers with paragraphs
+
+DDEESSCCRRIIPPTTIIOONN
+       BEGINTEST
+
+   FFiirrsstt ssuubbsseeccttiioonn
+       This text immediately follows a subsection header.
+
+       This is a paragraph.
+
+   SSeeccoonndd ssuubbsseeccttiioonn
+       ENDTEST
+
+       end of file
+
+
+
+OpenBSD                         January 6, 2019                SS-PARAGRAPH(1)
diff --git a/regress/man/SS/paragraph.out_html b/regress/man/SS/paragraph.out_html
new file mode 100644
index 00000000..e36f2a06
--- /dev/null
+++ b/regress/man/SS/paragraph.out_html
@@ -0,0 +1,8 @@
+BEGINTEST
+<h2 class="Ss" title="Ss" id="First_subsection"><a class="permalink" href="#First_subsection">First
+  subsection</a></h2>
+This text immediately follows a subsection header.
+<p class="Pp">This is a paragraph.</p>
+<h2 class="Ss" title="Ss" id="Second_subsection"><a class="permalink" href="#Second_subsection">Second
+  subsection</a></h2>
+ENDTEST
-- 
cgit v1.2.3-56-ge451