===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.8
retrieving revision 1.217
diff -u -p -r1.8 -r1.217
--- mandoc/mdoc_html.c	2009/09/24 13:18:37	1.8
+++ mandoc/mdoc_html.c	2014/12/23 09:31:46	1.217
@@ -1,6 +1,7 @@
-/*	$Id: mdoc_html.c,v 1.8 2009/09/24 13:18:37 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.217 2014/12/23 09:31:46 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,31 +15,33 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
-#include <sys/param.h>
-#include <sys/queue.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "html.h"
+#include "mandoc_aux.h"
 #include "mdoc.h"
+#include "out.h"
+#include "html.h"
+#include "main.h"
 
 #define	INDENT		 5
-#define	HALFINDENT	 3
 
-#define	MDOC_ARGS	  const struct mdoc_meta *m, \
+#define	MDOC_ARGS	  const struct mdoc_meta *meta, \
 			  const struct mdoc_node *n, \
 			  struct html *h
-#define	MAN_ARGS	  const struct man_meta *m, \
-			  const struct man_node *n, \
-			  struct html *h
 
+#ifndef MIN
+#define	MIN(a,b)	((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
+
 struct	htmlmdoc {
 	int		(*pre)(MDOC_ARGS);
 	void		(*post)(MDOC_ARGS);
@@ -48,38 +51,29 @@ 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);
+static	void		  synopsis_pre(struct html *,
+				const struct mdoc_node *);
 
-static	int		  a2width(const char *);
-static	int		  a2offs(const char *);
-static	int		  a2list(const struct mdoc_node *);
+static	void		  a2width(const char *, struct roffsu *);
 
 static	void		  mdoc_root_post(MDOC_ARGS);
 static	int		  mdoc_root_pre(MDOC_ARGS);
-static	int		  mdoc_tbl_pre(MDOC_ARGS, int);
-static	int		  mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int);
-static	int		  mdoc_tbl_body_pre(MDOC_ARGS, int, int);
-static	int		  mdoc_tbl_head_pre(MDOC_ARGS, int, int);
 
+static	void		  mdoc__x_post(MDOC_ARGS);
+static	int		  mdoc__x_pre(MDOC_ARGS);
 static	int		  mdoc_ad_pre(MDOC_ARGS);
 static	int		  mdoc_an_pre(MDOC_ARGS);
 static	int		  mdoc_ap_pre(MDOC_ARGS);
-static	void		  mdoc_aq_post(MDOC_ARGS);
-static	int		  mdoc_aq_pre(MDOC_ARGS);
 static	int		  mdoc_ar_pre(MDOC_ARGS);
 static	int		  mdoc_bd_pre(MDOC_ARGS);
 static	int		  mdoc_bf_pre(MDOC_ARGS);
-static	void		  mdoc_bl_post(MDOC_ARGS);
+static	void		  mdoc_bk_post(MDOC_ARGS);
+static	int		  mdoc_bk_pre(MDOC_ARGS);
 static	int		  mdoc_bl_pre(MDOC_ARGS);
-static	void		  mdoc_bq_post(MDOC_ARGS);
-static	int		  mdoc_bq_pre(MDOC_ARGS);
-static	void		  mdoc_brq_post(MDOC_ARGS);
-static	int		  mdoc_brq_pre(MDOC_ARGS);
 static	int		  mdoc_bt_pre(MDOC_ARGS);
 static	int		  mdoc_bx_pre(MDOC_ARGS);
 static	int		  mdoc_cd_pre(MDOC_ARGS);
 static	int		  mdoc_d1_pre(MDOC_ARGS);
-static	void		  mdoc_dq_post(MDOC_ARGS);
-static	int		  mdoc_dq_pre(MDOC_ARGS);
 static	int		  mdoc_dv_pre(MDOC_ARGS);
 static	int		  mdoc_fa_pre(MDOC_ARGS);
 static	int		  mdoc_fd_pre(MDOC_ARGS);
@@ -93,6 +87,7 @@ static	int		  mdoc_ex_pre(MDOC_ARGS);
 static	void		  mdoc_fo_post(MDOC_ARGS);
 static	int		  mdoc_fo_pre(MDOC_ARGS);
 static	int		  mdoc_ic_pre(MDOC_ARGS);
+static	int		  mdoc_igndelim_pre(MDOC_ARGS);
 static	int		  mdoc_in_pre(MDOC_ARGS);
 static	int		  mdoc_it_pre(MDOC_ARGS);
 static	int		  mdoc_lb_pre(MDOC_ARGS);
@@ -102,20 +97,19 @@ static	int		  mdoc_mt_pre(MDOC_ARGS);
 static	int		  mdoc_ms_pre(MDOC_ARGS);
 static	int		  mdoc_nd_pre(MDOC_ARGS);
 static	int		  mdoc_nm_pre(MDOC_ARGS);
+static	int		  mdoc_no_pre(MDOC_ARGS);
 static	int		  mdoc_ns_pre(MDOC_ARGS);
-static	void		  mdoc_op_post(MDOC_ARGS);
-static	int		  mdoc_op_pre(MDOC_ARGS);
 static	int		  mdoc_pa_pre(MDOC_ARGS);
 static	void		  mdoc_pf_post(MDOC_ARGS);
-static	int		  mdoc_pf_pre(MDOC_ARGS);
-static	void		  mdoc_pq_post(MDOC_ARGS);
-static	int		  mdoc_pq_pre(MDOC_ARGS);
+static	int		  mdoc_pp_pre(MDOC_ARGS);
+static	void		  mdoc_quote_post(MDOC_ARGS);
+static	int		  mdoc_quote_pre(MDOC_ARGS);
 static	int		  mdoc_rs_pre(MDOC_ARGS);
 static	int		  mdoc_rv_pre(MDOC_ARGS);
 static	int		  mdoc_sh_pre(MDOC_ARGS);
+static	int		  mdoc_skip_pre(MDOC_ARGS);
+static	int		  mdoc_sm_pre(MDOC_ARGS);
 static	int		  mdoc_sp_pre(MDOC_ARGS);
-static	void		  mdoc_sq_post(MDOC_ARGS);
-static	int		  mdoc_sq_pre(MDOC_ARGS);
 static	int		  mdoc_ss_pre(MDOC_ARGS);
 static	int		  mdoc_sx_pre(MDOC_ARGS);
 static	int		  mdoc_sy_pre(MDOC_ARGS);
@@ -125,297 +119,262 @@ static	int		  mdoc_vt_pre(MDOC_ARGS);
 static	int		  mdoc_xr_pre(MDOC_ARGS);
 static	int		  mdoc_xx_pre(MDOC_ARGS);
 
-#ifdef __linux__
-extern	size_t	  	  strlcpy(char *, const char *, size_t);
-extern	size_t	  	  strlcat(char *, const char *, size_t);
-#endif
-
 static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_ap_pre, NULL}, /* Ap */
 	{NULL, NULL}, /* Dd */
 	{NULL, NULL}, /* Dt */
 	{NULL, NULL}, /* Os */
 	{mdoc_sh_pre, NULL }, /* Sh */
-	{mdoc_ss_pre, NULL }, /* Ss */ 
-	{mdoc_sp_pre, NULL}, /* Pp */ 
+	{mdoc_ss_pre, NULL }, /* Ss */
+	{mdoc_pp_pre, NULL}, /* Pp */
 	{mdoc_d1_pre, NULL}, /* D1 */
 	{mdoc_d1_pre, NULL}, /* Dl */
 	{mdoc_bd_pre, NULL}, /* Bd */
 	{NULL, NULL}, /* Ed */
-	{mdoc_bl_pre, mdoc_bl_post}, /* Bl */
+	{mdoc_bl_pre, NULL}, /* Bl */
 	{NULL, NULL}, /* El */
 	{mdoc_it_pre, NULL}, /* It */
-	{mdoc_ad_pre, NULL}, /* Ad */ 
+	{mdoc_ad_pre, NULL}, /* Ad */
 	{mdoc_an_pre, NULL}, /* An */
 	{mdoc_ar_pre, NULL}, /* Ar */
 	{mdoc_cd_pre, NULL}, /* Cd */
 	{mdoc_fl_pre, NULL}, /* Cm */
-	{mdoc_dv_pre, NULL}, /* Dv */ 
-	{mdoc_er_pre, NULL}, /* Er */ 
-	{mdoc_ev_pre, NULL}, /* Ev */ 
+	{mdoc_dv_pre, NULL}, /* Dv */
+	{mdoc_er_pre, NULL}, /* Er */
+	{mdoc_ev_pre, NULL}, /* Ev */
 	{mdoc_ex_pre, NULL}, /* Ex */
-	{mdoc_fa_pre, NULL}, /* Fa */ 
-	{mdoc_fd_pre, NULL}, /* Fd */ 
+	{mdoc_fa_pre, NULL}, /* Fa */
+	{mdoc_fd_pre, NULL}, /* Fd */
 	{mdoc_fl_pre, NULL}, /* Fl */
-	{mdoc_fn_pre, NULL}, /* Fn */ 
-	{mdoc_ft_pre, NULL}, /* Ft */ 
-	{mdoc_ic_pre, NULL}, /* Ic */ 
-	{mdoc_in_pre, NULL}, /* In */ 
+	{mdoc_fn_pre, NULL}, /* Fn */
+	{mdoc_ft_pre, NULL}, /* Ft */
+	{mdoc_ic_pre, NULL}, /* Ic */
+	{mdoc_in_pre, NULL}, /* In */
 	{mdoc_li_pre, NULL}, /* Li */
-	{mdoc_nd_pre, NULL}, /* Nd */ 
-	{mdoc_nm_pre, NULL}, /* Nm */ 
-	{mdoc_op_pre, mdoc_op_post}, /* Op */
-	{NULL, NULL}, /* Ot */
+	{mdoc_nd_pre, NULL}, /* Nd */
+	{mdoc_nm_pre, NULL}, /* Nm */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Op */
+	{mdoc_ft_pre, NULL}, /* Ot */
 	{mdoc_pa_pre, NULL}, /* Pa */
 	{mdoc_rv_pre, NULL}, /* Rv */
-	{NULL, NULL}, /* St */ 
+	{NULL, NULL}, /* St */
 	{mdoc_va_pre, NULL}, /* Va */
-	{mdoc_vt_pre, NULL}, /* Vt */ 
+	{mdoc_vt_pre, NULL}, /* Vt */
 	{mdoc_xr_pre, NULL}, /* Xr */
-	{NULL, NULL}, /* %A */
-	{NULL, NULL}, /* %B */
-	{NULL, NULL}, /* %D */
-	{NULL, NULL}, /* %I */
-	{NULL, NULL}, /* %J */
-	{NULL, NULL}, /* %N */
-	{NULL, NULL}, /* %O */
-	{NULL, NULL}, /* %P */
-	{NULL, NULL}, /* %R */
-	{NULL, NULL}, /* %T */
-	{NULL, NULL}, /* %V */
+	{mdoc__x_pre, mdoc__x_post}, /* %A */
+	{mdoc__x_pre, mdoc__x_post}, /* %B */
+	{mdoc__x_pre, mdoc__x_post}, /* %D */
+	{mdoc__x_pre, mdoc__x_post}, /* %I */
+	{mdoc__x_pre, mdoc__x_post}, /* %J */
+	{mdoc__x_pre, mdoc__x_post}, /* %N */
+	{mdoc__x_pre, mdoc__x_post}, /* %O */
+	{mdoc__x_pre, mdoc__x_post}, /* %P */
+	{mdoc__x_pre, mdoc__x_post}, /* %R */
+	{mdoc__x_pre, mdoc__x_post}, /* %T */
+	{mdoc__x_pre, mdoc__x_post}, /* %V */
 	{NULL, NULL}, /* Ac */
-	{mdoc_aq_pre, mdoc_aq_post}, /* Ao */
-	{mdoc_aq_pre, mdoc_aq_post}, /* Aq */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Ao */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Aq */
 	{NULL, NULL}, /* At */
 	{NULL, NULL}, /* Bc */
-	{mdoc_bf_pre, NULL}, /* Bf */ 
-	{mdoc_bq_pre, mdoc_bq_post}, /* Bo */
-	{mdoc_bq_pre, mdoc_bq_post}, /* Bq */
+	{mdoc_bf_pre, NULL}, /* Bf */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Bo */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Bq */
 	{mdoc_xx_pre, NULL}, /* Bsx */
 	{mdoc_bx_pre, NULL}, /* Bx */
-	{NULL, NULL}, /* Db */
+	{mdoc_skip_pre, NULL}, /* Db */
 	{NULL, NULL}, /* Dc */
-	{mdoc_dq_pre, mdoc_dq_post}, /* Do */
-	{mdoc_dq_pre, mdoc_dq_post}, /* Dq */
-	{NULL, NULL}, /* Ec */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Do */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Dq */
+	{NULL, NULL}, /* Ec */ /* FIXME: no space */
 	{NULL, NULL}, /* Ef */
-	{mdoc_em_pre, NULL}, /* Em */ 
-	{NULL, NULL}, /* Eo */
+	{mdoc_em_pre, NULL}, /* Em */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Eo */
 	{mdoc_xx_pre, NULL}, /* Fx */
-	{mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
-	{NULL, NULL}, /* No */
+	{mdoc_ms_pre, NULL}, /* Ms */
+	{mdoc_no_pre, NULL}, /* No */
 	{mdoc_ns_pre, NULL}, /* Ns */
 	{mdoc_xx_pre, NULL}, /* Nx */
 	{mdoc_xx_pre, NULL}, /* Ox */
 	{NULL, NULL}, /* Pc */
-	{mdoc_pf_pre, mdoc_pf_post}, /* Pf */
-	{mdoc_pq_pre, mdoc_pq_post}, /* Po */
-	{mdoc_pq_pre, mdoc_pq_post}, /* Pq */
+	{mdoc_igndelim_pre, mdoc_pf_post}, /* Pf */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Po */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Pq */
 	{NULL, NULL}, /* Qc */
-	{mdoc_sq_pre, mdoc_sq_post}, /* Ql */
-	{mdoc_dq_pre, mdoc_dq_post}, /* Qo */
-	{mdoc_dq_pre, mdoc_dq_post}, /* Qq */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Ql */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Qo */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Qq */
 	{NULL, NULL}, /* Re */
 	{mdoc_rs_pre, NULL}, /* Rs */
 	{NULL, NULL}, /* Sc */
-	{mdoc_sq_pre, mdoc_sq_post}, /* So */
-	{mdoc_sq_pre, mdoc_sq_post}, /* Sq */
-	{NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+	{mdoc_quote_pre, mdoc_quote_post}, /* So */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Sq */
+	{mdoc_sm_pre, NULL}, /* Sm */
 	{mdoc_sx_pre, NULL}, /* Sx */
 	{mdoc_sy_pre, NULL}, /* Sy */
 	{NULL, NULL}, /* Tn */
 	{mdoc_xx_pre, NULL}, /* Ux */
 	{NULL, NULL}, /* Xc */
 	{NULL, NULL}, /* Xo */
-	{mdoc_fo_pre, mdoc_fo_post}, /* Fo */ 
-	{NULL, NULL}, /* Fc */ 
-	{mdoc_op_pre, mdoc_op_post}, /* Oo */
+	{mdoc_fo_pre, mdoc_fo_post}, /* Fo */
+	{NULL, NULL}, /* Fc */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Oo */
 	{NULL, NULL}, /* Oc */
-	{NULL, NULL}, /* Bk */
+	{mdoc_bk_pre, mdoc_bk_post}, /* Bk */
 	{NULL, NULL}, /* Ek */
 	{mdoc_bt_pre, NULL}, /* Bt */
 	{NULL, NULL}, /* Hf */
-	{NULL, NULL}, /* Fr */
+	{mdoc_em_pre, NULL}, /* Fr */
 	{mdoc_ud_pre, NULL}, /* Ud */
 	{mdoc_lb_pre, NULL}, /* Lb */
-	{mdoc_sp_pre, NULL}, /* Lp */ 
-	{mdoc_lk_pre, NULL}, /* Lk */ 
-	{mdoc_mt_pre, NULL}, /* Mt */ 
-	{mdoc_brq_pre, mdoc_brq_post}, /* Brq */ 
-	{mdoc_brq_pre, mdoc_brq_post}, /* Bro */ 
-	{NULL, NULL}, /* Brc */ 
-	{NULL, NULL}, /* %C */ 
-	{NULL, NULL}, /* Es */  /* TODO */
-	{NULL, NULL}, /* En */  /* TODO */
-	{mdoc_xx_pre, NULL}, /* Dx */ 
-	{NULL, NULL}, /* %Q */ 
+	{mdoc_pp_pre, NULL}, /* Lp */
+	{mdoc_lk_pre, NULL}, /* Lk */
+	{mdoc_mt_pre, NULL}, /* Mt */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Brq */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Bro */
+	{NULL, NULL}, /* Brc */
+	{mdoc__x_pre, mdoc__x_post}, /* %C */
+	{mdoc_skip_pre, NULL}, /* Es */
+	{mdoc_quote_pre, mdoc_quote_post}, /* En */
+	{mdoc_xx_pre, NULL}, /* Dx */
+	{mdoc__x_pre, mdoc__x_post}, /* %Q */
 	{mdoc_sp_pre, NULL}, /* br */
-	{mdoc_sp_pre, NULL}, /* sp */ 
+	{mdoc_sp_pre, NULL}, /* sp */
+	{mdoc__x_pre, mdoc__x_post}, /* %U */
+	{NULL, NULL}, /* Ta */
+	{mdoc_skip_pre, NULL}, /* ll */
 };
 
-static	char		  buf[BUFSIZ]; /* XXX */
+static	const char * const lists[LIST_MAX] = {
+	NULL,
+	"list-bul",
+	"list-col",
+	"list-dash",
+	"list-diag",
+	"list-enum",
+	"list-hang",
+	"list-hyph",
+	"list-inset",
+	"list-item",
+	"list-ohang",
+	"list-tag"
+};
 
-#define	bufcat(x)	  (void)strlcat(buf, (x), BUFSIZ) 
-#define	bufinit()	  buf[0] = 0
-#define	buffmt(...)	  (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__)
 
 void
-html_mdoc(void *arg, const struct mdoc *m)
+html_mdoc(void *arg, const struct mdoc *mdoc)
 {
-	struct html 	*h;
-	struct tag	*t;
 
-	h = (struct html *)arg;
-
-	print_gen_doctype(h);
-	t = print_otag(h, TAG_HTML, 0, NULL);
-	print_mdoc(mdoc_meta(m), mdoc_node(m), h);
-	print_tagq(h, t);
-
-	printf("\n");
+	print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc),
+	    (struct html *)arg);
+	putchar('\n');
 }
 
-
-static int
-a2list(const struct mdoc_node *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
+ * the value.
+ */
+static void
+a2width(const char *p, struct roffsu *su)
 {
-	int		 i;
 
-	assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
-	assert(n->args);
-
-	for (i = 0; i < (int)n->args->argc; i++) 
-		switch (n->args->argv[i].arg) {
-		case (MDOC_Enum):
-			/* FALLTHROUGH */
-		case (MDOC_Dash):
-			/* FALLTHROUGH */
-		case (MDOC_Hyphen):
-			/* FALLTHROUGH */
-		case (MDOC_Bullet):
-			/* FALLTHROUGH */
-		case (MDOC_Tag):
-			/* FALLTHROUGH */
-		case (MDOC_Hang):
-			/* FALLTHROUGH */
-		case (MDOC_Inset):
-			/* FALLTHROUGH */
-		case (MDOC_Diag):
-			/* FALLTHROUGH */
-		case (MDOC_Item):
-			/* FALLTHROUGH */
-		case (MDOC_Column):
-			/* FALLTHROUGH */
-		case (MDOC_Ohang):
-			return(n->args->argv[i].arg);
-		default:
-			break;
-		}
-
-	abort();
-	/* NOTREACHED */
+	if (a2roffsu(p, su, SCALE_MAX) < 2) {
+		su->unit = SCALE_EN;
+		su->scale = html_strlen(p);
+	}
 }
 
-
-static int
-a2width(const char *p)
+/*
+ * See the same function in mdoc_term.c for documentation.
+ */
+static void
+synopsis_pre(struct html *h, const struct mdoc_node *n)
 {
-	int		 i, len;
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+	if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+		return;
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p) + 2);
+	if (n->prev->tok == n->tok &&
+	    MDOC_Fo != n->tok &&
+	    MDOC_Ft != n->tok &&
+	    MDOC_Fn != n->tok) {
+		print_otag(h, TAG_BR, 0, NULL);
+		return;
+	}
 
-	return(len + 2);
-}
-
-
-static int
-a2offs(const char *p)
-{
-	int		 len, i;
-
-	if (0 == strcmp(p, "left"))
-		return(0);
-	if (0 == strcmp(p, "indent"))
-		return(INDENT + 1);
-	if (0 == strcmp(p, "indent-two"))
-		return((INDENT + 1) * 2);
-
-	if (0 == (len = (int)strlen(p)))
-		return(0);
-
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
+	switch (n->prev->tok) {
+	case MDOC_Fd:
+		/* FALLTHROUGH */
+	case MDOC_Fn:
+		/* FALLTHROUGH */
+	case MDOC_Fo:
+		/* FALLTHROUGH */
+	case MDOC_In:
+		/* FALLTHROUGH */
+	case MDOC_Vt:
+		print_paragraph(h);
+		break;
+	case MDOC_Ft:
+		if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+			print_paragraph(h);
 			break;
-
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
-
-	return(len);
+		}
+		/* FALLTHROUGH */
+	default:
+		print_otag(h, TAG_BR, 0, NULL);
+		break;
+	}
 }
 
-
 static void
 print_mdoc(MDOC_ARGS)
 {
-	struct tag	*t;
+	struct tag	*t, *tt;
 	struct htmlpair	 tag;
 
-	t = print_otag(h, TAG_HEAD, 0, NULL);
-	print_mdoc_head(m, n, h);
-	print_tagq(h, t);
+	PAIR_CLASS_INIT(&tag, "mandoc");
 
-	t = print_otag(h, TAG_BODY, 0, NULL);
+	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_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);
 
-	tag.key = ATTR_CLASS;
-	tag.val = "body";
-	print_otag(h, TAG_DIV, 1, &tag);
-
-	print_mdoc_nodelist(m, n, h);
+	print_mdoc_nodelist(meta, n, h);
 	print_tagq(h, t);
 }
 
-
-/* ARGSUSED */
 static void
 print_mdoc_head(MDOC_ARGS)
 {
-	char		b[BUFSIZ];
 
 	print_gen_head(h);
+	bufinit(h);
+	bufcat(h, meta->title);
+	if (meta->msec)
+		bufcat_fmt(h, "(%s)", meta->msec);
+	if (meta->arch)
+		bufcat_fmt(h, " (%s)", meta->arch);
 
-	(void)snprintf(b, BUFSIZ - 1, 
-			"%s(%d)", m->title, m->msec);
-
-	if (m->arch) {
-		(void)strlcat(b, " (", BUFSIZ);
-		(void)strlcat(b, m->arch, BUFSIZ);
-		(void)strlcat(b, ")", BUFSIZ);
-	}
-
 	print_otag(h, TAG_TITLE, 0, NULL);
-	print_text(h, b);
+	print_text(h, h->buf);
 }
 
-
 static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
-	print_mdoc_node(m, n, h);
+	print_mdoc_node(meta, n, h);
 	if (n->next)
-		print_mdoc_nodelist(m, n->next, h);
+		print_mdoc_nodelist(meta, n->next, h);
 }
 
-
 static void
 print_mdoc_node(MDOC_ARGS)
 {
@@ -423,256 +382,247 @@ print_mdoc_node(MDOC_ARGS)
 	struct tag	*t;
 
 	child = 1;
-	t = SLIST_FIRST(&h->tags);
+	t = h->tags.head;
 
-	bufinit();
-
 	switch (n->type) {
-	case (MDOC_ROOT):
-		child = mdoc_root_pre(m, n, h);
+	case MDOC_ROOT:
+		child = mdoc_root_pre(meta, n, h);
 		break;
-	case (MDOC_TEXT):
+	case MDOC_TEXT:
+		/* No tables in this mode... */
+		assert(NULL == h->tblt);
+
+		/*
+		 * Make sure that if we're in a literal mode already
+		 * (i.e., within a <PRE>) don't print the newline.
+		 */
+		if (' ' == *n->string && MDOC_LINE & n->flags)
+			if ( ! (HTML_LITERAL & h->flags))
+				print_otag(h, TAG_BR, 0, NULL);
+		if (MDOC_DELIMC & n->flags)
+			h->flags |= HTML_NOSPACE;
 		print_text(h, n->string);
+		if (MDOC_DELIMO & n->flags)
+			h->flags |= HTML_NOSPACE;
+		return;
+	case MDOC_EQN:
+		print_eqn(h, n->eqn);
 		break;
+	case MDOC_TBL:
+		/*
+		 * This will take care of initialising all of the table
+		 * state data for the first table, then tearing it down
+		 * for the last one.
+		 */
+		print_tbl(h, n->span);
+		return;
 	default:
-		if (mdocs[n->tok].pre)
-			child = (*mdocs[n->tok].pre)(m, n, h);
+		/*
+		 * Close out the current table, if it's open, and unset
+		 * the "meta" table state.  This will be reopened on the
+		 * next table element.
+		 */
+		if (h->tblt != NULL) {
+			print_tblclose(h);
+			t = h->tags.head;
+		}
+		assert(h->tblt == NULL);
+		if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
+			child = (*mdocs[n->tok].pre)(meta, n, h);
 		break;
 	}
 
+	if (HTML_KEEP & h->flags) {
+		if (n->prev ? (n->prev->lastline != n->line) :
+		    (n->parent && n->parent->line != n->line)) {
+			h->flags &= ~HTML_KEEP;
+			h->flags |= HTML_PREKEEP;
+		}
+	}
+
 	if (child && n->child)
-		print_mdoc_nodelist(m, n->child, h);
+		print_mdoc_nodelist(meta, n->child, h);
 
 	print_stagq(h, t);
 
-	bufinit();
-
 	switch (n->type) {
-	case (MDOC_ROOT):
-		mdoc_root_post(m, n, h);
+	case MDOC_ROOT:
+		mdoc_root_post(meta, n, h);
 		break;
-	case (MDOC_TEXT):
+	case MDOC_EQN:
 		break;
 	default:
-		if (mdocs[n->tok].post)
-			(*mdocs[n->tok].post)(m, n, h);
+		if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED)
+			break;
+		(*mdocs[n->tok].post)(meta, n, h);
+		if (n->end != ENDBODY_NOT)
+			n->pending->flags |= MDOC_ENDED;
+		if (n->end == ENDBODY_NOSPACE)
+			h->flags |= HTML_NOSPACE;
 		break;
 	}
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-	struct tm	 tm;
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag;
 	struct tag	*t, *tt;
-	char		 b[BUFSIZ];
 
-	(void)localtime_r(&m->date, &tm);
+	PAIR_CLASS_INIT(&tag, "foot");
+	t = print_otag(h, TAG_TABLE, 1, &tag);
 
-	if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-		err(EXIT_FAILURE, "strftime");
+	print_otag(h, TAG_TBODY, 0, NULL);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "footer";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = "width: 100%;";
-	t = print_otag(h, TAG_TABLE, 2, tag);
 	tt = print_otag(h, TAG_TR, 0, NULL);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 50%;";
-	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+	PAIR_CLASS_INIT(&tag, "foot-date");
+	print_otag(h, TAG_TD, 1, &tag);
+	print_text(h, meta->date);
 	print_stagq(h, tt);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 50%; text-align: right;";
-	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, m->os);
+	PAIR_CLASS_INIT(&tag, "foot-os");
+	print_otag(h, TAG_TD, 1, &tag);
+	print_text(h, meta->os);
 	print_tagq(h, t);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag;
 	struct tag	*t, *tt;
-	char		 b[BUFSIZ], title[BUFSIZ];
+	char		*volume, *title;
 
-	(void)strlcpy(b, m->vol, BUFSIZ);
+	if (NULL == meta->arch)
+		volume = mandoc_strdup(meta->vol);
+	else
+		mandoc_asprintf(&volume, "%s (%s)",
+		    meta->vol, meta->arch);
 
-	if (m->arch) {
-		(void)strlcat(b, " (", BUFSIZ);
-		(void)strlcat(b, m->arch, BUFSIZ);
-		(void)strlcat(b, ")", BUFSIZ);
-	}
+	if (NULL == meta->msec)
+		title = mandoc_strdup(meta->title);
+	else
+		mandoc_asprintf(&title, "%s(%s)",
+		    meta->title, meta->msec);
 
-	(void)snprintf(title, BUFSIZ - 1, 
-			"%s(%d)", m->title, m->msec);
+	PAIR_CLASS_INIT(&tag, "head");
+	t = print_otag(h, TAG_TABLE, 1, &tag);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "header";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = "width: 100%;";
-	t = print_otag(h, TAG_TABLE, 2, tag);
+	print_otag(h, TAG_TBODY, 0, NULL);
+
 	tt = print_otag(h, TAG_TR, 0, NULL);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 33%;";
-	print_otag(h, TAG_TD, 1, tag);
+	PAIR_CLASS_INIT(&tag, "head-ltitle");
+	print_otag(h, TAG_TD, 1, &tag);
 	print_text(h, title);
 	print_stagq(h, tt);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 33%; text-align: center;";
-	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+	PAIR_CLASS_INIT(&tag, "head-vol");
+	print_otag(h, TAG_TD, 1, &tag);
+	print_text(h, volume);
 	print_stagq(h, tt);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 33%; text-align: right;";
-	print_otag(h, TAG_TD, 1, tag);
+	PAIR_CLASS_INIT(&tag, "head-rtitle");
+	print_otag(h, TAG_TD, 1, &tag);
 	print_text(h, title);
 	print_tagq(h, t);
 
+	free(title);
+	free(volume);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag;
 
-	if (MDOC_HEAD == n->type) {
-		tag[0].key = ATTR_CLASS;
-		tag[0].val = "sec-head";
-		print_otag(h, TAG_DIV, 1, tag);
-		print_otag(h, TAG_SPAN, 1, tag);
-
-		for (nn = n->child; nn; nn = nn->next) {
-			bufcat(nn->string);
-			if (nn->next)
-				bufcat(" ");
-		}
-		tag[0].key = ATTR_NAME;
-		tag[0].val = buf;
-		print_otag(h, TAG_A, 1, tag);
+	switch (n->type) {
+	case MDOC_BLOCK:
+		PAIR_CLASS_INIT(&tag, "section");
+		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
-	} else if (MDOC_BLOCK == n->type) {
-		tag[0].key = ATTR_CLASS;
-		tag[0].val = "sec-block";
+	case MDOC_BODY:
+		if (n->sec == SEC_AUTHORS)
+			h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
+		return(1);
+	default:
+		break;
+	}
 
-		if (n->prev && NULL == n->prev->body->child) {
-			print_otag(h, TAG_DIV, 1, tag);
-			return(1);
-		}
+	bufinit(h);
+	bufcat(h, "x");
 
-		bufcat("margin-top: 1em;");
-		if (NULL == n->next)
-			bufcat("margin-bottom: 1em;");
-
-		tag[1].key = ATTR_STYLE;
-		tag[1].val = buf;
-
-		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
+	for (n = n->child; n && MDOC_TEXT == n->type; ) {
+		bufcat_id(h, n->string);
+		if (NULL != (n = n->next))
+			bufcat_id(h, " ");
 	}
 
-	buffmt("margin-left: %dem;", INDENT);
-	
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "sec-body";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = buf;
+	if (NULL == n) {
+		PAIR_ID_INIT(&tag, h->buf);
+		print_otag(h, TAG_H1, 1, &tag);
+	} else
+		print_otag(h, TAG_H1, 0, NULL);
 
-	print_otag(h, TAG_DIV, 2, tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	int		 	 i;
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag;
 
-	i = 0;
-
-	if (MDOC_BODY == n->type) {
-		tag[i].key = ATTR_CLASS;
-		tag[i++].val = "ssec-body";
-		if (n->parent->next && n->child) {
-			bufcat("margin-bottom: 1em;");
-			tag[i].key = ATTR_STYLE;
-			tag[i++].val = buf;
-		}
-		print_otag(h, TAG_DIV, i, tag);
+	if (MDOC_BLOCK == n->type) {
+		PAIR_CLASS_INIT(&tag, "subsection");
+		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
-	} else if (MDOC_BLOCK == n->type) {
-		tag[i].key = ATTR_CLASS;
-		tag[i++].val = "ssec-block";
-		if (n->prev) {
-			bufcat("margin-top: 1em;");
-			tag[i].key = ATTR_STYLE;
-			tag[i++].val = buf;
-		}
-		print_otag(h, TAG_DIV, i, tag);
+	} else if (MDOC_BODY == n->type)
 		return(1);
-	}
 
-	buffmt("margin-left: -%dem;", INDENT - HALFINDENT);
+	bufinit(h);
+	bufcat(h, "x");
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "ssec-head";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = buf;
-
-	print_otag(h, TAG_DIV, 2, tag);
-	print_otag(h, TAG_SPAN, 1, tag);
-
-	bufinit();
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(nn->string);
-		if (nn->next)
-			bufcat(" ");
+	for (n = n->child; n && MDOC_TEXT == n->type; ) {
+		bufcat_id(h, n->string);
+		if (NULL != (n = n->next))
+			bufcat_id(h, " ");
 	}
-	tag[0].key = ATTR_NAME;
-	tag[0].val = buf;
-	print_otag(h, TAG_A, 1, tag);
 
+	if (NULL == n) {
+		PAIR_ID_INIT(&tag, h->buf);
+		print_otag(h, TAG_H2, 1, &tag);
+	} else
+		print_otag(h, TAG_H2, 0, NULL);
+
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "flag";
+	PAIR_CLASS_INIT(&tag, "flag");
+	print_otag(h, TAG_B, 1, &tag);
 
-	print_otag(h, TAG_SPAN, 1, &tag);
-	if (MDOC_Fl == n->tok) {
-		print_text(h, "\\-");
+	/* `Cm' has no leading hyphen. */
+
+	if (MDOC_Cm == n->tok)
+		return(1);
+
+	print_text(h, "\\-");
+
+	if ( ! (n->nchild == 0 &&
+	    (n->next == NULL ||
+	     n->next->type == MDOC_TEXT ||
+	     n->next->flags & MDOC_LINE)))
 		h->flags |= HTML_NOSPACE;
-	}
+
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
@@ -681,796 +631,682 @@ mdoc_nd_pre(MDOC_ARGS)
 	if (MDOC_BODY != n->type)
 		return(1);
 
-	/* XXX - this can contain block elements! */
+	/* XXX: this tag in theory can contain block elements. */
+
 	print_text(h, "\\(em");
-	tag.key = ATTR_CLASS;
-	tag.val = "desc-body";
+	PAIR_CLASS_INIT(&tag, "desc");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_op_pre(MDOC_ARGS)
+mdoc_nm_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
+	struct roffsu	 su;
+	int		 len;
 
-	if (MDOC_BODY != n->type)
+	switch (n->type) {
+	case MDOC_ELEM:
+		synopsis_pre(h, n);
+		PAIR_CLASS_INIT(&tag, "name");
+		print_otag(h, TAG_B, 1, &tag);
+		if (NULL == n->child && meta->name)
+			print_text(h, meta->name);
 		return(1);
+	case MDOC_HEAD:
+		print_otag(h, TAG_TD, 0, NULL);
+		if (NULL == n->child && meta->name)
+			print_text(h, meta->name);
+		return(1);
+	case MDOC_BODY:
+		print_otag(h, TAG_TD, 0, NULL);
+		return(1);
+	default:
+		break;
+	}
 
-	/* XXX - this can contain block elements! */
-	print_text(h, "\\(lB");
-	h->flags |= HTML_NOSPACE;
-	tag.key = ATTR_CLASS;
-	tag.val = "opt";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
-}
+	synopsis_pre(h, n);
+	PAIR_CLASS_INIT(&tag, "synopsis");
+	print_otag(h, TAG_TABLE, 1, &tag);
 
+	for (len = 0, n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			len += html_strlen(n->string);
 
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
-{
+	if (0 == len && meta->name)
+		len = html_strlen(meta->name);
 
-	if (MDOC_BODY != n->type) 
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rB");
-}
-
-
-static int
-mdoc_nm_pre(MDOC_ARGS)
-{
-	struct htmlpair	tag;
-
-	if ( ! (HTML_NEWLINE & h->flags))
-		if (SEC_SYNOPSIS == n->sec) {
-			tag.key = ATTR_STYLE;
-			tag.val = "clear: both;";
-			print_otag(h, TAG_BR, 1, &tag);
-		}
-
-	tag.key = ATTR_CLASS;
-	tag.val = "name";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-	if (NULL == n->child)
-		print_text(h, m->name);
-
+	SCALE_HS_INIT(&su, len);
+	bufinit(h);
+	bufcat_su(h, "width", &su);
+	PAIR_STYLE_INIT(&tag, h);
+	print_otag(h, TAG_COL, 1, &tag);
+	print_otag(h, TAG_COL, 0, NULL);
+	print_otag(h, TAG_TBODY, 0, NULL);
+	print_otag(h, TAG_TR, 0, NULL);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	const char		*name, *sec;
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag[2];
 
-	nn = n->child;
-	name = nn && nn->string ? nn->string : "";
-	nn = nn ? nn->next : NULL;
-	sec = nn && nn->string ? nn->string : "";
+	if (NULL == n->child)
+		return(0);
 
-	buffmt("%s%s%s.html", name, name && sec ? "." : "", sec);
+	PAIR_CLASS_INIT(&tag[0], "link-man");
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-man";
-	tag[1].key = ATTR_HREF;
-	tag[1].val = buf;
-	print_otag(h, TAG_A, 2, tag);
+	if (h->base_man) {
+		buffmt_man(h, n->child->string,
+		    n->child->next ?
+		    n->child->next->string : NULL);
+		PAIR_HREF_INIT(&tag[1], h->buf);
+		print_otag(h, TAG_A, 2, tag);
+	} else
+		print_otag(h, TAG_A, 1, tag);
 
-	nn = n->child;
-	print_text(h, nn->string);
-	if (NULL == (nn = nn->next))
+	n = n->child;
+	print_text(h, n->string);
+
+	if (NULL == (n = n->next))
 		return(0);
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "(");
 	h->flags |= HTML_NOSPACE;
-	print_text(h, nn->string);
+	print_text(h, n->string);
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
-
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-	h->flags |= HTML_NOSPACE;
+	if ( ! (MDOC_LINE & n->flags))
+		h->flags |= HTML_NOSPACE;
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
 	struct htmlpair tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "arg";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "arg");
+	print_otag(h, TAG_I, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
 	const char	*pp;
 	struct htmlpair	 tag;
+	int		 flags;
 
 	switch (n->tok) {
-	case (MDOC_Bsx):
-		pp = "BSDI BSD/OS";
+	case MDOC_Bsx:
+		pp = "BSD/OS";
 		break;
-	case (MDOC_Dx):
-		pp = "DragonFlyBSD";
+	case MDOC_Dx:
+		pp = "DragonFly";
 		break;
-	case (MDOC_Fx):
+	case MDOC_Fx:
 		pp = "FreeBSD";
 		break;
-	case (MDOC_Nx):
+	case MDOC_Nx:
 		pp = "NetBSD";
 		break;
-	case (MDOC_Ox):
+	case MDOC_Ox:
 		pp = "OpenBSD";
 		break;
-	case (MDOC_Ux):
+	case MDOC_Ux:
 		pp = "UNIX";
 		break;
 	default:
 		return(1);
 	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "unix";
-
+	PAIR_CLASS_INIT(&tag, "unix");
 	print_otag(h, TAG_SPAN, 1, &tag);
+
 	print_text(h, pp);
-	return(1);
+	if (n->child) {
+		flags = h->flags;
+		h->flags |= HTML_KEEP;
+		print_text(h, n->child->string);
+		h->flags = flags;
+	}
+	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
+	struct htmlpair	 tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "unix";
-
+	PAIR_CLASS_INIT(&tag, "unix");
 	print_otag(h, TAG_SPAN, 1, &tag);
 
-	for (nn = n->child; nn; nn = nn->next)
-		print_mdoc_node(m, nn, h);
+	if (NULL != (n = n->child)) {
+		print_text(h, n->string);
+		h->flags |= HTML_NOSPACE;
+		print_text(h, "BSD");
+	} else {
+		print_text(h, "BSD");
+		return(0);
+	}
 
-	if (n->child)
+	if (NULL != (n = n->next)) {
 		h->flags |= HTML_NOSPACE;
+		print_text(h, "-");
+		h->flags |= HTML_NOSPACE;
+		print_text(h, n->string);
+	}
 
-	print_text(h, "BSD");
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
+mdoc_it_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag;
+	struct roffsu	 su;
+	enum mdoc_list	 type;
+	struct htmlpair	 tag[2];
+	const struct mdoc_node *bl;
 
-	switch (t) {
-	case (MDOC_Column):
-		/* FALLTHROUGH */
-	case (MDOC_Item):
-		/* FALLTHROUGH */
-	case (MDOC_Ohang):
-		buffmt("margin-left: %dem; clear: both;", o);
-		break;
-	default:
-		buffmt("margin-left: %dem; clear: both;", w + o);
-		break;
-	}
+	bl = n->parent;
+	while (bl && MDOC_Bl != bl->tok)
+		bl = bl->parent;
 
-	if ( ! c && MDOC_Column != t) {
-	       if (n->prev && n->prev->body->child)
-		       bufcat("padding-top: 1em;");
-	       else if (NULL == n->prev)
-		       bufcat("padding-top: 1em;");
-	}
+	assert(bl);
 
-	tag.key = ATTR_STYLE;
-	tag.val = buf;
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
-}
+	type = bl->norm->Bl.type;
 
+	assert(lists[type]);
+	PAIR_CLASS_INIT(&tag[0], lists[type]);
 
-/* ARGSUSED */
-static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
-{
+	bufinit(h);
 
-	print_otag(h, TAG_DIV, 0, NULL);
+	if (MDOC_HEAD == n->type) {
+		switch (type) {
+		case LIST_bullet:
+			/* FALLTHROUGH */
+		case LIST_dash:
+			/* FALLTHROUGH */
+		case LIST_item:
+			/* FALLTHROUGH */
+		case LIST_hyphen:
+			/* FALLTHROUGH */
+		case LIST_enum:
+			return(0);
+		case LIST_diag:
+			/* FALLTHROUGH */
+		case LIST_hang:
+			/* FALLTHROUGH */
+		case LIST_inset:
+			/* FALLTHROUGH */
+		case LIST_ohang:
+			/* FALLTHROUGH */
+		case LIST_tag:
+			SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_DT, 2, tag);
+			if (LIST_diag != type)
+				break;
+			PAIR_CLASS_INIT(&tag[0], "diag");
+			print_otag(h, TAG_B, 1, tag);
+			break;
+		case LIST_column:
+			break;
+		default:
+			break;
+		}
+	} else if (MDOC_BODY == n->type) {
+		switch (type) {
+		case LIST_bullet:
+			/* FALLTHROUGH */
+		case LIST_hyphen:
+			/* FALLTHROUGH */
+		case LIST_dash:
+			/* FALLTHROUGH */
+		case LIST_enum:
+			/* FALLTHROUGH */
+		case LIST_item:
+			SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_LI, 2, tag);
+			break;
+		case LIST_diag:
+			/* FALLTHROUGH */
+		case LIST_hang:
+			/* FALLTHROUGH */
+		case LIST_inset:
+			/* FALLTHROUGH */
+		case LIST_ohang:
+			/* FALLTHROUGH */
+		case LIST_tag:
+			if (NULL == bl->norm->Bl.width) {
+				print_otag(h, TAG_DD, 1, tag);
+				break;
+			}
+			a2width(bl->norm->Bl.width, &su);
+			bufcat_su(h, "margin-left", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_DD, 2, tag);
+			break;
+		case LIST_column:
+			SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_TD, 2, tag);
+			break;
+		default:
+			break;
+		}
+	} else {
+		switch (type) {
+		case LIST_column:
+			print_otag(h, TAG_TR, 1, tag);
+			break;
+		default:
+			break;
+		}
+	}
+
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
+mdoc_bl_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag;
-	struct ord	*ord;
-	char		 nbuf[BUFSIZ];
+	int		 i;
+	struct htmlpair	 tag[3];
+	struct roffsu	 su;
+	char		 buf[BUFSIZ];
 
-	switch (t) {
-	case (MDOC_Item):
-		/* FALLTHROUGH */
-	case (MDOC_Ohang):
-		print_otag(h, TAG_DIV, 0, NULL);
-		break;
-	case (MDOC_Column):
-		buffmt("min-width: %dem;", w);
-		bufcat("clear: none;");
-		if (n->next && MDOC_HEAD == n->next->type)
-			bufcat("float: left;");
-		tag.key = ATTR_STYLE;
-		tag.val = buf;
-		print_otag(h, TAG_DIV, 1, &tag);
-		break;
-	default:
-		buffmt("margin-left: -%dem; min-width: %dem;", 
-				w, w ? w - 1 : 0);
-		bufcat("clear: left;");
-		if (n->next && n->next->child)
-			bufcat("float: left;");
-		bufcat("padding-right: 1em;");
-		tag.key = ATTR_STYLE;
-		tag.val = buf;
-		print_otag(h, TAG_DIV, 1, &tag);
-		break;
+	if (MDOC_BODY == n->type) {
+		if (LIST_column == n->norm->Bl.type)
+			print_otag(h, TAG_TBODY, 0, NULL);
+		return(1);
 	}
 
-	switch (t) {
-	case (MDOC_Diag):
-		tag.key = ATTR_CLASS;
-		tag.val = "diag";
-		print_otag(h, TAG_SPAN, 1, &tag);
-		break;
-	case (MDOC_Enum):
-		ord = SLIST_FIRST(&h->ords);
-		assert(ord);
-		nbuf[BUFSIZ - 1] = 0;
-		(void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
-		print_text(h, nbuf);
-		return(0);
-	case (MDOC_Dash):
-		print_text(h, "\\(en");
-		return(0);
-	case (MDOC_Hyphen):
-		print_text(h, "\\(hy");
-		return(0);
-	case (MDOC_Bullet):
-		print_text(h, "\\(bu");
-		return(0);
-	default:
-		break;
-	}
+	if (MDOC_HEAD == n->type) {
+		if (LIST_column != n->norm->Bl.type)
+			return(0);
 
-	return(1);
-}
+		/*
+		 * For each column, print out the <COL> tag with our
+		 * suggested width.  The last column gets min-width, as
+		 * in terminal mode it auto-sizes to the width of the
+		 * screen and we want to preserve that behaviour.
+		 */
 
+		for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
+			bufinit(h);
+			a2width(n->norm->Bl.cols[i], &su);
+			if (i < (int)n->norm->Bl.ncols - 1)
+				bufcat_su(h, "width", &su);
+			else
+				bufcat_su(h, "min-width", &su);
+			PAIR_STYLE_INIT(&tag[0], h);
+			print_otag(h, TAG_COL, 1, tag);
+		}
 
-static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
-{
-	int			 i, w, o, c, wp;
-	const struct mdoc_node	*bl, *nn;
+		return(0);
+	}
 
-	bl = n->parent->parent;
-	if (MDOC_BLOCK != n->type) 
-		bl = bl->parent;
+	SCALE_VS_INIT(&su, 0);
+	bufinit(h);
+	bufcat_su(h, "margin-top", &su);
+	bufcat_su(h, "margin-bottom", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
 
-	/* FIXME: fmt_vspace() equivalent. */
+	assert(lists[n->norm->Bl.type]);
+	(void)strlcpy(buf, "list ", BUFSIZ);
+	(void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+	PAIR_INIT(&tag[1], ATTR_CLASS, buf);
 
-	assert(bl->args);
+	/* Set the block's left-hand margin. */
 
-	w = o = c = 0;
-	wp = -1;
-
-	for (i = 0; i < (int)bl->args->argc; i++) 
-		if (MDOC_Width == bl->args->argv[i].arg) {
-			assert(bl->args->argv[i].sz);
-			wp = i;
-			w = a2width(bl->args->argv[i].value[0]);
-		} else if (MDOC_Offset == bl->args->argv[i].arg) {
-			assert(bl->args->argv[i].sz);
-			o = a2offs(bl->args->argv[i].value[0]);
-		} else if (MDOC_Compact == bl->args->argv[i].arg) 
-			c = 1;
-	
-	if (MDOC_HEAD == n->type && MDOC_Column == type) {
-		nn = n->parent->child;
-		assert(nn && MDOC_HEAD == nn->type);
-		for (i = 0; nn && nn != n; nn = nn->next, i++)
-			/* Counter... */ ;
-		assert(nn);
-		if (wp >= 0 && i < (int)bl->args[wp].argv->sz)
-			w = a2width(bl->args->argv[wp].value[i]);
+	if (n->norm->Bl.offs) {
+		a2width(n->norm->Bl.offs, &su);
+		bufcat_su(h, "margin-left", &su);
 	}
 
-	switch (type) {
-	case (MDOC_Enum):
+	switch (n->norm->Bl.type) {
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (MDOC_Dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (MDOC_Hyphen):
+	case LIST_hyphen:
 		/* FALLTHROUGH */
-	case (MDOC_Bullet):
-		if (w < 4)
-			w = 4;
+	case LIST_item:
+		print_otag(h, TAG_UL, 2, tag);
 		break;
-	case (MDOC_Inset):
+	case LIST_enum:
+		print_otag(h, TAG_OL, 2, tag);
+		break;
+	case LIST_diag:
 		/* FALLTHROUGH */
-	case (MDOC_Diag):
-		w = 1;
+	case LIST_hang:
+		/* FALLTHROUGH */
+	case LIST_inset:
+		/* FALLTHROUGH */
+	case LIST_ohang:
+		/* FALLTHROUGH */
+	case LIST_tag:
+		print_otag(h, TAG_DL, 2, tag);
 		break;
-	default:
-		if (0 == w)
-			w = 10;
+	case LIST_column:
+		print_otag(h, TAG_TABLE, 2, tag);
 		break;
-	}
-
-	switch (n->type) {
-	case (MDOC_BLOCK):
-		break;
-	case (MDOC_HEAD):
-		return(mdoc_tbl_head_pre(m, n, h, type, w));
-	case (MDOC_BODY):
-		return(mdoc_tbl_body_pre(m, n, h, type, w));
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bl_pre(MDOC_ARGS)
-{
-	struct ord	*ord;
-
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	if (MDOC_Enum != a2list(n))
-		return(1);
-
-	ord = malloc(sizeof(struct ord));
-	if (NULL == ord)
-		err(EXIT_FAILURE, "malloc");
-	ord->cookie = n;
-	ord->pos = 1;
-	SLIST_INSERT_HEAD(&h->ords, ord, entry);
-
 	return(1);
 }
 
-
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
-{
-	struct ord	*ord;
-
-	if (MDOC_BLOCK != n->type)
-		return;
-	if (MDOC_Enum != a2list(n))
-		return;
-
-	ord = SLIST_FIRST(&h->ords);
-	assert(ord);
-	SLIST_REMOVE_HEAD(&h->ords, entry);
-	free(ord);
-}
-
-
 static int
-mdoc_it_pre(MDOC_ARGS)
+mdoc_ex_pre(MDOC_ARGS)
 {
-	int		 type;
+	struct tag	*t;
+	struct htmlpair	 tag;
+	int		 nchild;
 
-	if (MDOC_BLOCK == n->type)
-		type = a2list(n->parent->parent);
-	else
-		type = a2list(n->parent->parent->parent);
+	if (n->prev)
+		print_otag(h, TAG_BR, 0, NULL);
 
-	return(mdoc_tbl_pre(m, n, h, type));
-}
+	PAIR_CLASS_INIT(&tag, "utility");
 
-
-/* ARGSUSED */
-static int
-mdoc_ex_pre(MDOC_ARGS)
-{
-	const struct mdoc_node	*nn;
-	struct tag		*t;
-	struct htmlpair		 tag;
-
 	print_text(h, "The");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "utility";
+	nchild = n->nchild;
+	for (n = n->child; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
 
-	for (nn = n->child; nn; nn = nn->next) {
-		t = print_otag(h, TAG_SPAN, 1, &tag);
-		print_text(h, nn->string);
+		t = print_otag(h, TAG_B, 1, &tag);
+		print_text(h, n->string);
 		print_tagq(h, t);
 
-		h->flags |= HTML_NOSPACE;
-
-		if (nn->next && NULL == nn->next->next)
-			print_text(h, ", and");
-		else if (nn->next)
+		if (nchild > 2 && n->next) {
+			h->flags |= HTML_NOSPACE;
 			print_text(h, ",");
-		else
-			h->flags &= ~HTML_NOSPACE;
+		}
+
+		if (n->next && NULL == n->next->next)
+			print_text(h, "and");
 	}
 
-	if (n->child->next)
-		print_text(h, "utilities exit");
+	if (nchild > 1)
+		print_text(h, "utilities exit\\~0");
 	else
-		print_text(h, "utility exits");
+		print_text(h, "utility exits\\~0");
 
-       	print_text(h, "0 on success, and >0 if an error occurs.");
+	print_text(h, "on success, and\\~>0 if an error occurs.");
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_dq_pre(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(lq");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_dq_post(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rq");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_pq_pre(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\&(");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_pq_post(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	print_text(h, ")");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_sq_pre(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(oq");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_sq_post(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(aq");
-}
-
-
-/* ARGSUSED */
-static int
 mdoc_em_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "emph";
-
+	PAIR_CLASS_INIT(&tag, "emph");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag[2];
+	struct htmlpair	 tag[2];
+	struct roffsu	 su;
 
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	buffmt("margin-left: %dem;", INDENT);
+	SCALE_VS_INIT(&su, 0);
+	bufinit(h);
+	bufcat_su(h, "margin-top", &su);
+	bufcat_su(h, "margin-bottom", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
+	print_otag(h, TAG_BLOCKQUOTE, 1, tag);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "lit";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = buf;
+	/* BLOCKQUOTE needs a block body. */
 
-	print_otag(h, TAG_DIV, 2, tag);
+	PAIR_CLASS_INIT(&tag[0], "display");
+	print_otag(h, TAG_DIV, 1, tag);
+
+	if (MDOC_Dl == n->tok) {
+		PAIR_CLASS_INIT(&tag[0], "lit");
+		print_otag(h, TAG_CODE, 1, tag);
+	}
+
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag[2];
 
-	bufcat("#");
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(nn->string);
-		if (nn->next)
-			bufcat(" ");
+	bufinit(h);
+	bufcat(h, "#x");
+
+	for (n = n->child; n; ) {
+		bufcat_id(h, n->string);
+		if (NULL != (n = n->next))
+			bufcat_id(h, " ");
 	}
 
-	tag[0].key = ATTR_HREF;
-	tag[0].val = buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "link-sec";
+	PAIR_CLASS_INIT(&tag[0], "link-sec");
+	PAIR_HREF_INIT(&tag[1], h->buf);
 
+	print_otag(h, TAG_I, 1, tag);
 	print_otag(h, TAG_A, 2, tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_aq_pre(MDOC_ARGS)
+mdoc_bd_pre(MDOC_ARGS)
 {
+	struct htmlpair		 tag[2];
+	int			 comp, sv;
+	const struct mdoc_node	*nn;
+	struct roffsu		 su;
 
-	if (MDOC_BODY != n->type)
+	if (MDOC_HEAD == n->type)
+		return(0);
+
+	if (MDOC_BLOCK == n->type) {
+		comp = n->norm->Bd.comp;
+		for (nn = n; nn && ! comp; nn = nn->parent) {
+			if (MDOC_BLOCK != nn->type)
+				continue;
+			if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
+				comp = 1;
+			if (nn->prev)
+				break;
+		}
+		if ( ! comp)
+			print_paragraph(h);
 		return(1);
-	print_text(h, "\\(la");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
+	}
 
+	/* Handle the -offset argument. */
 
-/* ARGSUSED */
-static void
-mdoc_aq_post(MDOC_ARGS)
-{
+	if (n->norm->Bd.offs == NULL ||
+	    ! strcmp(n->norm->Bd.offs, "left"))
+		SCALE_HS_INIT(&su, 0);
+	else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+		SCALE_HS_INIT(&su, INDENT);
+	else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+		SCALE_HS_INIT(&su, INDENT * 2);
+	else
+		a2width(n->norm->Bd.offs, &su);
 
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(ra");
-}
+	bufinit(h);
+	bufcat_su(h, "margin-left", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
 
+	if (DISP_unfilled != n->norm->Bd.type &&
+	    DISP_literal != n->norm->Bd.type) {
+		PAIR_CLASS_INIT(&tag[1], "display");
+		print_otag(h, TAG_DIV, 2, tag);
+		return(1);
+	}
 
-/* ARGSUSED */
-static int
-mdoc_bd_pre(MDOC_ARGS)
-{
-	struct htmlpair	 	 tag[2];
-	int		 	 t, c, o, i;
-	const struct mdoc_node	*bl;
+	PAIR_CLASS_INIT(&tag[1], "lit display");
+	print_otag(h, TAG_PRE, 2, tag);
 
-	/* FIXME: fmt_vspace() shit. */
+	/* This can be recursive: save & set our literal state. */
 
-	if (MDOC_BLOCK == n->type)
-		bl = n;
-	else if (MDOC_HEAD == n->type)
-		return(0);
-	else
-		bl = n->parent;
+	sv = h->flags & HTML_LITERAL;
+	h->flags |= HTML_LITERAL;
 
-	t = o = c = 0;
-
-	for (i = 0; i < (int)bl->args->argc; i++) 
-		switch (bl->args->argv[i].arg) {
-		case (MDOC_Offset):
-			assert(bl->args->argv[i].sz);
-			o = a2offs (bl->args->argv[i].value[0]);
-			break;
-		case (MDOC_Compact):
-			c = 1;
-			break;
-		case (MDOC_Ragged):
+	for (nn = n->child; nn; nn = nn->next) {
+		print_mdoc_node(meta, nn, h);
+		/*
+		 * If the printed node flushes its own line, then we
+		 * needn't do it here as well.  This is hacky, but the
+		 * notion of selective eoln whitespace is pretty dumb
+		 * anyway, so don't sweat it.
+		 */
+		switch (nn->tok) {
+		case MDOC_Sm:
 			/* FALLTHROUGH */
-		case (MDOC_Filled):
+		case MDOC_br:
 			/* FALLTHROUGH */
-		case (MDOC_Unfilled):
+		case MDOC_sp:
 			/* FALLTHROUGH */
-		case (MDOC_Literal):
-			t = bl->args->argv[i].arg;
+		case MDOC_Bl:
+			/* FALLTHROUGH */
+		case MDOC_D1:
+			/* FALLTHROUGH */
+		case MDOC_Dl:
+			/* FALLTHROUGH */
+		case MDOC_Lp:
+			/* FALLTHROUGH */
+		case MDOC_Pp:
+			continue;
+		default:
 			break;
 		}
+		if (h->flags & HTML_NONEWLINE ||
+		    (nn->next && ! (nn->next->flags & MDOC_LINE)))
+			continue;
+		else if (nn->next)
+			print_text(h, "\n");
 
-	if (MDOC_BLOCK == n->type) {
-		if (o)
-			buffmt("margin-left: %dem;", o);
-		bufcat("margin-top: 1em;");
-		tag[0].key = ATTR_STYLE;
-		tag[0].val = buf;
-		print_otag(h, TAG_DIV, 1, tag);
-		return(1);
-	}
-
-	switch (t) {
-	case (MDOC_Unfilled):
-	case (MDOC_Literal):
-		break;
-	default:
-		return(1);
-	}
-
-	bufcat("white-space: pre;");
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "lit";
-
-	print_otag(h, TAG_DIV, 2, tag);
-
-	for (n = n->child; n; n = n->next) {
 		h->flags |= HTML_NOSPACE;
-		print_mdoc_node(m, n, h);
-		if (n->next)
-			print_text(h, "\n");
 	}
 
+	if (0 == sv)
+		h->flags &= ~HTML_LITERAL;
+
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "file";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "file");
+	print_otag(h, TAG_I, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "addr";
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "addr");
+	print_otag(h, TAG_I, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_an_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "author";
+	if (n->norm->An.auth == AUTH_split) {
+		h->flags &= ~HTML_NOSPLIT;
+		h->flags |= HTML_SPLIT;
+		return(0);
+	}
+	if (n->norm->An.auth == AUTH_nosplit) {
+		h->flags &= ~HTML_SPLIT;
+		h->flags |= HTML_NOSPLIT;
+		return(0);
+	}
+
+	if (n->child == NULL)
+		return(0);
+
+	if (h->flags & HTML_SPLIT)
+		print_otag(h, TAG_BR, 0, NULL);
+
+	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
+		h->flags |= HTML_SPLIT;
+
+	PAIR_CLASS_INIT(&tag, "author");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "config";
-	print_otag(h, TAG_SPAN, 1, &tag);
+	synopsis_pre(h, n);
+	PAIR_CLASS_INIT(&tag, "config");
+	print_otag(h, TAG_B, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "define";
+	PAIR_CLASS_INIT(&tag, "define");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "env";
+	PAIR_CLASS_INIT(&tag, "env");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_er_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "errno";
+	PAIR_CLASS_INIT(&tag, "errno");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
@@ -1478,298 +1314,356 @@ mdoc_fa_pre(MDOC_ARGS)
 	struct htmlpair		 tag;
 	struct tag		*t;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "farg";
-
+	PAIR_CLASS_INIT(&tag, "farg");
 	if (n->parent->tok != MDOC_Fo) {
-		print_otag(h, TAG_SPAN, 1, &tag);
+		print_otag(h, TAG_I, 1, &tag);
 		return(1);
 	}
 
 	for (nn = n->child; nn; nn = nn->next) {
-		t = print_otag(h, TAG_SPAN, 1, &tag);
+		t = print_otag(h, TAG_I, 1, &tag);
 		print_text(h, nn->string);
 		print_tagq(h, t);
-		if (nn->next)
+		if (nn->next) {
+			h->flags |= HTML_NOSPACE;
 			print_text(h, ",");
+		}
 	}
 
-	if (n->child && n->next && n->next->tok == MDOC_Fa)
+	if (n->child && n->next && n->next->tok == MDOC_Fa) {
+		h->flags |= HTML_NOSPACE;
 		print_text(h, ",");
+	}
 
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag[2];
+	char		 buf[BUFSIZ];
+	size_t		 sz;
+	int		 i;
+	struct tag	*t;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		if (n->next && MDOC_Fd != n->next->tok) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-bottom: 1em;";
-			print_otag(h, TAG_DIV, 1, &tag);
-		} else
-			print_otag(h, TAG_DIV, 0, NULL);
+	synopsis_pre(h, n);
+
+	if (NULL == (n = n->child))
+		return(0);
+
+	assert(MDOC_TEXT == n->type);
+
+	if (strcmp(n->string, "#include")) {
+		PAIR_CLASS_INIT(&tag[0], "macro");
+		print_otag(h, TAG_B, 1, tag);
+		return(1);
 	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "macro";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
-}
+	PAIR_CLASS_INIT(&tag[0], "includes");
+	print_otag(h, TAG_B, 1, tag);
+	print_text(h, n->string);
 
+	if (NULL != (n = n->next)) {
+		assert(MDOC_TEXT == n->type);
 
-/* ARGSUSED */
+		/*
+		 * XXX This is broken and not easy to fix.
+		 * When using -Oincludes, truncation may occur.
+		 * Dynamic allocation wouldn't help because
+		 * passing long strings to buffmt_includes()
+		 * does not work either.
+		 */
+
+		strlcpy(buf, '<' == *n->string || '"' == *n->string ?
+		    n->string + 1 : n->string, BUFSIZ);
+
+		sz = strlen(buf);
+		if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1]))
+			buf[sz - 1] = '\0';
+
+		PAIR_CLASS_INIT(&tag[0], "link-includes");
+
+		i = 1;
+		if (h->base_includes) {
+			buffmt_includes(h, buf);
+			PAIR_HREF_INIT(&tag[i], h->buf);
+			i++;
+		}
+
+		t = print_otag(h, TAG_A, i, tag);
+		print_text(h, n->string);
+		print_tagq(h, t);
+
+		n = n->next;
+	}
+
+	for ( ; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+		print_text(h, n->string);
+	}
+
+	return(0);
+}
+
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		if (n->next && MDOC_Vt != n->next->tok) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-bottom: 1em;";
-			print_otag(h, TAG_DIV, 1, &tag);
-		} else
-			print_otag(h, TAG_DIV, 0, NULL);
-	}
+	if (MDOC_BLOCK == n->type) {
+		synopsis_pre(h, n);
+		return(1);
+	} else if (MDOC_ELEM == n->type) {
+		synopsis_pre(h, n);
+	} else if (MDOC_HEAD == n->type)
+		return(0);
 
-	tag.key = ATTR_CLASS;
-	tag.val = "type";
+	PAIR_CLASS_INIT(&tag, "type");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		if (n->prev && MDOC_Fo == n->prev->tok) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-top: 1em;";
-			print_otag(h, TAG_DIV, 1, &tag);
-		} else
-			print_otag(h, TAG_DIV, 0, NULL);
-	}
-
-	tag.key = ATTR_CLASS;
-	tag.val = "ftype";
-	print_otag(h, TAG_SPAN, 1, &tag);
+	synopsis_pre(h, n);
+	PAIR_CLASS_INIT(&tag, "ftype");
+	print_otag(h, TAG_I, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
-	struct tag		*t;
-	struct htmlpair	 	 tag;
-	const struct mdoc_node	*nn;
-	char			 nbuf[BUFSIZ];
-	const char		*sp, *ep;
-	int			 sz;
+	struct tag	*t;
+	struct htmlpair	 tag[2];
+	char		 nbuf[BUFSIZ];
+	const char	*sp, *ep;
+	int		 sz, i, pretty;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		if (n->next) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-bottom: 1em";
-			print_otag(h, TAG_DIV, 1, &tag);
-		} else
-			print_otag(h, TAG_DIV, 0, NULL);
-	}
+	pretty = MDOC_SYNPRETTY & n->flags;
+	synopsis_pre(h, n);
 
 	/* Split apart into type and name. */
-
-	tag.key = ATTR_CLASS;
-	tag.val = "ftype";
-	t = print_otag(h, TAG_SPAN, 1, &tag);
-
 	assert(n->child->string);
 	sp = n->child->string;
-	while ((ep = strchr(sp, ' '))) {
-		sz = MIN(ep - sp, BUFSIZ - 1);
-		(void)memcpy(nbuf, sp, sz);
-		nbuf[sz] = '\0';
-		print_text(h, nbuf);
-		sp = ++ep;
+
+	ep = strchr(sp, ' ');
+	if (NULL != ep) {
+		PAIR_CLASS_INIT(&tag[0], "ftype");
+		t = print_otag(h, TAG_I, 1, tag);
+
+		while (ep) {
+			sz = MIN((int)(ep - sp), BUFSIZ - 1);
+			(void)memcpy(nbuf, sp, (size_t)sz);
+			nbuf[sz] = '\0';
+			print_text(h, nbuf);
+			sp = ++ep;
+			ep = strchr(sp, ' ');
+		}
+		print_tagq(h, t);
 	}
 
-	print_tagq(h, t);
+	PAIR_CLASS_INIT(&tag[0], "fname");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "fname";
-	t = print_otag(h, TAG_SPAN, 1, &tag);
+	/*
+	 * FIXME: only refer to IDs that we know exist.
+	 */
 
-	if (sp) {
-		(void)strlcpy(nbuf, sp, BUFSIZ);
-		print_text(h, nbuf);
+#if 0
+	if (MDOC_SYNPRETTY & n->flags) {
+		nbuf[0] = '\0';
+		html_idcat(nbuf, sp, BUFSIZ);
+		PAIR_ID_INIT(&tag[1], nbuf);
+	} else {
+		strlcpy(nbuf, "#", BUFSIZ);
+		html_idcat(nbuf, sp, BUFSIZ);
+		PAIR_HREF_INIT(&tag[1], nbuf);
 	}
+#endif
 
+	t = print_otag(h, TAG_B, 1, tag);
+
+	if (sp)
+		print_text(h, sp);
+
 	print_tagq(h, t);
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "(");
+	h->flags |= HTML_NOSPACE;
 
-	for (nn = n->child->next; nn; nn = nn->next) {
-		tag.key = ATTR_CLASS;
-		tag.val = "farg";
-		t = print_otag(h, TAG_SPAN, 1, &tag);
-		print_text(h, nn->string);
+	PAIR_CLASS_INIT(&tag[0], "farg");
+	bufinit(h);
+	bufcat_style(h, "white-space", "nowrap");
+	PAIR_STYLE_INIT(&tag[1], h);
+
+	for (n = n->child->next; n; n = n->next) {
+		i = 1;
+		if (MDOC_SYNPRETTY & n->flags)
+			i = 2;
+		t = print_otag(h, TAG_I, i, tag);
+		print_text(h, n->string);
 		print_tagq(h, t);
-		if (nn->next)
+		if (n->next) {
+			h->flags |= HTML_NOSPACE;
 			print_text(h, ",");
+		}
 	}
 
+	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (pretty) {
+		h->flags |= HTML_NOSPACE;
 		print_text(h, ";");
+	}
 
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_sp_pre(MDOC_ARGS)
+mdoc_sm_pre(MDOC_ARGS)
 {
-	int		len;
-	struct htmlpair	tag;
 
-	switch (n->tok) {
-	case (MDOC_sp):
-		len = n->child ? atoi(n->child->string) : 1;
-		break;
-	case (MDOC_br):
-		len = 0;
-		break;
-	default:
-		len = 1;
-		break;
-	}
+	if (NULL == n->child)
+		h->flags ^= HTML_NONOSPACE;
+	else if (0 == strcmp("on", n->child->string))
+		h->flags &= ~HTML_NONOSPACE;
+	else
+		h->flags |= HTML_NONOSPACE;
 
-	buffmt("height: %dem", len);
-	tag.key = ATTR_STYLE;
-	tag.val = buf;
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	if ( ! (HTML_NONOSPACE & h->flags))
+		h->flags &= ~HTML_NOSPACE;
 
+	return(0);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_brq_pre(MDOC_ARGS)
+mdoc_skip_pre(MDOC_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(lC");
-	h->flags |= HTML_NOSPACE;
-	return(1);
+	return(0);
 }
 
-
-/* ARGSUSED */
-static void
-mdoc_brq_post(MDOC_ARGS)
+static int
+mdoc_pp_pre(MDOC_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rC");
+	print_paragraph(h);
+	return(0);
 }
 
+static int
+mdoc_sp_pre(MDOC_ARGS)
+{
+	struct roffsu	 su;
+	struct htmlpair	 tag;
 
-/* ARGSUSED */
+	SCALE_VS_INIT(&su, 1);
+
+	if (MDOC_sp == n->tok) {
+		if (NULL != (n = n->child))
+			if ( ! a2roffsu(n->string, &su, SCALE_VS))
+				su.scale = 1.0;
+	} else
+		su.scale = 0.0;
+
+	bufinit(h);
+	bufcat_su(h, "height", &su);
+	PAIR_STYLE_INIT(&tag, h);
+	print_otag(h, TAG_DIV, 1, &tag);
+
+	/* So the div isn't empty: */
+	print_text(h, "\\~");
+
+	return(0);
+
+}
+
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag[2];
+	struct htmlpair	 tag[2];
 
-	nn = n->child;
+	if (NULL == (n = n->child))
+		return(0);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-ext";
-	tag[1].key = ATTR_HREF;
-	tag[1].val = nn->string;
+	assert(MDOC_TEXT == n->type);
 
+	PAIR_CLASS_INIT(&tag[0], "link-ext");
+	PAIR_HREF_INIT(&tag[1], n->string);
+
 	print_otag(h, TAG_A, 2, tag);
 
-	if (NULL == nn->next)
-		return(1);
+	if (NULL == n->next)
+		print_text(h, n->string);
 
-	for (nn = nn->next; nn; nn = nn->next) 
-		print_text(h, nn->string);
+	for (n = n->next; n; n = n->next)
+		print_text(h, n->string);
 
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	struct tag		*t;
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag[2];
+	struct tag	*t;
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-mail";
+	PAIR_CLASS_INIT(&tag[0], "link-mail");
 
-	for (nn = n->child; nn; nn = nn->next) {
-		bufinit();
-		bufcat("mailto:");
-		bufcat(nn->string);
+	for (n = n->child; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
 
-		tag[1].key = ATTR_HREF;
-		tag[1].val = buf;
+		bufinit(h);
+		bufcat(h, "mailto:");
+		bufcat(h, n->string);
 
+		PAIR_HREF_INIT(&tag[1], h->buf);
 		t = print_otag(h, TAG_A, 2, tag);
-		print_text(h, nn->string);
+		print_text(h, n->string);
 		print_tagq(h, t);
 	}
-	
+
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag;
+	struct tag	*t;
 
 	if (MDOC_BODY == n->type) {
 		h->flags |= HTML_NOSPACE;
 		print_text(h, "(");
 		h->flags |= HTML_NOSPACE;
 		return(1);
-	} else if (MDOC_BLOCK == n->type)
+	} else if (MDOC_BLOCK == n->type) {
+		synopsis_pre(h, n);
 		return(1);
+	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "fname";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
-}
+	/* XXX: we drop non-initial arguments as per groff. */
 
+	assert(n->child);
+	assert(n->child->string);
 
-/* ARGSUSED */
+	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);
+}
+
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
+
 	if (MDOC_BODY != n->type)
 		return;
 	h->flags |= HTML_NOSPACE;
@@ -1778,291 +1672,253 @@ mdoc_fo_post(MDOC_ARGS)
 	print_text(h, ";");
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_in_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
+	struct tag	*t;
+	struct htmlpair	 tag[2];
+	int		 i;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		if (n->next && MDOC_In != n->next->tok) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-bottom: 1em;";
-			print_otag(h, TAG_DIV, 1, &tag);
-		} else
-			print_otag(h, TAG_DIV, 0, NULL);
-	}
+	synopsis_pre(h, n);
 
-	tag.key = ATTR_CLASS;
-	tag.val = "includes";
+	PAIR_CLASS_INIT(&tag[0], "includes");
+	print_otag(h, TAG_B, 1, tag);
 
-	print_otag(h, TAG_SPAN, 1, &tag);
+	/*
+	 * The first argument of the `In' gets special treatment as
+	 * being a linked value.  Subsequent values are printed
+	 * afterward.  groff does similarly.  This also handles the case
+	 * of no children.
+	 */
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
 		print_text(h, "#include");
 
 	print_text(h, "<");
 	h->flags |= HTML_NOSPACE;
 
-	/* XXX -- see warning in termp_in_post(). */
+	if (NULL != (n = n->child)) {
+		assert(MDOC_TEXT == n->type);
 
-	for (nn = n->child; nn; nn = nn->next)
-		print_mdoc_node(m, nn, h);
+		PAIR_CLASS_INIT(&tag[0], "link-includes");
 
+		i = 1;
+		if (h->base_includes) {
+			buffmt_includes(h, n->string);
+			PAIR_HREF_INIT(&tag[i], h->buf);
+			i++;
+		}
+
+		t = print_otag(h, TAG_A, i, tag);
+		print_text(h, n->string);
+		print_tagq(h, t);
+
+		n = n->next;
+	}
+
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ">");
 
+	for ( ; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+		print_text(h, n->string);
+	}
+
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "cmd";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "cmd");
+	print_otag(h, TAG_B, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_rv_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
-	struct tag		*t;
+	struct htmlpair	 tag;
+	struct tag	*t;
+	int		 nchild;
 
-	print_otag(h, TAG_DIV, 0, NULL);
+	if (n->prev)
+		print_otag(h, TAG_BR, 0, NULL);
 
-	print_text(h, "The");
+	PAIR_CLASS_INIT(&tag, "fname");
 
-	for (nn = n->child; nn; nn = nn->next) {
-		tag.key = ATTR_CLASS;
-		tag.val = "fname";
-		t = print_otag(h, TAG_SPAN, 1, &tag);
-		print_text(h, nn->string);
-		print_tagq(h, t);
+	nchild = n->nchild;
+	if (nchild > 0) {
+		print_text(h, "The");
 
-		h->flags |= HTML_NOSPACE;
-		if (nn->next && NULL == nn->next->next)
-			print_text(h, "(), and");
-		else if (nn->next)
-			print_text(h, "(),");
-		else
+		for (n = n->child; n; n = n->next) {
+			t = print_otag(h, TAG_B, 1, &tag);
+			print_text(h, n->string);
+			print_tagq(h, t);
+
+			h->flags |= HTML_NOSPACE;
 			print_text(h, "()");
-	}
 
-	if (n->child->next)
-		print_text(h, "functions return");
-	else
-		print_text(h, "function returns");
+			if (n->next == NULL)
+				continue;
 
-       	print_text(h, "the value 0 if successful; otherwise the value "
-			"-1 is returned and the global variable");
+			if (nchild > 2) {
+				h->flags |= HTML_NOSPACE;
+				print_text(h, ",");
+			}
+			if (n->next->next == NULL)
+				print_text(h, "and");
+		}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "var";
-	t = print_otag(h, TAG_SPAN, 1, &tag);
+		if (nchild > 1)
+			print_text(h, "functions return");
+		else
+			print_text(h, "function returns");
+
+		print_text(h, "the value\\~0 if successful;");
+	} else
+		print_text(h, "Upon successful completion,"
+                    " the value\\~0 is returned;");
+
+	print_text(h, "otherwise the value\\~\\-1 is returned"
+	   " and the global variable");
+
+	PAIR_CLASS_INIT(&tag, "var");
+	t = print_otag(h, TAG_B, 1, &tag);
 	print_text(h, "errno");
 	print_tagq(h, t);
-       	print_text(h, "is set to indicate the error.");
+	print_text(h, "is set to indicate the error.");
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_va_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "var";
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "var");
+	print_otag(h, TAG_B, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_bq_pre(MDOC_ARGS)
+mdoc_ap_pre(MDOC_ARGS)
 {
-	
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(lB");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
 
-
-/* ARGSUSED */
-static void
-mdoc_bq_post(MDOC_ARGS)
-{
-	
-	if (MDOC_BODY != n->type)
-		return;
 	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rB");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ap_pre(MDOC_ARGS)
-{
-	
-	h->flags |= HTML_NOSPACE;
 	print_text(h, "\\(aq");
 	h->flags |= HTML_NOSPACE;
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
-	int		i;
-	struct htmlpair	tag[2];
+	struct htmlpair	 tag[2];
+	struct roffsu	 su;
 
 	if (MDOC_HEAD == n->type)
 		return(0);
-	else if (MDOC_BLOCK != n->type)
+	else if (MDOC_BODY != n->type)
 		return(1);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = NULL;
+	if (FONT_Em == n->norm->Bf.font)
+		PAIR_CLASS_INIT(&tag[0], "emph");
+	else if (FONT_Sy == n->norm->Bf.font)
+		PAIR_CLASS_INIT(&tag[0], "symb");
+	else if (FONT_Li == n->norm->Bf.font)
+		PAIR_CLASS_INIT(&tag[0], "lit");
+	else
+		PAIR_CLASS_INIT(&tag[0], "none");
 
-	if (n->head->child) {
-		if ( ! strcmp("Em", n->head->child->string))
-			tag[0].val = "emph";
-		else if ( ! strcmp("Sy", n->head->child->string))
-			tag[0].val = "symb";
-		else if ( ! strcmp("Li", n->head->child->string))
-			tag[0].val = "lit";
-	} else {
-		assert(n->args);
-		for (i = 0; i < (int)n->args->argc; i++) 
-			switch (n->args->argv[i].arg) {
-			case (MDOC_Symbolic):
-				tag[0].val = "symb";
-				break;
-			case (MDOC_Literal):
-				tag[0].val = "lit";
-				break;
-			case (MDOC_Emphasis):
-				tag[0].val = "emph";
-				break;
-			default:
-				break;
-			}
-	}
-
-	/* FIXME: div's have spaces stripped--we want them. */
-
-	assert(tag[0].val);
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = "display: inline; margin-right: 1em;";
+	/*
+	 * We want this to be inline-formatted, but needs to be div to
+	 * accept block children.
+	 */
+	bufinit(h);
+	bufcat_style(h, "display", "inline");
+	SCALE_HS_INIT(&su, 1);
+	/* Needs a left-margin for spacing. */
+	bufcat_su(h, "margin-left", &su);
+	PAIR_STYLE_INIT(&tag[1], h);
 	print_otag(h, TAG_DIV, 2, tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "symb";
+	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_pf_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)
 {
 
 	h->flags |= HTML_IGNDELIM;
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
-	h->flags &= ~HTML_IGNDELIM;
-	h->flags |= HTML_NOSPACE;
+	if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+		h->flags |= HTML_NOSPACE;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag;
 
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	if (n->prev && SEC_SEE_ALSO == n->sec) {
-		tag.key = ATTR_STYLE;
-		tag.val = "margin-top: 1em;";
-		print_otag(h, TAG_DIV, 1, &tag);
-	}
+	if (n->prev && SEC_SEE_ALSO == n->sec)
+		print_paragraph(h);
 
-	tag.key = ATTR_CLASS;
-	tag.val = "ref";
+	PAIR_CLASS_INIT(&tag, "ref");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
+static int
+mdoc_no_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
 
+	PAIR_CLASS_INIT(&tag, "none");
+	print_otag(h, TAG_CODE, 1, &tag);
+	return(1);
+}
 
-/* ARGSUSED */
 static int
 mdoc_li_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "lit";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
+	PAIR_CLASS_INIT(&tag, "lit");
+	print_otag(h, TAG_CODE, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "symb";
-
+	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bt_pre(MDOC_ARGS)
 {
@@ -2071,8 +1927,6 @@ mdoc_bt_pre(MDOC_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ud_pre(MDOC_ARGS)
 {
@@ -2081,19 +1935,279 @@ mdoc_ud_pre(MDOC_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "lib";
+	if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
+		print_otag(h, TAG_BR, 0, NULL);
 
-	if (SEC_SYNOPSIS == n->sec)
-		print_otag(h, TAG_DIV, 0, NULL);
-
+	PAIR_CLASS_INIT(&tag, "lib");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
+}
+
+static int
+mdoc__x_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag[2];
+	enum htmltag	t;
+
+	t = TAG_SPAN;
+
+	switch (n->tok) {
+	case MDOC__A:
+		PAIR_CLASS_INIT(&tag[0], "ref-auth");
+		if (n->prev && MDOC__A == n->prev->tok)
+			if (NULL == n->next || MDOC__A != n->next->tok)
+				print_text(h, "and");
+		break;
+	case MDOC__B:
+		PAIR_CLASS_INIT(&tag[0], "ref-book");
+		t = TAG_I;
+		break;
+	case MDOC__C:
+		PAIR_CLASS_INIT(&tag[0], "ref-city");
+		break;
+	case MDOC__D:
+		PAIR_CLASS_INIT(&tag[0], "ref-date");
+		break;
+	case MDOC__I:
+		PAIR_CLASS_INIT(&tag[0], "ref-issue");
+		t = TAG_I;
+		break;
+	case MDOC__J:
+		PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
+		t = TAG_I;
+		break;
+	case MDOC__N:
+		PAIR_CLASS_INIT(&tag[0], "ref-num");
+		break;
+	case MDOC__O:
+		PAIR_CLASS_INIT(&tag[0], "ref-opt");
+		break;
+	case MDOC__P:
+		PAIR_CLASS_INIT(&tag[0], "ref-page");
+		break;
+	case MDOC__Q:
+		PAIR_CLASS_INIT(&tag[0], "ref-corp");
+		break;
+	case MDOC__R:
+		PAIR_CLASS_INIT(&tag[0], "ref-rep");
+		break;
+	case MDOC__T:
+		PAIR_CLASS_INIT(&tag[0], "ref-title");
+		break;
+	case MDOC__U:
+		PAIR_CLASS_INIT(&tag[0], "link-ref");
+		break;
+	case MDOC__V:
+		PAIR_CLASS_INIT(&tag[0], "ref-vol");
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	if (MDOC__U != n->tok) {
+		print_otag(h, t, 1, tag);
+		return(1);
+	}
+
+	PAIR_HREF_INIT(&tag[1], n->child->string);
+	print_otag(h, TAG_A, 2, tag);
+
+	return(1);
+}
+
+static void
+mdoc__x_post(MDOC_ARGS)
+{
+
+	if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+		if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+			if (NULL == n->prev || MDOC__A != n->prev->tok)
+				return;
+
+	/* TODO: %U */
+
+	if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+		return;
+
+	h->flags |= HTML_NOSPACE;
+	print_text(h, n->next ? "," : ".");
+}
+
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+	switch (n->type) {
+	case MDOC_BLOCK:
+		break;
+	case MDOC_HEAD:
+		return(0);
+	case MDOC_BODY:
+		if (n->parent->args || 0 == n->prev->nchild)
+			h->flags |= HTML_PREKEEP;
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	return(1);
+}
+
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+	if (MDOC_BODY == n->type)
+		h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}
+
+static int
+mdoc_quote_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	if (MDOC_BODY != n->type)
+		return(1);
+
+	switch (n->tok) {
+	case MDOC_Ao:
+		/* FALLTHROUGH */
+	case MDOC_Aq:
+		print_text(h, n->parent->prev != NULL &&
+		    n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+		break;
+	case MDOC_Bro:
+		/* FALLTHROUGH */
+	case MDOC_Brq:
+		print_text(h, "\\(lC");
+		break;
+	case MDOC_Bo:
+		/* FALLTHROUGH */
+	case MDOC_Bq:
+		print_text(h, "\\(lB");
+		break;
+	case MDOC_Oo:
+		/* FALLTHROUGH */
+	case MDOC_Op:
+		print_text(h, "\\(lB");
+		h->flags |= HTML_NOSPACE;
+		PAIR_CLASS_INIT(&tag, "opt");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		break;
+	case MDOC_En:
+		if (NULL == n->norm->Es ||
+		    NULL == n->norm->Es->child)
+			return(1);
+		print_text(h, n->norm->Es->child->string);
+		break;
+	case MDOC_Eo:
+		break;
+	case MDOC_Do:
+		/* FALLTHROUGH */
+	case MDOC_Dq:
+		/* FALLTHROUGH */
+	case MDOC_Qo:
+		/* FALLTHROUGH */
+	case MDOC_Qq:
+		print_text(h, "\\(lq");
+		break;
+	case MDOC_Po:
+		/* FALLTHROUGH */
+	case MDOC_Pq:
+		print_text(h, "(");
+		break;
+	case MDOC_Ql:
+		print_text(h, "\\(oq");
+		h->flags |= HTML_NOSPACE;
+		PAIR_CLASS_INIT(&tag, "lit");
+		print_otag(h, TAG_CODE, 1, &tag);
+		break;
+	case MDOC_So:
+		/* FALLTHROUGH */
+	case MDOC_Sq:
+		print_text(h, "\\(oq");
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	h->flags |= HTML_NOSPACE;
+	return(1);
+}
+
+static void
+mdoc_quote_post(MDOC_ARGS)
+{
+
+	if (n->type != MDOC_BODY && n->type != MDOC_ELEM)
+		return;
+
+	if ( ! (n->tok == MDOC_En ||
+	    (n->tok == MDOC_Eo && n->end == ENDBODY_SPACE)))
+		h->flags |= HTML_NOSPACE;
+
+	switch (n->tok) {
+	case MDOC_Ao:
+		/* FALLTHROUGH */
+	case MDOC_Aq:
+		print_text(h, n->parent->prev != NULL &&
+		    n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+		break;
+	case MDOC_Bro:
+		/* FALLTHROUGH */
+	case MDOC_Brq:
+		print_text(h, "\\(rC");
+		break;
+	case MDOC_Oo:
+		/* FALLTHROUGH */
+	case MDOC_Op:
+		/* FALLTHROUGH */
+	case MDOC_Bo:
+		/* FALLTHROUGH */
+	case MDOC_Bq:
+		print_text(h, "\\(rB");
+		break;
+	case MDOC_En:
+		if (NULL != n->norm->Es &&
+		    NULL != n->norm->Es->child &&
+		    NULL != n->norm->Es->child->next) {
+			h->flags |= HTML_NOSPACE;
+			print_text(h, n->norm->Es->child->next->string);
+		}
+		break;
+	case MDOC_Eo:
+		break;
+	case MDOC_Qo:
+		/* FALLTHROUGH */
+	case MDOC_Qq:
+		/* FALLTHROUGH */
+	case MDOC_Do:
+		/* FALLTHROUGH */
+	case MDOC_Dq:
+		print_text(h, "\\(rq");
+		break;
+	case MDOC_Po:
+		/* FALLTHROUGH */
+	case MDOC_Pq:
+		print_text(h, ")");
+		break;
+	case MDOC_Ql:
+		/* FALLTHROUGH */
+	case MDOC_So:
+		/* FALLTHROUGH */
+	case MDOC_Sq:
+		print_text(h, "\\(cq");
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 }