From 42d5f8ddfdcc19abca690eba6b3c1bc230e43079 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Fri, 13 Mar 2020 15:32:28 +0000
Subject: Split tagging into a validation part including prioritization in
 tag.{h,c} and {mdoc,man}_validate.c and into a formatting part including
 command line argument checking in term_tag.{h,c}, html.c, and
 {mdoc|man}_{term|html}.c.

Immediate functional benefits include:
* Improved prioritization of automatic tags for .Em and .Sy.
* Avoiding bogus automatic tags when .Em, .Fn, or .Sy are explicitly tagged.
* Explicit tagging of .Er and .Fl now works in HTML output.
* Automatic tagging of .IP and .TP now works in HTML output.
But mainly, this patch provides clean earth to build further improvements on.

Technical changes:
* Main program: Write a tag file for ASCII and UTF-8 output only.
* All formatters: There is no more need to delay writing the tags.
* mdoc(7)+man(7) formatters: No more need for elaborate syntax tree inspection.
* HTML formatter: If available, use the "string" attribute as the tag.
* HTML formatter: New function to write permalinks, to reduce code duplication.

Style cleanup in the vicinity while here:
* mdoc(7) terminal formatter: To set up bold font for children,
defer to termp_bold_pre() rather than calling term_fontpush() manually.
* mdoc(7) terminal formatter: Garbage collect some duplicate functions.
* mdoc(7) HTML formatter: Unify <code> handling, delete redundant functions.
* Where possible, use switch statements rather than if cascades.
* Get rid of some more Yoda notation.

The necessity for such changes was first discussed with kn@, but i didn't
bother him with a request to review the resulting -673/+782 line patch.
---
 regress/mdoc/Dv/Makefile         |  6 ++++--
 regress/mdoc/Dv/tag.in           | 21 +++++++++++++++++++++
 regress/mdoc/Dv/tag.out_ascii    | 17 +++++++++++++++++
 regress/mdoc/Dv/tag.out_html     |  9 +++++++++
 regress/mdoc/Dv/tag.out_markdown | 23 +++++++++++++++++++++++
 regress/mdoc/Dv/tag.out_tag      |  4 ++++
 6 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 regress/mdoc/Dv/tag.in
 create mode 100644 regress/mdoc/Dv/tag.out_ascii
 create mode 100644 regress/mdoc/Dv/tag.out_html
 create mode 100644 regress/mdoc/Dv/tag.out_markdown
 create mode 100644 regress/mdoc/Dv/tag.out_tag

(limited to 'regress/mdoc/Dv')

diff --git a/regress/mdoc/Dv/Makefile b/regress/mdoc/Dv/Makefile
index cfe3ad0b..979e1826 100644
--- a/regress/mdoc/Dv/Makefile
+++ b/regress/mdoc/Dv/Makefile
@@ -1,6 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/02 20:18:42 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2020/03/13 00:31:05 schwarze Exp $
 
-REGRESS_TARGETS	= font noarg
+REGRESS_TARGETS	= font noarg tag
+TAG_TARGETS	= tag
 LINT_TARGETS	= noarg
+HTML_TARGETS	= tag
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Dv/tag.in b/regress/mdoc/Dv/tag.in
new file mode 100644
index 00000000..60d2716b
--- /dev/null
+++ b/regress/mdoc/Dv/tag.in
@@ -0,0 +1,21 @@
+.\" $OpenBSD: tag.in,v 1.1 2020/03/13 00:31:05 schwarze Exp $
+.Dd $Mdocdate$
+.Dt DV-TAG 1
+.Os
+.Sh NAME
+.Nm Dv-tag
+.Nd tagging of defined variable macros
+.Sh DESCRIPTION
+BEGINTEST
+.Bl -tag -width Ds
+.It Dv one | two
+text
+.It Xo
+.Dv three
+.Xc
+text
+.El
+.Tg
+.Dv four
+.Pp
+ENDTEST
diff --git a/regress/mdoc/Dv/tag.out_ascii b/regress/mdoc/Dv/tag.out_ascii
new file mode 100644
index 00000000..119e3509
--- /dev/null
+++ b/regress/mdoc/Dv/tag.out_ascii
@@ -0,0 +1,17 @@
+DV-TAG(1)                   General Commands Manual                  DV-TAG(1)
+
+NNAAMMEE
+     DDvv--ttaagg - tagging of defined variable macros
+
+DDEESSCCRRIIPPTTIIOONN
+     BEGINTEST
+
+     one | two
+             text
+
+     three   text
+     four
+
+     ENDTEST
+
+OpenBSD                         March 13, 2020                         OpenBSD
diff --git a/regress/mdoc/Dv/tag.out_html b/regress/mdoc/Dv/tag.out_html
new file mode 100644
index 00000000..cee78340
--- /dev/null
+++ b/regress/mdoc/Dv/tag.out_html
@@ -0,0 +1,9 @@
+<dl class="Bl-tag">
+  <dt><a class="permalink" href="#one"><code class="Dv" id="one">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>
+  <dd>text</dd>
+</dl>
+<a class="permalink" href="#four"><code class="Dv" id="four">four</code></a>
diff --git a/regress/mdoc/Dv/tag.out_markdown b/regress/mdoc/Dv/tag.out_markdown
new file mode 100644
index 00000000..29b454bb
--- /dev/null
+++ b/regress/mdoc/Dv/tag.out_markdown
@@ -0,0 +1,23 @@
+DV-TAG(1) - General Commands Manual
+
+# NAME
+
+**Dv-tag** - tagging of defined variable macros
+
+# DESCRIPTION
+
+BEGINTEST
+
+`one` | `two`
+
+> text
+
+`three`
+
+> text
+
+`four`
+
+ENDTEST
+
+OpenBSD - March 13, 2020
diff --git a/regress/mdoc/Dv/tag.out_tag b/regress/mdoc/Dv/tag.out_tag
new file mode 100644
index 00000000..94f0cfb2
--- /dev/null
+++ b/regress/mdoc/Dv/tag.out_tag
@@ -0,0 +1,4 @@
+one 9
+two 9
+three 12
+four 13
-- 
cgit