===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.228
retrieving revision 1.237
diff -u -p -r1.228 -r1.237
--- mandoc/mdoc_html.c	2015/04/02 22:48:17	1.228
+++ mandoc/mdoc_html.c	2015/10/06 18:32:19	1.237
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.228 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.237 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -35,7 +35,7 @@
 
 #define	INDENT		 5
 
-#define	MDOC_ARGS	  const struct mdoc_meta *meta, \
+#define	MDOC_ARGS	  const struct roff_meta *meta, \
 			  struct roff_node *n, \
 			  struct html *h
 
@@ -48,7 +48,6 @@ struct	htmlmdoc {
 	void		(*post)(MDOC_ARGS);
 };
 
-static	void		  print_mdoc(MDOC_ARGS);
 static	void		  print_mdoc_head(MDOC_ARGS);
 static	void		  print_mdoc_node(MDOC_ARGS);
 static	void		  print_mdoc_nodelist(MDOC_ARGS);
@@ -264,15 +263,6 @@ static	const char * const lists[LIST_MAX] = {
 };
 
 
-void
-html_mdoc(void *arg, const struct mdoc *mdoc)
-{
-
-	print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc)->child,
-	    (struct html *)arg);
-	putchar('\n');
-}
-
 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of
@@ -331,27 +321,32 @@ synopsis_pre(struct html *h, const struct roff_node *n
 	}
 }
 
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)
 {
-	struct tag	*t, *tt;
 	struct htmlpair	 tag;
+	struct html	*h;
+	struct tag	*t, *tt;
 
 	PAIR_CLASS_INIT(&tag, "mandoc");
+	h = (struct html *)arg;
 
 	if ( ! (HTML_FRAGMENT & h->oflags)) {
 		print_gen_decls(h);
 		t = print_otag(h, TAG_HTML, 0, NULL);
 		tt = print_otag(h, TAG_HEAD, 0, NULL);
-		print_mdoc_head(meta, n, h);
+		print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
 		print_tagq(h, tt);
 		print_otag(h, TAG_BODY, 0, NULL);
 		print_otag(h, TAG_DIV, 1, &tag);
 	} else
 		t = print_otag(h, TAG_DIV, 1, &tag);
 
-	print_mdoc_nodelist(meta, n, h);
+	mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+	print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+	mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
 	print_tagq(h, t);
+	putchar('\n');
 }
 
 static void
@@ -391,9 +386,6 @@ print_mdoc_node(MDOC_ARGS)
 	n->flags &= ~MDOC_ENDED;
 
 	switch (n->type) {
-	case ROFFT_ROOT:
-		child = mdoc_root_pre(meta, n, h);
-		break;
 	case ROFFT_TEXT:
 		/* No tables in this mode... */
 		assert(NULL == h->tblt);
@@ -451,9 +443,6 @@ print_mdoc_node(MDOC_ARGS)
 	print_stagq(h, t);
 
 	switch (n->type) {
-	case ROFFT_ROOT:
-		mdoc_root_post(meta, n, h);
-		break;
 	case ROFFT_EQN:
 		break;
 	default:
@@ -535,7 +524,7 @@ mdoc_root_pre(MDOC_ARGS)
 
 	free(title);
 	free(volume);
-	return(1);
+	return 1;
 }
 
 static int
@@ -547,11 +536,11 @@ mdoc_sh_pre(MDOC_ARGS)
 	case ROFFT_BLOCK:
 		PAIR_CLASS_INIT(&tag, "section");
 		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
+		return 1;
 	case ROFFT_BODY:
 		if (n->sec == SEC_AUTHORS)
 			h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
-		return(1);
+		return 1;
 	default:
 		break;
 	}
@@ -571,7 +560,7 @@ mdoc_sh_pre(MDOC_ARGS)
 	} else
 		print_otag(h, TAG_H1, 0, NULL);
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -582,9 +571,9 @@ mdoc_ss_pre(MDOC_ARGS)
 	if (n->type == ROFFT_BLOCK) {
 		PAIR_CLASS_INIT(&tag, "subsection");
 		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
+		return 1;
 	} else if (n->type == ROFFT_BODY)
-		return(1);
+		return 1;
 
 	bufinit(h);
 	bufcat(h, "x");
@@ -601,7 +590,7 @@ mdoc_ss_pre(MDOC_ARGS)
 	} else
 		print_otag(h, TAG_H2, 0, NULL);
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -615,7 +604,7 @@ mdoc_fl_pre(MDOC_ARGS)
 	/* `Cm' has no leading hyphen. */
 
 	if (MDOC_Cm == n->tok)
-		return(1);
+		return 1;
 
 	print_text(h, "\\-");
 
@@ -625,7 +614,7 @@ mdoc_fl_pre(MDOC_ARGS)
 	     n->next->flags & MDOC_LINE)))
 		h->flags |= HTML_NOSPACE;
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -634,14 +623,14 @@ mdoc_nd_pre(MDOC_ARGS)
 	struct htmlpair	 tag;
 
 	if (n->type != ROFFT_BODY)
-		return(1);
+		return 1;
 
 	/* XXX: this tag in theory can contain block elements. */
 
 	print_text(h, "\\(em");
 	PAIR_CLASS_INIT(&tag, "desc");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -652,21 +641,18 @@ mdoc_nm_pre(MDOC_ARGS)
 	int		 len;
 
 	switch (n->type) {
+	case ROFFT_HEAD:
+		print_otag(h, TAG_TD, 0, NULL);
+		/* FALLTHROUGH */
 	case ROFFT_ELEM:
-		synopsis_pre(h, n);
 		PAIR_CLASS_INIT(&tag, "name");
 		print_otag(h, TAG_B, 1, &tag);
-		if (NULL == n->child && meta->name)
+		if (n->child == NULL && meta->name != NULL)
 			print_text(h, meta->name);
-		return(1);
-	case ROFFT_HEAD:
-		print_otag(h, TAG_TD, 0, NULL);
-		if (NULL == n->child && meta->name)
-			print_text(h, meta->name);
-		return(1);
+		return 1;
 	case ROFFT_BODY:
 		print_otag(h, TAG_TD, 0, NULL);
-		return(1);
+		return 1;
 	default:
 		break;
 	}
@@ -675,11 +661,11 @@ mdoc_nm_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag, "synopsis");
 	print_otag(h, TAG_TABLE, 1, &tag);
 
-	for (len = 0, n = n->child; n; n = n->next)
+	for (len = 0, n = n->head->child; n; n = n->next)
 		if (n->type == ROFFT_TEXT)
 			len += html_strlen(n->string);
 
-	if (0 == len && meta->name)
+	if (len == 0 && meta->name != NULL)
 		len = html_strlen(meta->name);
 
 	SCALE_HS_INIT(&su, len);
@@ -690,7 +676,7 @@ mdoc_nm_pre(MDOC_ARGS)
 	print_otag(h, TAG_COL, 0, NULL);
 	print_otag(h, TAG_TBODY, 0, NULL);
 	print_otag(h, TAG_TR, 0, NULL);
-	return(1);
+	return 1;
 }
 
 static int
@@ -699,7 +685,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	if (NULL == n->child)
-		return(0);
+		return 0;
 
 	PAIR_CLASS_INIT(&tag[0], "link-man");
 
@@ -716,7 +702,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	print_text(h, n->string);
 
 	if (NULL == (n = n->next))
-		return(0);
+		return 0;
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "(");
@@ -724,7 +710,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	print_text(h, n->string);
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
-	return(0);
+	return 0;
 }
 
 static int
@@ -733,7 +719,7 @@ mdoc_ns_pre(MDOC_ARGS)
 
 	if ( ! (MDOC_LINE & n->flags))
 		h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static int
@@ -743,7 +729,7 @@ mdoc_ar_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "arg");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -773,7 +759,7 @@ mdoc_xx_pre(MDOC_ARGS)
 		pp = "UNIX";
 		break;
 	default:
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag, "unix");
@@ -786,7 +772,7 @@ mdoc_xx_pre(MDOC_ARGS)
 		print_text(h, n->child->string);
 		h->flags = flags;
 	}
-	return(0);
+	return 0;
 }
 
 static int
@@ -803,7 +789,7 @@ mdoc_bx_pre(MDOC_ARGS)
 		print_text(h, "BSD");
 	} else {
 		print_text(h, "BSD");
-		return(0);
+		return 0;
 	}
 
 	if (NULL != (n = n->next)) {
@@ -813,7 +799,7 @@ mdoc_bx_pre(MDOC_ARGS)
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -848,7 +834,7 @@ mdoc_it_pre(MDOC_ARGS)
 		case LIST_hyphen:
 			/* FALLTHROUGH */
 		case LIST_enum:
-			return(0);
+			return 0;
 		case LIST_diag:
 			/* FALLTHROUGH */
 		case LIST_hang:
@@ -925,7 +911,7 @@ mdoc_it_pre(MDOC_ARGS)
 		}
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -939,12 +925,12 @@ mdoc_bl_pre(MDOC_ARGS)
 	if (n->type == ROFFT_BODY) {
 		if (LIST_column == n->norm->Bl.type)
 			print_otag(h, TAG_TBODY, 0, NULL);
-		return(1);
+		return 1;
 	}
 
 	if (n->type == ROFFT_HEAD) {
 		if (LIST_column != n->norm->Bl.type)
-			return(0);
+			return 0;
 
 		/*
 		 * For each column, print out the <COL> tag with our
@@ -964,7 +950,7 @@ mdoc_bl_pre(MDOC_ARGS)
 			print_otag(h, TAG_COL, 1, tag);
 		}
 
-		return(0);
+		return 0;
 	}
 
 	SCALE_VS_INIT(&su, 0);
@@ -1014,10 +1000,9 @@ mdoc_bl_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -1057,7 +1042,7 @@ mdoc_ex_pre(MDOC_ARGS)
 		print_text(h, "utility exits\\~0");
 
 	print_text(h, "on success, and\\~>0 if an error occurs.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1067,7 +1052,7 @@ mdoc_em_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "emph");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1077,7 +1062,7 @@ mdoc_d1_pre(MDOC_ARGS)
 	struct roffsu	 su;
 
 	if (n->type != ROFFT_BLOCK)
-		return(1);
+		return 1;
 
 	SCALE_VS_INIT(&su, 0);
 	bufinit(h);
@@ -1096,7 +1081,7 @@ mdoc_d1_pre(MDOC_ARGS)
 		print_otag(h, TAG_CODE, 1, tag);
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -1118,7 +1103,7 @@ mdoc_sx_pre(MDOC_ARGS)
 
 	print_otag(h, TAG_I, 1, tag);
 	print_otag(h, TAG_A, 2, tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1130,7 +1115,7 @@ mdoc_bd_pre(MDOC_ARGS)
 	struct roffsu		 su;
 
 	if (n->type == ROFFT_HEAD)
-		return(0);
+		return 0;
 
 	if (n->type == ROFFT_BLOCK) {
 		comp = n->norm->Bd.comp;
@@ -1144,7 +1129,7 @@ mdoc_bd_pre(MDOC_ARGS)
 		}
 		if ( ! comp)
 			print_paragraph(h);
-		return(1);
+		return 1;
 	}
 
 	/* Handle the -offset argument. */
@@ -1167,7 +1152,7 @@ mdoc_bd_pre(MDOC_ARGS)
 	    DISP_literal != n->norm->Bd.type) {
 		PAIR_CLASS_INIT(&tag[1], "display");
 		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag[1], "lit display");
@@ -1218,7 +1203,7 @@ mdoc_bd_pre(MDOC_ARGS)
 	if (0 == sv)
 		h->flags &= ~HTML_LITERAL;
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1228,7 +1213,7 @@ mdoc_pa_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "file");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1238,7 +1223,7 @@ mdoc_ad_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "addr");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1249,12 +1234,12 @@ mdoc_an_pre(MDOC_ARGS)
 	if (n->norm->An.auth == AUTH_split) {
 		h->flags &= ~HTML_NOSPLIT;
 		h->flags |= HTML_SPLIT;
-		return(0);
+		return 0;
 	}
 	if (n->norm->An.auth == AUTH_nosplit) {
 		h->flags &= ~HTML_SPLIT;
 		h->flags |= HTML_NOSPLIT;
-		return(0);
+		return 0;
 	}
 
 	if (h->flags & HTML_SPLIT)
@@ -1265,7 +1250,7 @@ mdoc_an_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "author");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1276,7 +1261,7 @@ mdoc_cd_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 	PAIR_CLASS_INIT(&tag, "config");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1286,7 +1271,7 @@ mdoc_dv_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "define");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1296,7 +1281,7 @@ mdoc_ev_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "env");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1306,7 +1291,7 @@ mdoc_er_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "errno");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1319,7 +1304,7 @@ mdoc_fa_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag, "farg");
 	if (n->parent->tok != MDOC_Fo) {
 		print_otag(h, TAG_I, 1, &tag);
-		return(1);
+		return 1;
 	}
 
 	for (nn = n->child; nn; nn = nn->next) {
@@ -1337,7 +1322,7 @@ mdoc_fa_pre(MDOC_ARGS)
 		print_text(h, ",");
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1352,14 +1337,14 @@ mdoc_fd_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 
 	if (NULL == (n = n->child))
-		return(0);
+		return 0;
 
 	assert(n->type == ROFFT_TEXT);
 
 	if (strcmp(n->string, "#include")) {
 		PAIR_CLASS_INIT(&tag[0], "macro");
 		print_otag(h, TAG_B, 1, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag[0], "includes");
@@ -1405,7 +1390,7 @@ mdoc_fd_pre(MDOC_ARGS)
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1415,15 +1400,15 @@ mdoc_vt_pre(MDOC_ARGS)
 
 	if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(h, n);
-		return(1);
+		return 1;
 	} else if (n->type == ROFFT_ELEM) {
 		synopsis_pre(h, n);
 	} else if (n->type == ROFFT_HEAD)
-		return(0);
+		return 0;
 
 	PAIR_CLASS_INIT(&tag, "type");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1434,7 +1419,7 @@ mdoc_ft_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 	PAIR_CLASS_INIT(&tag, "ftype");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1524,7 +1509,7 @@ mdoc_fn_pre(MDOC_ARGS)
 		print_text(h, ";");
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1541,14 +1526,14 @@ mdoc_sm_pre(MDOC_ARGS)
 	if ( ! (HTML_NONOSPACE & h->flags))
 		h->flags &= ~HTML_NOSPACE;
 
-	return(0);
+	return 0;
 }
 
 static int
 mdoc_skip_pre(MDOC_ARGS)
 {
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1556,7 +1541,7 @@ mdoc_pp_pre(MDOC_ARGS)
 {
 
 	print_paragraph(h);
-	return(0);
+	return 0;
 }
 
 static int
@@ -1585,7 +1570,7 @@ mdoc_sp_pre(MDOC_ARGS)
 	/* So the div isn't empty: */
 	print_text(h, "\\~");
 
-	return(0);
+	return 0;
 
 }
 
@@ -1595,7 +1580,7 @@ mdoc_lk_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	if (NULL == (n = n->child))
-		return(0);
+		return 0;
 
 	assert(n->type == ROFFT_TEXT);
 
@@ -1610,7 +1595,7 @@ mdoc_lk_pre(MDOC_ARGS)
 	for (n = n->next; n; n = n->next)
 		print_text(h, n->string);
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1634,7 +1619,7 @@ mdoc_mt_pre(MDOC_ARGS)
 		print_tagq(h, t);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1647,22 +1632,21 @@ mdoc_fo_pre(MDOC_ARGS)
 		h->flags |= HTML_NOSPACE;
 		print_text(h, "(");
 		h->flags |= HTML_NOSPACE;
-		return(1);
+		return 1;
 	} else if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(h, n);
-		return(1);
+		return 1;
 	}
 
-	/* XXX: we drop non-initial arguments as per groff. */
+	if (n->child == NULL)
+		return 0;
 
-	assert(n->child);
 	assert(n->child->string);
-
 	PAIR_CLASS_INIT(&tag, "fname");
 	t = print_otag(h, TAG_B, 1, &tag);
 	print_text(h, n->child->string);
 	print_tagq(h, t);
-	return(0);
+	return 0;
 }
 
 static void
@@ -1729,7 +1713,7 @@ mdoc_in_pre(MDOC_ARGS)
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1739,7 +1723,7 @@ mdoc_ic_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "cmd");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1795,7 +1779,7 @@ mdoc_rv_pre(MDOC_ARGS)
 	print_text(h, "errno");
 	print_tagq(h, t);
 	print_text(h, "is set to indicate the error.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1805,7 +1789,7 @@ mdoc_va_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "var");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1815,7 +1799,7 @@ mdoc_ap_pre(MDOC_ARGS)
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "\\(aq");
 	h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static int
@@ -1825,9 +1809,9 @@ mdoc_bf_pre(MDOC_ARGS)
 	struct roffsu	 su;
 
 	if (n->type == ROFFT_HEAD)
-		return(0);
+		return 0;
 	else if (n->type != ROFFT_BODY)
-		return(1);
+		return 1;
 
 	if (FONT_Em == n->norm->Bf.font)
 		PAIR_CLASS_INIT(&tag[0], "emph");
@@ -1849,7 +1833,7 @@ mdoc_bf_pre(MDOC_ARGS)
 	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag[1], h);
 	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1859,7 +1843,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1867,7 +1851,7 @@ mdoc_igndelim_pre(MDOC_ARGS)
 {
 
 	h->flags |= HTML_IGNDELIM;
-	return(1);
+	return 1;
 }
 
 static void
@@ -1884,14 +1868,14 @@ mdoc_rs_pre(MDOC_ARGS)
 	struct htmlpair	 tag;
 
 	if (n->type != ROFFT_BLOCK)
-		return(1);
+		return 1;
 
 	if (n->prev && SEC_SEE_ALSO == n->sec)
 		print_paragraph(h);
 
 	PAIR_CLASS_INIT(&tag, "ref");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1901,7 +1885,7 @@ mdoc_no_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "none");
 	print_otag(h, TAG_CODE, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1911,7 +1895,7 @@ mdoc_li_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "lit");
 	print_otag(h, TAG_CODE, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1921,7 +1905,7 @@ mdoc_sy_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1929,7 +1913,7 @@ mdoc_bt_pre(MDOC_ARGS)
 {
 
 	print_text(h, "is currently in beta test.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1937,7 +1921,7 @@ mdoc_ud_pre(MDOC_ARGS)
 {
 
 	print_text(h, "currently under development.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1950,7 +1934,7 @@ mdoc_lb_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "lib");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -2012,18 +1996,17 @@ mdoc__x_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (MDOC__U != n->tok) {
 		print_otag(h, t, 1, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_HREF_INIT(&tag[1], n->child->string);
 	print_otag(h, TAG_A, 2, tag);
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -2052,17 +2035,16 @@ mdoc_bk_pre(MDOC_ARGS)
 	case ROFFT_BLOCK:
 		break;
 	case ROFFT_HEAD:
-		return(0);
+		return 0;
 	case ROFFT_BODY:
 		if (n->parent->args || 0 == n->prev->nchild)
 			h->flags |= HTML_PREKEEP;
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -2079,7 +2061,7 @@ mdoc_quote_pre(MDOC_ARGS)
 	struct htmlpair	tag;
 
 	if (n->type != ROFFT_BODY)
-		return(1);
+		return 1;
 
 	switch (n->tok) {
 	case MDOC_Ao:
@@ -2109,7 +2091,7 @@ mdoc_quote_pre(MDOC_ARGS)
 	case MDOC_En:
 		if (NULL == n->norm->Es ||
 		    NULL == n->norm->Es->child)
-			return(1);
+			return 1;
 		print_text(h, n->norm->Es->child->string);
 		break;
 	case MDOC_Do:
@@ -2139,11 +2121,10 @@ mdoc_quote_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static void
@@ -2207,7 +2188,6 @@ mdoc_quote_post(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }
 
@@ -2216,7 +2196,7 @@ mdoc_eo_pre(MDOC_ARGS)
 {
 
 	if (n->type != ROFFT_BODY)
-		return(1);
+		return 1;
 
 	if (n->end == ENDBODY_NOT &&
 	    n->parent->head->child == NULL &&
@@ -2227,7 +2207,7 @@ mdoc_eo_pre(MDOC_ARGS)
 	    n->parent->head->child != NULL && (n->child != NULL ||
 	    (n->parent->tail != NULL && n->parent->tail->child != NULL)))
 		h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static void