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/Pp/Makefile         | 3 ++-
 regress/mdoc/Pp/arg.in           | 8 ++++++--
 regress/mdoc/Pp/arg.out_ascii    | 4 +++-
 regress/mdoc/Pp/arg.out_lint     | 6 +++---
 regress/mdoc/Pp/arg.out_markdown | 4 +++-
 regress/mdoc/Pp/arg.out_tag      | 4 ++++
 6 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 regress/mdoc/Pp/arg.out_tag

(limited to 'regress/mdoc/Pp')

diff --git a/regress/mdoc/Pp/Makefile b/regress/mdoc/Pp/Makefile
index 04e1bc3b..03d32774 100644
--- a/regress/mdoc/Pp/Makefile
+++ b/regress/mdoc/Pp/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2015/02/04 19:11:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2020/04/06 09:55:50 schwarze Exp $
 
 REGRESS_TARGETS	 = arg
+TAG_TARGETS	 = arg
 LINT_TARGETS	 = arg
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Pp/arg.in b/regress/mdoc/Pp/arg.in
index 274e558d..1e62c80c 100644
--- a/regress/mdoc/Pp/arg.in
+++ b/regress/mdoc/Pp/arg.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: arg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
-.Dd $Mdocdate: July 4 2017 $
+.\" $OpenBSD: arg.in,v 1.5 2020/04/06 09:55:50 schwarze Exp $
+.Dd $Mdocdate: April 6 2020 $
 .Dt PP-ARG 1
 .Os
 .Sh NAME
@@ -7,9 +7,13 @@
 .Nd paragraph macro with arguments
 .Sh DESCRIPTION
 line 1
+.Tg first
 .Pp drop this
 line 2
 .br drop this
 line 3
 .sp 1v drop this
 line 4
+.Tg last
+.Pp
+final text
diff --git a/regress/mdoc/Pp/arg.out_ascii b/regress/mdoc/Pp/arg.out_ascii
index a15f1598..70eebb4d 100644
--- a/regress/mdoc/Pp/arg.out_ascii
+++ b/regress/mdoc/Pp/arg.out_ascii
@@ -11,4 +11,6 @@ DDEESSCCRRIIPPTTIIOONN
 
      line 4
 
-OpenBSD                          July 4, 2017                          OpenBSD
+     final text
+
+OpenBSD                          April 6, 2020                         OpenBSD
diff --git a/regress/mdoc/Pp/arg.out_lint b/regress/mdoc/Pp/arg.out_lint
index f49d27d4..40d77064 100644
--- a/regress/mdoc/Pp/arg.out_lint
+++ b/regress/mdoc/Pp/arg.out_lint
@@ -1,3 +1,3 @@
-mandoc: arg.in:12:5: ERROR: skipping all arguments: br drop this
-mandoc: arg.in:14:8: ERROR: skipping excess arguments: sp ... drop this
-mandoc: arg.in:10:2: ERROR: skipping all arguments: Pp drop
+mandoc: arg.in:13:5: ERROR: skipping all arguments: br drop this
+mandoc: arg.in:15:8: ERROR: skipping excess arguments: sp ... drop this
+mandoc: arg.in:11:2: ERROR: skipping all arguments: Pp drop
diff --git a/regress/mdoc/Pp/arg.out_markdown b/regress/mdoc/Pp/arg.out_markdown
index 17c7753a..0b06ac9e 100644
--- a/regress/mdoc/Pp/arg.out_markdown
+++ b/regress/mdoc/Pp/arg.out_markdown
@@ -13,4 +13,6 @@ line 3
 
 line 4
 
-OpenBSD - July 4, 2017
+final text
+
+OpenBSD - April 6, 2020
diff --git a/regress/mdoc/Pp/arg.out_tag b/regress/mdoc/Pp/arg.out_tag
new file mode 100644
index 00000000..443b1be2
--- /dev/null
+++ b/regress/mdoc/Pp/arg.out_tag
@@ -0,0 +1,4 @@
+NAME 3
+DESCRIPTION 6
+first 9
+last 14
-- 
cgit v1.2.3-56-ge451