Separate the place to put the <a href> permalink (now marked

with NODE_HREF) from the target element of the link (still marked
with NODE_ID).  In many cases, use this to move the target to the
beginning of the paragraph, such that readers don't get dropped
into the middle of a sentence.

16 files changed, 37 insertions, 37 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Cm/tag.out_html b/regress/usr.bin/mandoc/mdoc/Cm/tag.out_html
index 134f21c4533..5141f52a81d 100644
--- a/regress/usr.bin/mandoc/mdoc/Cm/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Cm/tag.out_html
@@ -1,15 +1,15 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><code class="Cm" id="one">one</code></a>
+  <dt id="one"><a class="permalink" href="#one"><code class="Cm">one</code></a>
     |
     <a class="permalink" href="#two"><code class="Cm" id="two">two</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><code class="Cm" id="three">three</code></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><code class="Cm">three</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#hyphen"><code class="Cm" id="hyphen">-hyphen</code></a></dt>
+  <dt id="hyphen"><a class="permalink" href="#hyphen"><code class="Cm">-hyphen</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#minus"><code class="Cm" id="minus">-minus-sign</code></a></dt>
+  <dt id="minus"><a class="permalink" href="#minus"><code class="Cm">-minus-sign</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#backslash"><code class="Cm" id="backslash">\backslash</code></a></dt>
+  <dt id="backslash"><a class="permalink" href="#backslash"><code class="Cm">\backslash</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><code class="Cm" id="four">four</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Dv/tag.out_html b/regress/usr.bin/mandoc/mdoc/Dv/tag.out_html
index cee78340802..4f04e0b7ef0 100644
--- a/regress/usr.bin/mandoc/mdoc/Dv/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Dv/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><code class="Dv" id="one">one</code></a>
+  <dt id="one"><a class="permalink" href="#one"><code class="Dv">one</code></a>
     |
     <a class="permalink" href="#two"><code class="Dv" id="two">two</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><code class="Dv" id="three">three</code></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><code class="Dv">three</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><code class="Dv" id="four">four</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.out_html b/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
index 225343eebd0..f5c47121d37 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
@@ -1,8 +1,8 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><i class="Em" id="one">one</i></a> |
+  <dt id="one"><a class="permalink" href="#one"><i class="Em">one</i></a> |
     <a class="permalink" href="#two"><i class="Em" id="two">two</i></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three-with-hyphens"><i class="Em" id="three-with-hyphens">three-with-hyphens</i></a></dt>
+  <dt id="three-with-hyphens"><a class="permalink" href="#three-with-hyphens"><i class="Em">three-with-hyphens</i></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><i class="Em" id="four">four</i></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Er/tag.out_html b/regress/usr.bin/mandoc/mdoc/Er/tag.out_html
index a2c2978f2dc..80daa28b798 100644
--- a/regress/usr.bin/mandoc/mdoc/Er/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Er/tag.out_html
@@ -7,6 +7,6 @@
 <section class="Sh">
 <h1 class="Sh" id="ERRORS"><a class="permalink" href="#ERRORS">ERRORS</a></h1>
 <dl class="Bl-tag">
-  <dt>[<a class="permalink" href="#ENOENT"><code class="Er" id="ENOENT">ENOENT</code></a>]</dt>
+  <dt id="ENOENT">[<a class="permalink" href="#ENOENT"><code class="Er">ENOENT</code></a>]</dt>
   <dd>text</dd>
 </dl>
diff --git a/regress/usr.bin/mandoc/mdoc/Ev/tag.out_html b/regress/usr.bin/mandoc/mdoc/Ev/tag.out_html
index 1e1c92b9a2f..ccc5beb0840 100644
--- a/regress/usr.bin/mandoc/mdoc/Ev/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Ev/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><code class="Ev" id="one">one</code></a>
+  <dt id="one"><a class="permalink" href="#one"><code class="Ev">one</code></a>
     |
     <a class="permalink" href="#two"><code class="Ev" id="two">two</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><code class="Ev" id="three">three</code></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><code class="Ev">three</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><code class="Ev" id="four">four</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/tag.out_html b/regress/usr.bin/mandoc/mdoc/Fl/tag.out_html
index f67a30c04d8..c101124fe65 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Fl/tag.out_html
@@ -1,8 +1,8 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#a"><code class="Fl" id="a">-a</code></a> |
+  <dt id="a"><a class="permalink" href="#a"><code class="Fl">-a</code></a> |
     <a class="permalink" href="#b"><code class="Fl" id="b">-b</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#c"><code class="Fl" id="c">-c</code></a></dt>
+  <dt id="c"><a class="permalink" href="#c"><code class="Fl">-c</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#d"><code class="Fl" id="d">-d</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/tag.out_html b/regress/usr.bin/mandoc/mdoc/Fo/tag.out_html
index b350861482e..018ff92e0f2 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Fo/tag.out_html
@@ -1,9 +1,8 @@
-<p class="Pp">automatic:
-    <a class="permalink" href="#first"><code class="Fn" id="first">first</code></a>()
-    and <code class="Fn">second</code>()</p>
-<p class="Pp"><a class="permalink" href="#second"><code class="Fn" id="second">second</code></a>()
+<p class="Pp" id="first">automatic:
+    <a class="permalink" href="#first"><code class="Fn">first</code></a>() and
+    <code class="Fn">second</code>()</p>
+<p class="Pp" id="second"><a class="permalink" href="#second"><code class="Fn">second</code></a>()
     and <code class="Fn">first</code>()</p>
-<p class="Pp">explicit:
-    <a class="permalink" href="#e3"><code class="Fn" id="e3">third</code></a>()
-    and
+<p class="Pp" id="e3">explicit:
+    <a class="permalink" href="#e3"><code class="Fn">third</code></a>() and
     <a class="permalink" href="#e4"><code class="Fn" id="e4">fourth</code></a>(<var class="Fa">void</var>);</p>
diff --git a/regress/usr.bin/mandoc/mdoc/Ic/tag.out_html b/regress/usr.bin/mandoc/mdoc/Ic/tag.out_html
index ad3cc1efc52..7148cc883ad 100644
--- a/regress/usr.bin/mandoc/mdoc/Ic/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Ic/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><code class="Ic" id="one">one</code></a>
+  <dt id="one"><a class="permalink" href="#one"><code class="Ic">one</code></a>
     |
     <a class="permalink" href="#two"><code class="Ic" id="two">two</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><code class="Ic" id="three">three</code></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><code class="Ic">three</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><code class="Ic" id="four">four</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Li/tag.out_html b/regress/usr.bin/mandoc/mdoc/Li/tag.out_html
index 3730caa6a52..d1b71573482 100644
--- a/regress/usr.bin/mandoc/mdoc/Li/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Li/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><code class="Li" id="one">one</code></a>
+  <dt id="one"><a class="permalink" href="#one"><code class="Li">one</code></a>
     |
     <a class="permalink" href="#two"><code class="Li" id="two">two</code></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><code class="Li" id="three">three</code></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><code class="Li">three</code></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><code class="Li" id="four">four</code></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Ms/tag.out_html b/regress/usr.bin/mandoc/mdoc/Ms/tag.out_html
index 0f24b2acc7d..9ae0292b5ad 100644
--- a/regress/usr.bin/mandoc/mdoc/Ms/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Ms/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><span class="Ms" id="one">one</span></a>
+  <dt id="one"><a class="permalink" href="#one"><span class="Ms">one</span></a>
     |
     <a class="permalink" href="#two"><span class="Ms" id="two">two</span></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><span class="Ms" id="three">three</span></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><span class="Ms">three</span></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><span class="Ms" id="four">four</span></a>
diff --git a/regress/usr.bin/mandoc/mdoc/No/tag.out_html b/regress/usr.bin/mandoc/mdoc/No/tag.out_html
index 32696917362..97109cee472 100644
--- a/regress/usr.bin/mandoc/mdoc/No/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/No/tag.out_html
@@ -1,9 +1,9 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><span class="No" id="one">one</span></a>
+  <dt id="one"><a class="permalink" href="#one"><span class="No">one</span></a>
     |
     <a class="permalink" href="#two"><span class="No" id="two">two</span></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><span class="No" id="three">three</span></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><span class="No">three</span></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><span class="No" id="four">four</span></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
index 69276a1883b..cca78319209 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
@@ -1,8 +1,8 @@
 <dl class="Bl-tag">
-  <dt><a class="permalink" href="#one"><b class="Sy" id="one">one</b></a> |
+  <dt id="one"><a class="permalink" href="#one"><b class="Sy">one</b></a> |
     <a class="permalink" href="#two"><b class="Sy" id="two">two</b></a></dt>
   <dd>text</dd>
-  <dt><a class="permalink" href="#three"><b class="Sy" id="three">three</b></a></dt>
+  <dt id="three"><a class="permalink" href="#three"><b class="Sy">three</b></a></dt>
   <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><b class="Sy" id="four">four</b></a>
diff --git a/regress/usr.bin/mandoc/mdoc/Tg/column.in b/regress/usr.bin/mandoc/mdoc/Tg/column.in
index 50b0d1f0ba1..d717283b78d 100644
--- a/regress/usr.bin/mandoc/mdoc/Tg/column.in
+++ b/regress/usr.bin/mandoc/mdoc/Tg/column.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: column.in,v 1.1 2020/04/06 09:55:50 schwarze Exp $
-.Dd $Mdocdate: April 6 2020 $
+.\" $OpenBSD: column.in,v 1.2 2020/04/07 22:45:38 schwarze Exp $
+.Dd $Mdocdate: April 7 2020 $
 .Dt TG-COLUMN 1
 .Os
 .Sh NAME
@@ -9,8 +9,9 @@
 BEGINTEST
 .Tg list
 .Bl -column one two
+.It one Ta
 .Tg row1
-.It one Ta two
+two
 .Tg row2
 .It 1	2
 .El
diff --git a/regress/usr.bin/mandoc/mdoc/Tg/column.out_ascii b/regress/usr.bin/mandoc/mdoc/Tg/column.out_ascii
index 3051005bb1c..60391cff44f 100644
--- a/regress/usr.bin/mandoc/mdoc/Tg/column.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Tg/column.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
      1      2
      ENDTEST
 
-OpenBSD                          April 6, 2020                         OpenBSD
+OpenBSD                          April 7, 2020                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Tg/column.out_markdown b/regress/usr.bin/mandoc/mdoc/Tg/column.out_markdown
index a6820fd0644..2042eb99a43 100644
--- a/regress/usr.bin/mandoc/mdoc/Tg/column.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Tg/column.out_markdown
@@ -13,4 +13,4 @@ BEGINTEST
 
 ENDTEST
 
-OpenBSD - April 6, 2020
+OpenBSD - April 7, 2020
diff --git a/regress/usr.bin/mandoc/mdoc/Tg/warn.out_html b/regress/usr.bin/mandoc/mdoc/Tg/warn.out_html
index fdc333b6577..a7f925740d0 100644
--- a/regress/usr.bin/mandoc/mdoc/Tg/warn.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Tg/warn.out_html
@@ -1,4 +1,4 @@
-<p class="Pp"><mark id="start-tag"></mark>initial text
+<p class="Pp" id="start-tag">initial text
     <a class="permalink" href="#macro"><code class="Ic" id="macro">macro</code></a>
     too many badstart badend whitespace <mark id="sub"></mark></p>
 <section class="Ss">