Additional tests of automatic tagging involving different kinds of hyphens

after tag.c rev. 1.38.

diff --git a/regress/usr.bin/mandoc/man/IP/tag.in b/regress/usr.bin/mandoc/man/IP/tag.in
index 038fa96..b94d558 100644 (file)
--- 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 26c9532..c3d58bd 100644 (file)
--- a/regress/usr.bin/mandoc/man/IP/tag.out_ascii
+++ b/regress/usr.bin/mandoc/man/IP/tag.out_ascii
@@ -12,8 +12,16 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
       _\b-_\bw_\be_\ba_\bk    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 4d25b12..7148419 100644 (file)
--- 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 881468e..b805843 100644 (file)
--- 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 34d1e15..2e7819d 100644 (file)
--- 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 57b6910..e8dc764 100644 (file)
--- a/regress/usr.bin/mandoc/man/TP/tag.out_ascii
+++ b/regress/usr.bin/mandoc/man/TP/tag.out_ascii
@@ -18,8 +18,16 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
       _\b-_\bw_\be_\ba_\bk    text
 
+     hyphen-minus
+               text
+
+     minus-sign
+               text
+
+     -\b-s\bst\btr\bro\bon\bng\bg   text
+
      s\bst\btr\bro\bon\bng\bg    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 3fbbe41..b3b8aac 100644 (file)
--- 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 cf882dd..3811ac4 100644 (file)
--- 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 eb6ac08..e1830ef 100644 (file)
--- 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 283c112..f2734e7 100644 (file)
--- a/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Em/tag.out_ascii
@@ -11,8 +11,11 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
      _\bt_\bh_\br_\be_\be_\b-_\bw_\bi_\bt_\bh_\b-_\bh_\by_\bp_\bh_\be_\bn_\bs
              text
+
+     _\bm_\bi_\bn_\bu_\bs_\b-_\bs_\bi_\bg_\bn
+             text
      _\bf_\bo_\bu_\br _\bo_\bn_\be _\bf_\bi_\bv_\be
 
      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 f5c4712..e977a39 100644 (file)
--- 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 c881c2d..e12495c 100644 (file)
--- 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-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 15fcdbc..6c756f4 100644 (file)
--- 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 1294e17..c95ca85 100644 (file)
--- 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 3b89cb4..5a72c9e 100644 (file)
--- a/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sy/tag.out_ascii
@@ -9,9 +9,10 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      o\bon\bne\be | t\btw\bwo\bo
              text
 
-     t\bth\bhr\bre\bee\be   text
+     t\bth\bhr\bre\bee\be-\b-w\bwi\bit\bth\bh-\b-h\bhy\byp\bph\bhe\ben\bns\bs
+             text
      f\bfo\bou\bur\br o\bon\bne\be f\bfi\biv\bve\be
 
      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 cca7831..69b2af7 100644 (file)
--- 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 5382a5e..d4686eb 100644 (file)
--- 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-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 8c523f0..15fcdbc 100644 (file)
--- 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