From: "Anna “CyberTailor”" <cyber@sysrq.in>
To: tech@mandoc.bsd.lv
Subject: [PATCH 6/8] mdoc_html: Add accessible description to crosslinks
Date: Tue, 21 Jun 2022 17:27:47 +0500 [thread overview]
Message-ID: <20220621122749.11417-7-cyber@sysrq.in> (raw)
In-Reply-To: <20220621122749.11417-1-cyber@sysrq.in>
Never hear "mdoc, left parenthesis, 7, right parenthesis" again.
---
html.c | 3 +++
mdoc_html.c | 25 +++++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/html.c b/html.c
index 4710bab7..3239a09b 100644
--- a/html.c
+++ b/html.c
@@ -709,6 +709,9 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
case 'i':
attr = "id";
break;
+ case 'l':
+ attr = "aria-label";
+ break;
case 'r':
attr = "role";
break;
diff --git a/mdoc_html.c b/mdoc_html.c
index 076a6bac..cf2e8804 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -667,26 +667,35 @@ mdoc_nm_pre(MDOC_ARGS)
static int
mdoc_xr_pre(MDOC_ARGS)
{
+ char *name = NULL, *section = NULL, *label = NULL;
+
if (NULL == n->child)
return 0;
+ name = n->child->string;
+ label = name;
+ if (NULL != n->child->next)
+ section = n->child->next->string;
+
+ if (NULL != section)
+ mandoc_asprintf(&label, "%s, section %s", name, section);
+
if (h->base_man1)
- print_otag(h, TAG_A, "chM", "Xr",
- n->child->string, n->child->next == NULL ?
- NULL : n->child->next->string);
+ print_otag(h, TAG_A, "clhM", "Xr", label, name, section);
else
- print_otag(h, TAG_A, "c", "Xr");
+ print_otag(h, TAG_A, "cl", "Xr", label);
- n = n->child;
- print_text(h, n->string);
+ free(label);
+
+ print_text(h, name);
- if (NULL == (n = n->next))
+ if (NULL == section)
return 0;
h->flags |= HTML_NOSPACE;
print_text(h, "(");
h->flags |= HTML_NOSPACE;
- print_text(h, n->string);
+ print_text(h, section);
h->flags |= HTML_NOSPACE;
print_text(h, ")");
return 0;
--
2.35.1
--
To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv
next prev parent reply other threads:[~2022-06-21 12:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 12:27 [PATCH 0/8] Make generated HTML more accessible Anna “CyberTailor”
2022-06-21 12:27 ` [PATCH 1/8] mdoc_html: Accessibility markup for ToC Anna “CyberTailor”
2022-06-21 12:27 ` [PATCH 2/8] mdoc_html: Add DPUB-ARIA roles to sections Anna “CyberTailor”
2022-06-24 13:58 ` Ingo Schwarze
2022-06-21 12:27 ` [PATCH 3/8] mdoc_html: Add DPUB-ARIA roles to subsections Anna “CyberTailor”
2022-06-21 12:27 ` [PATCH 4/8] man_html: Add DPUB-ARIA roles to (sub)sections Anna “CyberTailor”
2022-06-21 12:27 ` [PATCH 5/8] man.cgi: add ARIA roles and semantics Anna “CyberTailor”
2022-07-04 16:37 ` Ingo Schwarze
2022-06-21 12:27 ` Anna “CyberTailor” [this message]
2022-06-25 12:58 ` [PATCH 6/8] mdoc_html: Add accessible description to crosslinks Ingo Schwarze
2022-06-21 12:27 ` [PATCH 7/8] mdoc_html: Tell screen readers to skip the header Anna “CyberTailor”
2022-06-26 15:51 ` Ingo Schwarze
2022-06-28 16:33 ` Anna “CyberTailor”
2022-06-21 12:27 ` [PATCH 8/8] man_html: " Anna “CyberTailor”
2022-06-22 19:15 ` [PATCH 0/8] Make generated HTML more accessible Ingo Schwarze
2022-06-22 19:40 ` Anna “CyberTailor”
2022-06-23 13:34 ` Ingo Schwarze
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621122749.11417-7-cyber@sysrq.in \
--to=cyber@sysrq.in \
--cc=tech@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).