===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.347
retrieving revision 1.353
diff -u -p -r1.347 -r1.353
--- mandoc/mdoc_html.c	2022/07/05 21:25:29	1.347
+++ mandoc/mdoc_html.c	2025/01/25 00:22:28	1.353
@@ -1,6 +1,6 @@
-/* $Id: mdoc_html.c,v 1.347 2022/07/05 21:25:29 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.353 2025/01/25 00:22:28 schwarze Exp $ */
 /*
- * Copyright (c) 2014-2022 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014-2022, 2025 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2022 Anna Vyalkova <cyber@sysrq.in>
  *
@@ -456,7 +456,7 @@ mdoc_root_post(const struct roff_meta *meta, struct ht
 	struct tag	*t;
 
 	t = print_otag(h, TAG_DIV, "cr?", "foot", "doc-pagefooter",
-	    "aria-label", "manual footer line");
+	    "aria-label", "Manual footer line");
 
 	print_otag(h, TAG_SPAN, "c", "foot-left");
 	print_stagq(h, t);
@@ -489,7 +489,7 @@ mdoc_root_pre(const struct roff_meta *meta, struct htm
 		    meta->title, meta->msec);
 
 	t = print_otag(h, TAG_DIV, "cr?", "head", "doc-pageheader",
-	    "aria-label", "manual header line");
+	    "aria-label", "Manual header line");
 
 	print_otag(h, TAG_SPAN, "c", "head-ltitle");
 	print_text(h, title);
@@ -541,7 +541,7 @@ mdoc_sh_pre(MDOC_ARGS)
 		if (sc < 2)
 			break;
 		tnav = print_otag(h, TAG_NAV, "r", "doc-toc");
-		t = print_otag(h, TAG_H1, "c", "Sh");
+		t = print_otag(h, TAG_H2, "c", "Sh");
 		print_text(h, "TABLE OF CONTENTS");
 		print_tagq(h, t);
 		t = print_otag(h, TAG_UL, "c", "Bl-compact");
@@ -576,7 +576,7 @@ mdoc_sh_pre(MDOC_ARGS)
 		print_otag(h, TAG_SECTION, "c", "Sh");
 		break;
 	case ROFFT_HEAD:
-		print_otag_id(h, TAG_H1, "Sh", n);
+		print_otag_id(h, TAG_H2, "Sh", n);
 		break;
 	case ROFFT_BODY:
 		if (n->sec == SEC_AUTHORS)
@@ -597,7 +597,7 @@ mdoc_ss_pre(MDOC_ARGS)
 		print_otag(h, TAG_SECTION, "c", "Ss");
 		break;
 	case ROFFT_HEAD:
-		print_otag_id(h, TAG_H2, "Ss", n);
+		print_otag_id(h, TAG_H3, "Ss", n);
 		break;
 	case ROFFT_BODY:
 		break;
@@ -637,7 +637,7 @@ mdoc_nd_pre(MDOC_ARGS)
 		abort();
 	}
 	print_text(h, "\\(em");
-	print_otag(h, TAG_SPAN, "c", "Nd");
+	print_otag(h, TAG_SPAN, "cr", "Nd", "doc-subtitle");
 	return 1;
 }
 
@@ -1456,7 +1456,7 @@ mdoc_rs_pre(MDOC_ARGS)
 	case ROFFT_BODY:
 		if (n->sec == SEC_SEE_ALSO)
 			print_otag(h, TAG_P, "c", "Pp");
-		print_otag(h, TAG_CITE, "c", "Rs");
+		print_otag(h, TAG_SPAN, "c", "Rs");
 		break;
 	default:
 		abort();
@@ -1494,10 +1494,13 @@ static int
 mdoc__x_pre(MDOC_ARGS)
 {
 	struct roff_node	*nn;
-	const char		*cattr;
+	const unsigned char	*cp;
+	const char		*cattr, *arg;
+	char			*url;
 	enum htmltag		 t;
 
 	t = TAG_SPAN;
+	arg = n->child->string;
 
 	switch (n->tok) {
 	case MDOC__A:
@@ -1507,7 +1510,7 @@ mdoc__x_pre(MDOC_ARGS)
 			print_text(h, "and");
 		break;
 	case MDOC__B:
-		t = TAG_I;
+		t = TAG_CITE;
 		cattr = "RsB";
 		break;
 	case MDOC__C:
@@ -1537,13 +1540,32 @@ mdoc__x_pre(MDOC_ARGS)
 		cattr = "RsQ";
 		break;
 	case MDOC__R:
+		if (strncmp(arg, "RFC ", 4) == 0) {
+			cp = arg += 4;
+			while (isdigit(*cp))
+				cp++;
+			if (*cp == '\0') {
+				mandoc_asprintf(&url, "https://www.rfc-"
+				    "editor.org/rfc/rfc%s.html", arg);
+				print_otag(h, TAG_A, "ch", "RsR", url);
+				free(url);
+				return 1;
+			}
+		}
 		cattr = "RsR";
 		break;
 	case MDOC__T:
-		cattr = "RsT";
+		t = TAG_CITE;
+		if (n->parent != NULL && n->parent->tok == MDOC_Rs &&
+		    n->parent->norm->Rs.quote_T) {
+			print_text(h, "\\(lq");
+			h->flags |= HTML_NOSPACE;
+			cattr = "RsT";
+		} else
+			cattr = "RsB";
 		break;
 	case MDOC__U:
-		print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+		print_otag(h, TAG_A, "ch", "RsU", arg);
 		return 1;
 	case MDOC__V:
 		cattr = "RsV";
@@ -1561,14 +1583,23 @@ mdoc__x_post(MDOC_ARGS)
 {
 	struct roff_node *nn;
 
-	if (n->tok == MDOC__A &&
-	    (nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A &&
-	    ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) &&
-	    ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A))
-		return;
-
-	/* TODO: %U */
-
+	switch (n->tok) {
+	case MDOC__A:
+		if ((nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A &&
+		    ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) &&
+		    ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A))
+			return;
+		break;
+	case MDOC__T:
+		if (n->parent != NULL && n->parent->tok == MDOC_Rs &&
+		    n->parent->norm->Rs.quote_T) {
+			h->flags |= HTML_NOSPACE;
+			print_text(h, "\\(rq");
+		}
+		break;
+	default:
+		break;
+	}
 	if (n->parent == NULL || n->parent->tok != MDOC_Rs)
 		return;