From 70b71d1de24478a8fcc7413f1cb42c83db416bc3 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 6 Apr 2020 10:16:17 +0000
Subject: Support manual tagging of .Pp, .Bd, .D1, .Dl, .Bl, and .It. In HTML
 output, improve the logic for writing inside permalinks: skip them when there
 is no child content or when there is a risk that the children might contain
 flow content.

---
 regress/mdoc/D1/Makefile             | 3 ++-
 regress/mdoc/D1/spacing.in           | 5 +++--
 regress/mdoc/D1/spacing.out_ascii    | 2 +-
 regress/mdoc/D1/spacing.out_html     | 4 +++-
 regress/mdoc/D1/spacing.out_lint     | 2 +-
 regress/mdoc/D1/spacing.out_markdown | 2 +-
 regress/mdoc/D1/spacing.out_tag      | 3 +++
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 regress/mdoc/D1/spacing.out_tag

(limited to 'regress/mdoc/D1')

diff --git a/regress/mdoc/D1/Makefile b/regress/mdoc/D1/Makefile
index b94d5727..170dc2ca 100644
--- a/regress/mdoc/D1/Makefile
+++ b/regress/mdoc/D1/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2019/01/07 06:51:37 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2020/04/06 09:55:49 schwarze Exp $
 
 REGRESS_TARGETS	 = spacing
+TAG_TARGETS	 = spacing
 LINT_TARGETS	 = spacing
 HTML_TARGETS	 = spacing
 
diff --git a/regress/mdoc/D1/spacing.in b/regress/mdoc/D1/spacing.in
index c0f293c4..20258caf 100644
--- a/regress/mdoc/D1/spacing.in
+++ b/regress/mdoc/D1/spacing.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: spacing.in,v 1.4 2019/01/07 06:51:37 schwarze Exp $
-.Dd $Mdocdate: January 7 2019 $
+.\" $OpenBSD: spacing.in,v 1.5 2020/04/06 09:55:49 schwarze Exp $
+.Dd $Mdocdate: April 6 2020 $
 .Dt D1-SPACING 1
 .Os
 .Sh NAME
@@ -10,6 +10,7 @@ BEGINTEST
 .Pp
 preceding
 paragraph
+.Tg display
 .D1 spacing  in  and around one-line displays
 empty display:
 .D1
diff --git a/regress/mdoc/D1/spacing.out_ascii b/regress/mdoc/D1/spacing.out_ascii
index c0d1556d..c6241a38 100644
--- a/regress/mdoc/D1/spacing.out_ascii
+++ b/regress/mdoc/D1/spacing.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
      ENDTEST
      end of file
 
-OpenBSD                         January 7, 2019                        OpenBSD
+OpenBSD                          April 6, 2020                         OpenBSD
diff --git a/regress/mdoc/D1/spacing.out_html b/regress/mdoc/D1/spacing.out_html
index 3db40161..3a9affc9 100644
--- a/regress/mdoc/D1/spacing.out_html
+++ b/regress/mdoc/D1/spacing.out_html
@@ -1,5 +1,7 @@
 <p class="Pp">preceding paragraph</p>
-<div class="Bd Bd-indent">spacing in and around one-line displays</div>
+<div class="Bd
+  Bd-indent" id="display"><a class="permalink" href="#display">spacing in and
+  around one-line displays</a></div>
 empty display:
 <div class="Bd Bd-indent"></div>
 following text
diff --git a/regress/mdoc/D1/spacing.out_lint b/regress/mdoc/D1/spacing.out_lint
index 0a2790bb..532375d7 100644
--- a/regress/mdoc/D1/spacing.out_lint
+++ b/regress/mdoc/D1/spacing.out_lint
@@ -1 +1 @@
-mandoc: spacing.in:15:2: WARNING: empty block: D1
+mandoc: spacing.in:16:2: WARNING: empty block: D1
diff --git a/regress/mdoc/D1/spacing.out_markdown b/regress/mdoc/D1/spacing.out_markdown
index d1f12f63..225b3a0b 100644
--- a/regress/mdoc/D1/spacing.out_markdown
+++ b/regress/mdoc/D1/spacing.out_markdown
@@ -19,4 +19,4 @@ following text
 ENDTEST  
 end of file
 
-OpenBSD - January 7, 2019
+OpenBSD - April 6, 2020
diff --git a/regress/mdoc/D1/spacing.out_tag b/regress/mdoc/D1/spacing.out_tag
new file mode 100644
index 00000000..73ab507a
--- /dev/null
+++ b/regress/mdoc/D1/spacing.out_tag
@@ -0,0 +1,3 @@
+NAME 3
+DESCRIPTION 6
+display 10
-- 
cgit v1.2.3