7 files changed, 79 insertions, 2 deletions
diff --git a/regress/mdoc/No/Makefile b/regress/mdoc/No/Makefile
index 3110bf2b..35aa4e1e 100644
--- a/regress/mdoc/No/Makefile
+++ b/regress/mdoc/No/Makefile
@@ -1,6 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2014/11/17 06:44:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2020/03/13 00:31:06 schwarze Exp $
 
-REGRESS_TARGETS = punct spacing
+REGRESS_TARGETS = punct spacing tag
+TAG_TARGETS	= tag
 LINT_TARGETS	= punct
+HTML_TARGETS	= tag
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/No/punct.out_lint b/regress/mdoc/No/punct.out_lint
index e046da6a..6a65c3b4 100644
--- a/regress/mdoc/No/punct.out_lint
+++ b/regress/mdoc/No/punct.out_lint
@@ -23,3 +23,4 @@ mandoc: punct.in:72:7: WARNING: skipping empty macro: No
 mandoc: punct.in:75:7: WARNING: skipping empty macro: No
 mandoc: punct.in:76:7: WARNING: skipping empty macro: No
 mandoc: punct.in:84:2: WARNING: skipping empty macro: No
+mandoc: punct.in:87:6: STYLE: no blank before trailing delimiter: No a.
diff --git a/regress/mdoc/No/tag.in b/regress/mdoc/No/tag.in
new file mode 100644
index 00000000..700d79da
--- /dev/null
+++ b/regress/mdoc/No/tag.in
@@ -0,0 +1,21 @@
+.\" $OpenBSD: tag.in,v 1.1 2020/03/13 00:31:06 schwarze Exp $
+.Dd $Mdocdate$
+.Dt NO-TAG 1
+.Os
+.Sh NAME
+.Nm No-tag
+.Nd tagging of normal font macros
+.Sh DESCRIPTION
+BEGINTEST
+.Bl -tag -width Ds
+.It No one | two
+text
+.It Xo
+.No three
+.Xc
+text
+.El
+.Tg
+.No four
+.Pp
+ENDTEST
diff --git a/regress/mdoc/No/tag.out_ascii b/regress/mdoc/No/tag.out_ascii
new file mode 100644
index 00000000..44481b02
--- /dev/null
+++ b/regress/mdoc/No/tag.out_ascii
@@ -0,0 +1,17 @@
+NO-TAG(1)                   General Commands Manual                  NO-TAG(1)
+
+NNAAMMEE
+     NNoo--ttaagg - tagging of normal font macros
+
+DDEESSCCRRIIPPTTIIOONN
+     BEGINTEST
+
+     one | two
+             text
+
+     three   text
+     four
+
+     ENDTEST
+
+OpenBSD                         March 13, 2020                         OpenBSD
diff --git a/regress/mdoc/No/tag.out_html b/regress/mdoc/No/tag.out_html
new file mode 100644
index 00000000..32696917
--- /dev/null
+++ b/regress/mdoc/No/tag.out_html
@@ -0,0 +1,9 @@
+<dl class="Bl-tag">
+  <dt><a class="permalink" href="#one"><span class="No" id="one">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>
+  <dd>text</dd>
+</dl>
+<a class="permalink" href="#four"><span class="No" id="four">four</span></a>
diff --git a/regress/mdoc/No/tag.out_markdown b/regress/mdoc/No/tag.out_markdown
new file mode 100644
index 00000000..1590c010
--- /dev/null
+++ b/regress/mdoc/No/tag.out_markdown
@@ -0,0 +1,23 @@
+NO-TAG(1) - General Commands Manual
+
+# NAME
+
+**No-tag** - tagging of normal font macros
+
+# DESCRIPTION
+
+BEGINTEST
+
+one | two
+
+> text
+
+three
+
+> text
+
+four
+
+ENDTEST
+
+OpenBSD - March 13, 2020
diff --git a/regress/mdoc/No/tag.out_tag b/regress/mdoc/No/tag.out_tag
new file mode 100644
index 00000000..94f0cfb2
--- /dev/null
+++ b/regress/mdoc/No/tag.out_tag
@@ -0,0 +1,4 @@
+one 9
+two 9
+three 12
+four 13