summaryrefslogtreecommitdiffstats
path: root/regress/mdoc/Bd
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2020-04-06 10:16:17 +0000
committerIngo Schwarze <schwarze@openbsd.org>2020-04-06 10:16:17 +0000
commitb19e09dbeb7e957bca580776d8b3a4651016c904 (patch)
tree9decba67ceddc230203a9a25445f231797d73b56 /regress/mdoc/Bd
parent9c50b3f3dd65454028a85113ebc01c5f1f8dabf5 (diff)
downloadmandoc-b19e09dbeb7e957bca580776d8b3a4651016c904.tar.gz
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.
Diffstat (limited to 'regress/mdoc/Bd')
-rw-r--r--regress/mdoc/Bd/Makefile3
-rw-r--r--regress/mdoc/Bd/nested.in6
-rw-r--r--regress/mdoc/Bd/nested.out_ascii2
-rw-r--r--regress/mdoc/Bd/nested.out_lint4
-rw-r--r--regress/mdoc/Bd/nested.out_markdown2
-rw-r--r--regress/mdoc/Bd/nested.out_tag6
-rw-r--r--regress/mdoc/Bd/paragraph.in7
-rw-r--r--regress/mdoc/Bd/paragraph.out_ascii2
-rw-r--r--regress/mdoc/Bd/paragraph.out_html10
-rw-r--r--regress/mdoc/Bd/paragraph.out_markdown2
-rw-r--r--regress/mdoc/Bd/paragraph.out_tag7
11 files changed, 37 insertions, 14 deletions
diff --git a/regress/mdoc/Bd/Makefile b/regress/mdoc/Bd/Makefile
index f05f54b0..a7319e70 100644
--- a/regress/mdoc/Bd/Makefile
+++ b/regress/mdoc/Bd/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2019/01/07 06:51:37 schwarze Exp $
+# $OpenBSD: Makefile,v 1.23 2020/04/06 09:55:49 schwarze Exp $
REGRESS_TARGETS = beforeNAME blank centered nested nf paragraph spacing
REGRESS_TARGETS += badargs empty offset-empty offset-neg
REGRESS_TARGETS += break broken unclosed
+TAG_TARGETS = nested paragraph
LINT_TARGETS = beforeNAME blank nested badargs break broken unclosed
HTML_TARGETS = nf paragraph
diff --git a/regress/mdoc/Bd/nested.in b/regress/mdoc/Bd/nested.in
index 328fbf1d..c0cb4d12 100644
--- a/regress/mdoc/Bd/nested.in
+++ b/regress/mdoc/Bd/nested.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nested.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.\" $OpenBSD: nested.in,v 1.3 2020/04/06 09:55:49 schwarze Exp $
.Dd $Mdocdate$
.Dt BD-NESTED 1
.Os
@@ -8,9 +8,11 @@
.Sh DESCRIPTION
regular
text
+.Tg outer
.Bd -ragged -offset indent
outer
text (default indent)
+.Tg inner
.Bd -ragged -offset indent
inner
text (default indent)
@@ -20,8 +22,10 @@ text
.Ed
regular
text
+.Tg outer
.Bd -ragged -offset 4n
outer text (4n)
+.Tg inner
.Bd -ragged -offset 2n
inner text (2n)
.Ed
diff --git a/regress/mdoc/Bd/nested.out_ascii b/regress/mdoc/Bd/nested.out_ascii
index 58ee55dd..1d27c178 100644
--- a/regress/mdoc/Bd/nested.out_ascii
+++ b/regress/mdoc/Bd/nested.out_ascii
@@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN
inner text (2n)
outer text
-OpenBSD July 4, 2017 OpenBSD
+OpenBSD April 6, 2020 OpenBSD
diff --git a/regress/mdoc/Bd/nested.out_lint b/regress/mdoc/Bd/nested.out_lint
index d6f7eda2..5a6a6966 100644
--- a/regress/mdoc/Bd/nested.out_lint
+++ b/regress/mdoc/Bd/nested.out_lint
@@ -1,2 +1,2 @@
-mandoc: nested.in:14:2: WARNING: nested displays are not portable: Bd in Bd
-mandoc: nested.in:25:2: WARNING: nested displays are not portable: Bd in Bd
+mandoc: nested.in:16:2: WARNING: nested displays are not portable: Bd in Bd
+mandoc: nested.in:29:2: WARNING: nested displays are not portable: Bd in Bd
diff --git a/regress/mdoc/Bd/nested.out_markdown b/regress/mdoc/Bd/nested.out_markdown
index d936b9c0..e647a0df 100644
--- a/regress/mdoc/Bd/nested.out_markdown
+++ b/regress/mdoc/Bd/nested.out_markdown
@@ -43,4 +43,4 @@ tag
> outer text
-OpenBSD - July 4, 2017
+OpenBSD - April 6, 2020
diff --git a/regress/mdoc/Bd/nested.out_tag b/regress/mdoc/Bd/nested.out_tag
new file mode 100644
index 00000000..7b9c2012
--- /dev/null
+++ b/regress/mdoc/Bd/nested.out_tag
@@ -0,0 +1,6 @@
+NAME 3
+DESCRIPTION 6
+outer 9
+inner 11
+outer 15
+inner 17
diff --git a/regress/mdoc/Bd/paragraph.in b/regress/mdoc/Bd/paragraph.in
index 09629f56..8ac0cc00 100644
--- a/regress/mdoc/Bd/paragraph.in
+++ b/regress/mdoc/Bd/paragraph.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.\" $OpenBSD: paragraph.in,v 1.2 2020/04/06 09:55:49 schwarze Exp $
.Dd $Mdocdate$
.Dt BD-PARAGRAPH 1
.Os
@@ -9,12 +9,15 @@
BEGINTEST
initial
text
+.Tg npara
.Pp
normal
paragraph
+.Tg filled
.Bd -filled
filled
display
+.Tg fpara
.Pp
paragraph
in display
@@ -24,9 +27,11 @@ to normal
.Pp
another
paragraph
+.Tg unfilled
.Bd -unfilled
unfilled
display
+.Tg upara
.Pp
unfilled
paragraph
diff --git a/regress/mdoc/Bd/paragraph.out_ascii b/regress/mdoc/Bd/paragraph.out_ascii
index 216f4530..bf122ce0 100644
--- a/regress/mdoc/Bd/paragraph.out_ascii
+++ b/regress/mdoc/Bd/paragraph.out_ascii
@@ -24,4 +24,4 @@ DDEESSCCRRIIPPTTIIOONN
ENDTEST
end of file
-OpenBSD January 7, 2019 OpenBSD
+OpenBSD April 6, 2020 OpenBSD
diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html
index bec13a88..f537335e 100644
--- a/regress/mdoc/Bd/paragraph.out_html
+++ b/regress/mdoc/Bd/paragraph.out_html
@@ -1,14 +1,14 @@
-<p class="Pp">normal paragraph</p>
-<div class="Bd Pp">filled display
-<p class="Pp">paragraph in display</p>
+<p class="Pp" id="npara">normal paragraph</p>
+<div class="Bd Pp" id="filled">filled display
+<p class="Pp" id="fpara">paragraph in display</p>
</div>
back to normal
<p class="Pp">another paragraph</p>
-<div class="Bd Pp">
+<div class="Bd Pp" id="unfilled">
<pre>
unfilled
display
-
+<mark id="upara"></mark>
unfilled
paragraph
</pre>
diff --git a/regress/mdoc/Bd/paragraph.out_markdown b/regress/mdoc/Bd/paragraph.out_markdown
index 13e43f11..6e569b5d 100644
--- a/regress/mdoc/Bd/paragraph.out_markdown
+++ b/regress/mdoc/Bd/paragraph.out_markdown
@@ -36,4 +36,4 @@ to normal
ENDTEST
end of file
-OpenBSD - January 7, 2019
+OpenBSD - April 6, 2020
diff --git a/regress/mdoc/Bd/paragraph.out_tag b/regress/mdoc/Bd/paragraph.out_tag
new file mode 100644
index 00000000..eab6391f
--- /dev/null
+++ b/regress/mdoc/Bd/paragraph.out_tag
@@ -0,0 +1,7 @@
+NAME 3
+DESCRIPTION 6
+npara 9
+filled 11
+fpara 13
+unfilled 18
+upara 21