Additional tests of automatic tagging involving different kinds of hyphens

after tag.c rev. 1.38.

18 files changed, 85 insertions, 23 deletions

diff --git a/regress/usr.bin/mandoc/man/IP/tag.in b/regress/usr.bin/mandoc/man/IP/tag.in
index 038fa969a3d..b94d5582007 100644
--- a/regress/usr.bin/mandoc/man/IP/tag.in
+++ b/regress/usr.bin/mandoc/man/IP/tag.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: tag.in,v 1.1 2020/03/13 00:31:05 schwarze Exp $
-.TH IP-TAG 1 "March 10, 2020"
+.\" $OpenBSD: tag.in,v 1.2 2023/11/24 04:53:39 schwarze Exp $
+.TH IP-TAG 1 "November 24, 2023"
 .SH NAME
 IP-tag \- automatic tagging of indented blocks
 .SH DESCRIPTION
@@ -12,6 +12,12 @@ text
 text
 .IP "\&\fI \-weak\fP"
 text
+.IP "hyphen-minus"
+text
+.IP "minus\-sign"
+text
+.IP "\-strong"
+text
 .IP " strong"
 text
 .PP
diff --git a/regress/usr.bin/mandoc/man/IP/tag.out_ascii b/regress/usr.bin/mandoc/man/IP/tag.out_ascii
index 26c9532c07f..c3d58bdfa4a 100644
--- a/regress/usr.bin/mandoc/man/IP/tag.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/tag.out_ascii
@@ -12,8 +12,16 @@ DDEESSCCRRIIPPTTIIOONN
 
       _-_w_e_a_k    text
 
+     hyphen-minus
+               text
+
+     minus-sign
+               text
+
+     -strong   text
+
       strong   text
 
      ENDTEST
 
-OpenBSD                         March 10, 2020                       IP-TAG(1)
+OpenBSD                        November 24, 2023                     IP-TAG(1)
diff --git a/regress/usr.bin/mandoc/man/IP/tag.out_html b/regress/usr.bin/mandoc/man/IP/tag.out_html
index 4d25b12b6a9..714841986fc 100644
--- a/regress/usr.bin/mandoc/man/IP/tag.out_html
+++ b/regress/usr.bin/mandoc/man/IP/tag.out_html
@@ -5,6 +5,12 @@
   <dd>text</dd>
   <dt id="weak"><a class="permalink" href="#weak"><i> -weak</i></a></dt>
   <dd>text</dd>
+  <dt id="hyphen-minus"><a class="permalink" href="#hyphen-minus">hyphen-minus</a></dt>
+  <dd>text</dd>
+  <dt id="minus-sign"><a class="permalink" href="#minus-sign">minus-sign</a></dt>
+  <dd>text</dd>
+  <dt id="strong~2"><a class="permalink" href="#strong~2">-strong</a></dt>
+  <dd>text</dd>
   <dt> strong</dt>
   <dd>text</dd>
 </dl>
diff --git a/regress/usr.bin/mandoc/man/IP/tag.out_tag b/regress/usr.bin/mandoc/man/IP/tag.out_tag
index 881468ea566..b805843040b 100644
--- a/regress/usr.bin/mandoc/man/IP/tag.out_tag
+++ b/regress/usr.bin/mandoc/man/IP/tag.out_tag
@@ -2,3 +2,6 @@ NAME tag.mandoc_ascii 3
 DESCRIPTION tag.mandoc_ascii 6
 strong tag.mandoc_ascii 11
 weak tag.mandoc_ascii 13
+hyphen-minus tag.mandoc_ascii 15
+minus-sign tag.mandoc_ascii 18
+strong tag.mandoc_ascii 21
diff --git a/regress/usr.bin/mandoc/man/TP/tag.in b/regress/usr.bin/mandoc/man/TP/tag.in
index 34d1e151062..2e7819dec8c 100644
--- a/regress/usr.bin/mandoc/man/TP/tag.in
+++ b/regress/usr.bin/mandoc/man/TP/tag.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: tag.in,v 1.1 2020/03/13 00:31:05 schwarze Exp $
-.TH IP-TAG 1 "March 10, 2020"
+.\" $OpenBSD: tag.in,v 1.2 2023/11/24 04:53:39 schwarze Exp $
+.TH IP-TAG 1 "November 24, 2023"
 .SH NAME
 IP-tag \- automatic tagging of indented blocks
 .SH DESCRIPTION
@@ -25,6 +25,15 @@ text
 \&\fI \-weak\fP
 text
 .TP
+hyphen-minus
+text
+.TP
+minus\-sign
+text
+.TP
+.B \-strong
+text
+.TP
 .B "strong "
 text
 .PP
diff --git a/regress/usr.bin/mandoc/man/TP/tag.out_ascii b/regress/usr.bin/mandoc/man/TP/tag.out_ascii
index 57b69105c89..e8dc7645c4e 100644
--- a/regress/usr.bin/mandoc/man/TP/tag.out_ascii
+++ b/regress/usr.bin/mandoc/man/TP/tag.out_ascii
@@ -18,8 +18,16 @@ DDEESSCCRRIIPPTTIIOONN
 
       _-_w_e_a_k    text
 
+     hyphen-minus
+               text
+
+     minus-sign
+               text
+
+     --ssttrroonngg   text
+
      ssttrroonngg    text
 
      ENDTEST
 
-OpenBSD                         March 10, 2020                       IP-TAG(1)
+OpenBSD                        November 24, 2023                     IP-TAG(1)
diff --git a/regress/usr.bin/mandoc/man/TP/tag.out_html b/regress/usr.bin/mandoc/man/TP/tag.out_html
index 3fbbe41df0a..b3b8aac8b36 100644
--- a/regress/usr.bin/mandoc/man/TP/tag.out_html
+++ b/regress/usr.bin/mandoc/man/TP/tag.out_html
@@ -11,6 +11,12 @@
   <dd>text</dd>
   <dt id="weak"><a class="permalink" href="#weak"><i> -weak</i></a></dt>
   <dd>text</dd>
+  <dt id="hyphen-minus"><a class="permalink" href="#hyphen-minus">hyphen-minus</a></dt>
+  <dd>text</dd>
+  <dt id="minus-sign"><a class="permalink" href="#minus-sign">minus-sign</a></dt>
+  <dd>text</dd>
+  <dt id="strong~2"><a class="permalink" href="#strong~2"><b>-strong</b></a></dt>
+  <dd>text</dd>
   <dt><b>strong </b></dt>
   <dd>text</dd>
 </dl>
diff --git a/regress/usr.bin/mandoc/man/TP/tag.out_tag b/regress/usr.bin/mandoc/man/TP/tag.out_tag
index cf882ddbf3e..3811ac427a9 100644
--- a/regress/usr.bin/mandoc/man/TP/tag.out_tag
+++ b/regress/usr.bin/mandoc/man/TP/tag.out_tag
@@ -3,3 +3,6 @@ DESCRIPTION tag.mandoc_ascii 6
 plain tag.mandoc_ascii 11
 strong tag.mandoc_ascii 17
 weak tag.mandoc_ascii 19
+hyphen-minus tag.mandoc_ascii 21
+minus-sign tag.mandoc_ascii 24
+strong tag.mandoc_ascii 27
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.in b/regress/usr.bin/mandoc/mdoc/Em/tag.in
index eb6ac085160..e1830ef5e0e 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: tag.in,v 1.2 2020/04/02 14:55:29 schwarze Exp $
-.Dd $Mdocdate: April 2 2020 $
+.\" $OpenBSD: tag.in,v 1.3 2023/11/24 04:53:39 schwarze Exp $
+.Dd $Mdocdate: November 24 2023 $
 .Dt EM-TAG 1
 .Os
 .Sh NAME
@@ -14,6 +14,8 @@ text
 .Em three-with-hyphens
 .Xc
 text
+.It Em minus\-sign
+text
 .El
 .Em four
 .Em one
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii
index 283c1120b82..f2734e7c99a 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii
@@ -11,8 +11,11 @@ DDEESSCCRRIIPPTTIIOONN
 
      _t_h_r_e_e_-_w_i_t_h_-_h_y_p_h_e_n_s
              text
+
+     _m_i_n_u_s_-_s_i_g_n
+             text
      _f_o_u_r _o_n_e _f_i_v_e
 
      ENDTEST
 
-OpenBSD                          April 2, 2020                         OpenBSD
+OpenBSD                        November 24, 2023                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.out_html b/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
index f5c47121d37..e977a39fcbb 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_html
@@ -4,6 +4,8 @@
   <dd>text</dd>
   <dt id="three-with-hyphens"><a class="permalink" href="#three-with-hyphens"><i class="Em">three-with-hyphens</i></a></dt>
   <dd>text</dd>
+  <dt id="minus-sign"><a class="permalink" href="#minus-sign"><i class="Em">minus-sign</i></a></dt>
+  <dd>text</dd>
 </dl>
 <a class="permalink" href="#four"><i class="Em" id="four">four</i></a>
   <i class="Em">one</i>
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.out_markdown b/regress/usr.bin/mandoc/mdoc/Em/tag.out_markdown
index c881c2d9cb4..e12495cc3d5 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_markdown
@@ -16,10 +16,14 @@ BEGINTEST
 
 > text
 
+*minus&#45;sign*
+
+> text
+
 *four*
 *one*
 *five*
 
 ENDTEST
 
-OpenBSD - April 2, 2020
+OpenBSD - November 24, 2023
diff --git a/regress/usr.bin/mandoc/mdoc/Em/tag.out_tag b/regress/usr.bin/mandoc/mdoc/Em/tag.out_tag
index 15fcdbc9a09..6c756f40d2a 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_tag
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_tag
@@ -3,5 +3,6 @@ DESCRIPTION tag.mandoc_ascii 6
 one tag.mandoc_ascii 9
 two tag.mandoc_ascii 9
 three-with-hyphens tag.mandoc_ascii 12
-four tag.mandoc_ascii 14
-explicit tag.mandoc_ascii 14
+minus-sign tag.mandoc_ascii 15
+four tag.mandoc_ascii 17
+explicit tag.mandoc_ascii 17
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/tag.in b/regress/usr.bin/mandoc/mdoc/Sy/tag.in
index 1294e17da7d..c95ca857407 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.in
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: tag.in,v 1.1 2020/03/13 00:31:06 schwarze Exp $
-.Dd $Mdocdate: March 13 2020 $
+.\" $OpenBSD: tag.in,v 1.2 2023/11/24 04:53:39 schwarze Exp $
+.Dd $Mdocdate: November 24 2023 $
 .Dt SY-TAG 1
 .Os
 .Sh NAME
@@ -11,7 +11,7 @@ BEGINTEST
 .It Sy one | two
 text
 .It Xo
-.Sy three
+.Sy three-with\-hyphens
 .Xc
 text
 .El
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii
index 3b89cb4157b..5a72c9e6cad 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii
@@ -9,9 +9,10 @@ DDEESSCCRRIIPPTTIIOONN
      oonnee | ttwwoo
              text
 
-     tthhrreeee   text
+     tthhrreeee--wwiitthh--hhyypphheennss
+             text
      ffoouurr oonnee ffiivvee
 
      ENDTEST
 
-OpenBSD                         March 13, 2020                         OpenBSD
+OpenBSD                        November 24, 2023                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
index cca78319209..69b2af7bf51 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_html
@@ -2,7 +2,7 @@
   <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 id="three"><a class="permalink" href="#three"><b class="Sy">three</b></a></dt>
+  <dt id="three-with-hyphens"><a class="permalink" href="#three-with-hyphens"><b class="Sy">three-with-hyphens</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/Sy/tag.out_markdown b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_markdown
index 5382a5e254f..d4686eb72f9 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_markdown
@@ -12,7 +12,7 @@ BEGINTEST
 
 > text
 
-**three**
+**three-with&#45;hyphens**
 
 > text
 
@@ -22,4 +22,4 @@ BEGINTEST
 
 ENDTEST
 
-OpenBSD - March 13, 2020
+OpenBSD - November 24, 2023
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_tag b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_tag
index 8c523f071fb..15fcdbc9a09 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_tag
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_tag
@@ -2,6 +2,6 @@ NAME tag.mandoc_ascii 3
 DESCRIPTION tag.mandoc_ascii 6
 one tag.mandoc_ascii 9
 two tag.mandoc_ascii 9
-three tag.mandoc_ascii 12
-four tag.mandoc_ascii 13
-explicit tag.mandoc_ascii 13
+three-with-hyphens tag.mandoc_ascii 12
+four tag.mandoc_ascii 14
+explicit tag.mandoc_ascii 14