From 25b07ce44ad2c1d5e59d80a7abb5385c5d62169d Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sun, 19 Apr 2020 16:36:16 +0000
Subject: When .Bd, .D1, or .Dl is tagged, attach the permalink to the first
 few letters, similar to what was earlier done for .Pp.

---
 regress/mdoc/Bd/Makefile               |  6 +++---
 regress/mdoc/Bd/nested.in              | 13 ++++++++-----
 regress/mdoc/Bd/nested.out_ascii       |  5 ++++-
 regress/mdoc/Bd/nested.out_html        | 28 ++++++++++++++++++++++++++++
 regress/mdoc/Bd/nested.out_lint        |  4 ++--
 regress/mdoc/Bd/nested.out_markdown    | 14 +++++++++-----
 regress/mdoc/Bd/nested.out_tag         |  8 ++++----
 regress/mdoc/Bd/paragraph.in           |  8 ++++----
 regress/mdoc/Bd/paragraph.out_ascii    |  6 +++---
 regress/mdoc/Bd/paragraph.out_html     |  7 ++++---
 regress/mdoc/Bd/paragraph.out_markdown |  6 +++---
 regress/mdoc/Bd/spacing.out_tag        |  4 ++++
 12 files changed, 76 insertions(+), 33 deletions(-)
 create mode 100644 regress/mdoc/Bd/nested.out_html
 create mode 100644 regress/mdoc/Bd/spacing.out_tag

(limited to 'regress/mdoc/Bd')

diff --git a/regress/mdoc/Bd/Makefile b/regress/mdoc/Bd/Makefile
index a7319e70..d516f141 100644
--- a/regress/mdoc/Bd/Makefile
+++ b/regress/mdoc/Bd/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.23 2020/04/06 09:55:49 schwarze Exp $
+# $OpenBSD: Makefile,v 1.24 2020/04/19 16:26:11 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
+TAG_TARGETS	 = nested paragraph spacing
 LINT_TARGETS	 = beforeNAME blank nested badargs break broken unclosed
-HTML_TARGETS	 = nf paragraph
+HTML_TARGETS	 = nested nf paragraph
 
 SKIP_TMAN	 = beforeNAME centered
 
diff --git a/regress/mdoc/Bd/nested.in b/regress/mdoc/Bd/nested.in
index c0cb4d12..6f3a00ce 100644
--- a/regress/mdoc/Bd/nested.in
+++ b/regress/mdoc/Bd/nested.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nested.in,v 1.3 2020/04/06 09:55:49 schwarze Exp $
+.\" $OpenBSD: nested.in,v 1.4 2020/04/19 16:26:11 schwarze Exp $
 .Dd $Mdocdate$
 .Dt BD-NESTED 1
 .Os
@@ -6,16 +6,18 @@
 .Nm Bd-nested
 .Nd nested displays and lists
 .Sh DESCRIPTION
+BEGINTEST
+.Pp
 regular
 text
 .Tg outer
 .Bd -ragged -offset indent
-outer
-text (default indent)
+outer text
+.Pq default indent
 .Tg inner
 .Bd -ragged -offset indent
-inner
-text (default indent)
+inner text
+.Pq default indent
 .Ed
 outer
 text
@@ -45,3 +47,4 @@ inner text (2n)
 .Ed
 outer text
 .El
+ENDTEST
diff --git a/regress/mdoc/Bd/nested.out_ascii b/regress/mdoc/Bd/nested.out_ascii
index 1d27c178..2381a6bf 100644
--- a/regress/mdoc/Bd/nested.out_ascii
+++ b/regress/mdoc/Bd/nested.out_ascii
@@ -4,6 +4,8 @@ NNAAMMEE
      BBdd--nneesstteedd - nested displays and lists
 
 DDEESSCCRRIIPPTTIIOONN
+     BEGINTEST
+
      regular text
 
            outer text (default indent)
@@ -25,5 +27,6 @@ DDEESSCCRRIIPPTTIIOONN
 
                inner text (2n)
              outer text
+     ENDTEST
 
-OpenBSD                          April 6, 2020                         OpenBSD
+OpenBSD                         April 19, 2020                         OpenBSD
diff --git a/regress/mdoc/Bd/nested.out_html b/regress/mdoc/Bd/nested.out_html
new file mode 100644
index 00000000..bc71c270
--- /dev/null
+++ b/regress/mdoc/Bd/nested.out_html
@@ -0,0 +1,28 @@
+<p class="Pp">regular text</p>
+<div class="Bd Pp
+  Bd-indent" id="outer"><a class="permalink" href="#outer">outer</a> text
+  (default indent)
+<div class="Bd Pp
+  Bd-indent" id="inner"><a class="permalink" href="#inner">inner</a> text
+  (default indent)</div>
+outer text</div>
+regular text
+<div class="Bd Pp
+  Bd-indent" id="outer_2"><a class="permalink" href="#outer_2">outer</a> text
+  (4n)
+<div class="Bd Pp
+  Bd-indent" id="inner_2"><a class="permalink" href="#inner_2">inner</a> text
+  (2n)</div>
+outer text
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>text</dd>
+</dl>
+outer text</div>
+regular text
+<dl class="Bl-tag">
+  <dt>tag</dt>
+  <dd>outer text
+    <div class="Bd Pp Bd-indent">inner text (2n)</div>
+    outer text</dd>
+</dl>
diff --git a/regress/mdoc/Bd/nested.out_lint b/regress/mdoc/Bd/nested.out_lint
index 5a6a6966..ca44cdd6 100644
--- a/regress/mdoc/Bd/nested.out_lint
+++ b/regress/mdoc/Bd/nested.out_lint
@@ -1,2 +1,2 @@
-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
+mandoc: nested.in:18:2: WARNING: nested displays are not portable: Bd in Bd
+mandoc: nested.in:31: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 e647a0df..aef7e4b0 100644
--- a/regress/mdoc/Bd/nested.out_markdown
+++ b/regress/mdoc/Bd/nested.out_markdown
@@ -6,14 +6,16 @@ BD-NESTED(1) - General Commands Manual
 
 # DESCRIPTION
 
+BEGINTEST
+
 regular
 text
 
-> outer
-> text (default indent)
+> outer text
+> (default indent)
 
-> > inner
-> > text (default indent)
+> > inner text
+> > (default indent)
 
 > outer
 > text
@@ -43,4 +45,6 @@ tag
 
 > outer text
 
-OpenBSD - April 6, 2020
+ENDTEST
+
+OpenBSD - April 19, 2020
diff --git a/regress/mdoc/Bd/nested.out_tag b/regress/mdoc/Bd/nested.out_tag
index 7b9c2012..c02287f7 100644
--- a/regress/mdoc/Bd/nested.out_tag
+++ b/regress/mdoc/Bd/nested.out_tag
@@ -1,6 +1,6 @@
 NAME 3
 DESCRIPTION 6
-outer 9
-inner 11
-outer 15
-inner 17
+outer 11
+inner 13
+outer 17
+inner 19
diff --git a/regress/mdoc/Bd/paragraph.in b/regress/mdoc/Bd/paragraph.in
index 8ac0cc00..3f27dc72 100644
--- a/regress/mdoc/Bd/paragraph.in
+++ b/regress/mdoc/Bd/paragraph.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: paragraph.in,v 1.2 2020/04/06 09:55:49 schwarze Exp $
+.\" $OpenBSD: paragraph.in,v 1.3 2020/04/19 16:26:11 schwarze Exp $
 .Dd $Mdocdate$
 .Dt BD-PARAGRAPH 1
 .Os
@@ -28,12 +28,12 @@ to normal
 another
 paragraph
 .Tg unfilled
-.Bd -unfilled
-unfilled
+.Bd -literal
+unfilled literal
 display
 .Tg upara
 .Pp
-unfilled
+unfilled literal
 paragraph
 .Ed
 again back
diff --git a/regress/mdoc/Bd/paragraph.out_ascii b/regress/mdoc/Bd/paragraph.out_ascii
index bf122ce0..be9583d8 100644
--- a/regress/mdoc/Bd/paragraph.out_ascii
+++ b/regress/mdoc/Bd/paragraph.out_ascii
@@ -15,13 +15,13 @@ DDEESSCCRRIIPPTTIIOONN
 
      another paragraph
 
-     unfilled
+     unfilled literal
      display
 
-     unfilled
+     unfilled literal
      paragraph
      again back to normal
      ENDTEST
      end of file
 
-OpenBSD                          April 6, 2020                         OpenBSD
+OpenBSD                         April 19, 2020                         OpenBSD
diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html
index 07a02769..cc3491c9 100644
--- a/regress/mdoc/Bd/paragraph.out_html
+++ b/regress/mdoc/Bd/paragraph.out_html
@@ -1,6 +1,7 @@
 <p class="Pp" id="npara"><a class="permalink" href="#npara">normal</a>
   paragraph</p>
-<div class="Bd Pp" id="filled">filled display
+<div class="Bd Pp" id="filled"><a class="permalink" href="#filled">filled</a>
+  display
 <p class="Pp" id="fpara"><a class="permalink" href="#fpara">paragraph</a> in
     display</p>
 </div>
@@ -8,10 +9,10 @@ back to normal
 <p class="Pp">another paragraph</p>
 <div class="Bd Pp" id="unfilled">
 <pre>
-unfilled
+<a class="permalink" href="#unfilled">unfilled</a> literal
 display
 <mark id="upara"></mark>
-<a class="permalink" href="#upara">unfilled</a>
+<a class="permalink" href="#upara">unfilled</a> literal
 paragraph
 </pre>
 </div>
diff --git a/regress/mdoc/Bd/paragraph.out_markdown b/regress/mdoc/Bd/paragraph.out_markdown
index 6e569b5d..af74b7b4 100644
--- a/regress/mdoc/Bd/paragraph.out_markdown
+++ b/regress/mdoc/Bd/paragraph.out_markdown
@@ -25,10 +25,10 @@ to normal
 another
 paragraph
 
-	unfilled
+	unfilled literal
 	display
 
-	unfilled
+	unfilled literal
 	paragraph
 
 again back
@@ -36,4 +36,4 @@ to normal
 ENDTEST  
 end of file
 
-OpenBSD - April 6, 2020
+OpenBSD - April 19, 2020
diff --git a/regress/mdoc/Bd/spacing.out_tag b/regress/mdoc/Bd/spacing.out_tag
new file mode 100644
index 00000000..b986cab0
--- /dev/null
+++ b/regress/mdoc/Bd/spacing.out_tag
@@ -0,0 +1,4 @@
+NAME 3
+DESCRIPTION 6
+EXAMPLES 14
+word 15
-- 
cgit