From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4
Received: (qmail 4281 invoked from network); 21 Jun 2022 12:28:05 -0000
Received: from bsd.lv (HELO mandoc.bsd.lv) (66.111.2.12)
  by inbox.vuxu.org with ESMTPUTF8; 21 Jun 2022 12:28:05 -0000
Received: from fantadrom.bsd.lv (localhost [127.0.0.1])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTP id 118c9ea3
	for <ml@inbox.vuxu.org>;
	Tue, 21 Jun 2022 07:28:04 -0500 (EST)
Received: from sysrq.in (sysrq.in [37.79.202.136])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTP id 6ed618c7
	for <tech@mandoc.bsd.lv>;
	Tue, 21 Jun 2022 07:27:57 -0500 (EST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sysrq.in; s=sysrq.in;
	t=1655814473;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=DEX2YxUwuEEZo7y1MqOrL5XmZacHId8fw956YKrCBpo=;
	b=awia6fmVS7rbkTuIs0Sp3vuy00/4NkdGRGvPkQypAtzale94SxE3NTofvqhryk9cVjY4yC
	cAxOBQO0QcW6L6xkwMlBa1IiCuzVDJwuAFGR/lxSDarTwgj+heBYdEQWKE5pmwZUHKgXEL
	UQen5os/uZe9zp2mMsZ6xJsLXHsGm8xUYbYv7rgUZjHh/koxIUtBujBNMb3Q2U/vC4aeGr
	WgRAWQPKdiiO4DjdBvQIo+lEb/KiFyr5C1sE59laB8HM2eNUvllJXcB+IGloQPdmB0KxxU
	ZEnoaqSha/YH4T2JRV7sHMzEgVx03wPUQgvf2emiScIJPScCe+IvZ/s+uPKmRA==
Received: from sysrq.in (localhost [127.0.0.1])
	by sysrq.in (OpenSMTPD) with ESMTPSA id 1aad0307 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tech@mandoc.bsd.lv>;
	Tue, 21 Jun 2022 12:27:52 +0000 (UTC)
From: =?UTF-8?q?Anna=20=E2=80=9CCyberTailor=E2=80=9D?= <cyber@sysrq.in>
To: tech@mandoc.bsd.lv
Subject: [PATCH 1/8] mdoc_html: Accessibility markup for ToC
Date: Tue, 21 Jun 2022 17:27:42 +0500
Message-Id: <20220621122749.11417-2-cyber@sysrq.in>
X-Mailer: git-send-email 2.35.1
In-Reply-To: <20220621122749.11417-1-cyber@sysrq.in>
References: <20220621122749.11417-1-cyber@sysrq.in>
X-Mailinglist: mandoc-tech
Reply-To: tech@mandoc.bsd.lv
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

1. Wrap ToC in the "<nav>" tag
2. Add "doc-toc" DPUB-ARIA role
---
 html.c      | 4 ++++
 html.h      | 1 +
 mdoc_html.c | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/html.c b/html.c
index 65c31b64..4710bab7 100644
--- a/html.c
+++ b/html.c
@@ -110,6 +110,7 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"munderover",	0},
 	{"munder",	0},
 	{"mover",	0},
+	{"nav",		HTML_NLALL},
 };
 
 /* Avoid duplicate HTML id= attributes. */
@@ -708,6 +709,9 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 		case 'i':
 			attr = "id";
 			break;
+		case 'r':
+			attr = "role";
+			break;
 		case '?':
 			attr = arg1;
 			arg1 = va_arg(ap, char *);
diff --git a/html.h b/html.h
index dda19b8a..5e2adc06 100644
--- a/html.h
+++ b/html.h
@@ -70,6 +70,7 @@ enum	htmltag {
 	TAG_MUNDEROVER,
 	TAG_MUNDER,
 	TAG_MOVER,
+	TAG_NAV,
 	TAG_MAX
 };
 
diff --git a/mdoc_html.c b/mdoc_html.c
index 2dde0531..d85df753 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -515,7 +515,7 @@ static int
 mdoc_sh_pre(MDOC_ARGS)
 {
 	struct roff_node	*sn, *subn;
-	struct tag		*t, *tsec, *tsub;
+	struct tag		*t, *tnav, *tsec, *tsub;
 	char			*id;
 	int			 sc;
 
@@ -536,6 +536,7 @@ mdoc_sh_pre(MDOC_ARGS)
 					break;
 		if (sc < 2)
 			break;
+		tnav = print_otag(h, TAG_NAV, "r", "doc-toc");
 		t = print_otag(h, TAG_H1, "c", "Sh");
 		print_text(h, "TABLE OF CONTENTS");
 		print_tagq(h, t);
@@ -568,6 +569,7 @@ mdoc_sh_pre(MDOC_ARGS)
 			print_tagq(h, tsec);
 		}
 		print_tagq(h, t);
+		print_tagq(h, tnav);
 		print_otag(h, TAG_SECTION, "c", "Sh");
 		break;
 	case ROFFT_HEAD:
-- 
2.35.1

--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv