From d75c48416eef7eb48487f6dc9a1bafa2c262b81c Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 20 Apr 2020 13:07:24 +0000
Subject: In fragment identifiers, use ~%d for ordinal suffixes, and reserve
 the character '~' for that purpose.

Bug found by validator.w3.org in openssl(1), which contains both a
tag "tls1_2" and a second instance of a tag "tls1", which also resulted
in "tls1_2", causing a clash.  Now, the second instance of "tls1" is
rendered as "tls1~2" instead, employing the newly reserved '~'.
---
 regress/man/IP/literal.out_html | 6 +++---
 regress/man/TP/literal.out_html | 2 +-
 regress/man/TP/vert.out_html    | 2 +-
 regress/mdoc/Bd/nested.out_html | 4 ++--
 regress/mdoc/Sh/tag.out_html    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'regress')

diff --git a/regress/man/IP/literal.out_html b/regress/man/IP/literal.out_html
index 3b9cc429..aa0536e7 100644
--- a/regress/man/IP/literal.out_html
+++ b/regress/man/IP/literal.out_html
@@ -8,7 +8,7 @@ literal
 text
 </pre>
 <dl class="Bl-tag">
-  <dt id="tag_2"><a class="permalink" href="#tag_2">tag</a></dt>
+  <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt>
   <dd>
     <pre>
 indented
@@ -32,7 +32,7 @@ literal
 text
 </pre>
 <dl class="Bl-tag">
-  <dt id="tag_3"><a class="permalink" href="#tag_3">tag</a></dt>
+  <dt id="tag~3"><a class="permalink" href="#tag~3">tag</a></dt>
   <dd>
     <pre>
 indented
@@ -48,7 +48,7 @@ text
   out of indented paragraph</a></h2>
 <p class="Pp">regular text</p>
 <dl class="Bl-tag">
-  <dt id="tag_4"><a class="permalink" href="#tag_4">tag</a></dt>
+  <dt id="tag~4"><a class="permalink" href="#tag~4">tag</a></dt>
   <dd>indented regular text
     <pre>
 indented
diff --git a/regress/man/TP/literal.out_html b/regress/man/TP/literal.out_html
index 8b818ed8..914c7b5c 100644
--- a/regress/man/TP/literal.out_html
+++ b/regress/man/TP/literal.out_html
@@ -8,7 +8,7 @@ literal
 text
 </pre>
 <dl class="Bl-tag">
-  <dt id="tag_2"><a class="permalink" href="#tag_2">tag</a></dt>
+  <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt>
   <dd>
     <pre>
 indented
diff --git a/regress/man/TP/vert.out_html b/regress/man/TP/vert.out_html
index 1124ed33..4499432b 100644
--- a/regress/man/TP/vert.out_html
+++ b/regress/man/TP/vert.out_html
@@ -4,6 +4,6 @@
 <dl class="Bl-tag">
   <dt id="tag"><a class="permalink" href="#tag">tag</a></dt>
   <dd>text</dd>
-  <dt id="tag_2"><a class="permalink" href="#tag_2">tag</a></dt>
+  <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt>
   <dd>text</dd>
 </dl>
diff --git a/regress/mdoc/Bd/nested.out_html b/regress/mdoc/Bd/nested.out_html
index bc71c270..94761895 100644
--- a/regress/mdoc/Bd/nested.out_html
+++ b/regress/mdoc/Bd/nested.out_html
@@ -8,10 +8,10 @@
 outer text</div>
 regular text
 <div class="Bd Pp
-  Bd-indent" id="outer_2"><a class="permalink" href="#outer_2">outer</a> text
+  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
+  Bd-indent" id="inner~2"><a class="permalink" href="#inner~2">inner</a> text
   (2n)</div>
 outer text
 <dl class="Bl-tag">
diff --git a/regress/mdoc/Sh/tag.out_html b/regress/mdoc/Sh/tag.out_html
index d99c6d4d..0dd39398 100644
--- a/regress/mdoc/Sh/tag.out_html
+++ b/regress/mdoc/Sh/tag.out_html
@@ -2,7 +2,7 @@
 </section>
 </section>
 <section class="Sh">
-<h1 class="Sh" id="DESCRIPTION_2"><a class="permalink" href="#DESCRIPTION_2">DESCRIPTION</a></h1>
+<h1 class="Sh" id="DESCRIPTION~2"><a class="permalink" href="#DESCRIPTION~2">DESCRIPTION</a></h1>
 <p class="Pp">Text in duplicate description section.</p>
 </section>
 <section class="Sh">
-- 
cgit v1.2.3