=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.16 retrieving revision 1.164 diff -u -p -r1.16 -r1.164 --- mandoc/mdoc_html.c 2009/10/03 15:08:09 1.16 +++ mandoc/mdoc_html.c 2011/04/23 08:56:29 1.164 @@ -1,6 +1,6 @@ -/* $Id: mdoc_html.c,v 1.16 2009/10/03 15:08:09 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.164 2011/04/23 08:56:29 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,21 +14,24 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include -#include -#include #include #include -#include -#include #include #include #include #include +#include "mandoc.h" +#include "out.h" #include "html.h" #include "mdoc.h" +#include "main.h" #define INDENT 5 #define HALFINDENT 3 @@ -36,10 +39,11 @@ #define MDOC_ARGS const struct mdoc_meta *m, \ 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); @@ -49,47 +53,30 @@ 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 a2offs(const char *, struct roffsu *); -static void buffmt_man(struct html *, - const char *, const char *); -static void buffmt(struct html *, const char *, ...); -static void bufcat(struct html *, const char *); -static void bufncat(struct html *, const char *, size_t); - - 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); @@ -103,6 +90,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); @@ -113,19 +101,16 @@ static int mdoc_ms_pre(MDOC_ARGS); static int mdoc_nd_pre(MDOC_ARGS); static int mdoc_nm_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_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); @@ -135,11 +120,6 @@ 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 */ @@ -147,12 +127,12 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Os */ {mdoc_sh_pre, NULL }, /* Sh */ {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_sp_pre, NULL}, /* Pp */ + {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 */ @@ -174,7 +154,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_li_pre, NULL}, /* Li */ {mdoc_nd_pre, NULL}, /* Nd */ {mdoc_nm_pre, NULL}, /* Nm */ - {mdoc_op_pre, mdoc_op_post}, /* Op */ + {mdoc_quote_pre, mdoc_quote_post}, /* Op */ {NULL, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ {mdoc_rv_pre, NULL}, /* Rv */ @@ -194,43 +174,43 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {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_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 */ {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_xx_pre, NULL}, /* Fx */ - {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */ - {NULL, NULL}, /* No */ + {mdoc_ms_pre, NULL}, /* Ms */ + {mdoc_igndelim_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 */ @@ -239,20 +219,20 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Xo */ {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ {NULL, NULL}, /* Fc */ - {mdoc_op_pre, mdoc_op_post}, /* Oo */ + {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_ud_pre, NULL}, /* Ud */ {mdoc_lb_pre, NULL}, /* Lb */ - {mdoc_sp_pre, NULL}, /* Lp */ + {mdoc_pp_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 */ + {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ {NULL, NULL}, /* Brc */ {mdoc__x_pre, mdoc__x_post}, /* %C */ {NULL, NULL}, /* Es */ /* TODO */ @@ -261,8 +241,24 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc__x_pre, mdoc__x_post}, /* %Q */ {mdoc_sp_pre, NULL}, /* br */ {mdoc_sp_pre, NULL}, /* sp */ + {mdoc__x_pre, mdoc__x_post}, /* %U */ + {NULL, NULL}, /* Ta */ }; +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" +}; void html_mdoc(void *arg, const struct mdoc *m) @@ -272,7 +268,7 @@ html_mdoc(void *arg, const struct mdoc *m) h = (struct html *)arg; - print_gen_doctype(h); + print_gen_decls(h); t = print_otag(h, TAG_HTML, 0, NULL); print_mdoc(mdoc_meta(m), mdoc_node(m), h); print_tagq(h, t); @@ -281,164 +277,86 @@ html_mdoc(void *arg, const struct mdoc *m) } +/* + * 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 -bufinit(struct html *h) +a2width(const char *p, struct roffsu *su) { - h->buf[0] = '\0'; - h->buflen = 0; + if ( ! a2roffsu(p, su, SCALE_MAX)) { + su->unit = SCALE_BU; + su->scale = (int)strlen(p); + } } +/* + * See the same function in mdoc_term.c for documentation. + */ static void -bufcat(struct html *h, const char *p) +synopsis_pre(struct html *h, const struct mdoc_node *n) { - bufncat(h, p, strlen(p)); -} + if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) + return; + 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; + } -static void -buffmt(struct html *h, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - (void)vsnprintf(h->buf + h->buflen, - BUFSIZ - h->buflen - 1, fmt, ap); - va_end(ap); - h->buflen = strlen(h->buf); - assert('\0' == h->buf[h->buflen]); -} - - -static void -bufncat(struct html *h, const char *p, size_t sz) -{ - - if (h->buflen + sz > BUFSIZ - 1) - sz = BUFSIZ - 1 - h->buflen; - - (void)strncat(h->buf, p, sz); - h->buflen += sz; - assert('\0' == h->buf[h->buflen]); -} - - -static void -buffmt_man(struct html *h, - const char *name, const char *sec) -{ - const char *p, *pp; - - pp = h->base_man; - - /* FIXME: URL-encode contents. */ - - while ((p = strchr(pp, '%'))) { - bufncat(h, pp, p - pp); - switch (*(p + 1)) { - case('S'): - bufcat(h, sec); + switch (n->prev->tok) { + case (MDOC_Fd): + /* FALLTHROUGH */ + case (MDOC_Fn): + /* FALLTHROUGH */ + case (MDOC_Fo): + /* FALLTHROUGH */ + case (MDOC_In): + /* FALLTHROUGH */ + case (MDOC_Vt): + print_otag(h, TAG_P, 0, NULL); + break; + case (MDOC_Ft): + if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { + print_otag(h, TAG_P, 0, NULL); break; - case('N'): - buffmt(h, name ? name : "1"); - break; - default: - bufncat(h, p, 2); - break; } - pp = p + 2; + /* FALLTHROUGH */ + default: + print_otag(h, TAG_BR, 0, NULL); + break; } - if (pp) - bufcat(h, pp); } -static int -a2list(const struct mdoc_node *n) +/* + * Calculate the scaling unit passed in an `-offset' argument. This + * uses either a native scaling unit (e.g., 1i, 2m), one of a set of + * predefined strings (indent, etc.), or the string length of the value. + */ +static void +a2offs(const char *p, struct roffsu *su) { - int i; - assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok); - assert(n->args); + /* FIXME: "right"? */ - 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 */ -} - - -static int -a2width(const char *p) -{ - 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 (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p) + 2); - - 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])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - - return(len); + SCALE_HS_INIT(su, 0); + else if (0 == strcmp(p, "indent")) + SCALE_HS_INIT(su, INDENT); + else if (0 == strcmp(p, "indent-two")) + SCALE_HS_INIT(su, INDENT * 2); + else if ( ! a2roffsu(p, su, SCALE_MAX)) { + su->unit = SCALE_BU; + su->scale = (int)strlen(p); + } } @@ -446,18 +364,12 @@ static void print_mdoc(MDOC_ARGS) { struct tag *t; - struct htmlpair tag; t = print_otag(h, TAG_HEAD, 0, NULL); print_mdoc_head(m, n, h); print_tagq(h, t); t = print_otag(h, TAG_BODY, 0, NULL); - - tag.key = ATTR_CLASS; - tag.val = "body"; - print_otag(h, TAG_DIV, 1, &tag); - print_mdoc_nodelist(m, n, h); print_tagq(h, t); } @@ -467,21 +379,19 @@ print_mdoc(MDOC_ARGS) static void print_mdoc_head(MDOC_ARGS) { - char b[BUFSIZ]; print_gen_head(h); + bufinit(h); + buffmt(h, "%s(%s)", m->title, m->msec); - (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); + bufcat(h, " ("); + bufcat(h, m->arch); + bufcat(h, ")"); } print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, b); + print_text(h, h->buf); } @@ -500,76 +410,129 @@ print_mdoc_node(MDOC_ARGS) { int child; struct tag *t; + struct htmlpair tag; child = 1; - t = SLIST_FIRST(&h->tags); + t = h->tags.head; bufinit(h); - switch (n->type) { case (MDOC_ROOT): child = mdoc_root_pre(m, n, h); break; 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 
) 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):
+		PAIR_CLASS_INIT(&tag, "eqn");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		print_text(h, n->eqn->data);
 		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)
+		/*
+		 * 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) {
+			print_tblclose(h);
+			t = h->tags.head;
+		}
+
+		assert(NULL == h->tblt);
+		if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
 			child = (*mdocs[n->tok].pre)(m, n, h);
 		break;
 	}
 
+	if (HTML_KEEP & h->flags) {
+		if (n->prev && n->prev->line != n->line) {
+			h->flags &= ~HTML_KEEP;
+			h->flags |= HTML_PREKEEP;
+		} else if (NULL == n->prev) {
+			if (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_stagq(h, t);
 
 	bufinit(h);
-
 	switch (n->type) {
 	case (MDOC_ROOT):
 		mdoc_root_post(m, n, h);
 		break;
-	case (MDOC_TEXT):
+	case (MDOC_EQN):
 		break;
 	default:
-		if (mdocs[n->tok].post)
+		if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
 			(*mdocs[n->tok].post)(m, n, h);
 		break;
 	}
 }
 
-
 /* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-	struct tm	 tm;
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag[3];
 	struct tag	*t, *tt;
-	char		 b[BUFSIZ];
 
-	(void)localtime_r(&m->date, &tm);
+	PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
+	PAIR_CLASS_INIT(&tag[1], "foot");
+	if (NULL == h->style) {
+		PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+		t = print_otag(h, TAG_TABLE, 3, tag);
+		PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+		print_otag(h, TAG_COL, 1, tag);
+		print_otag(h, TAG_COL, 1, tag);
+	} else
+		t = print_otag(h, TAG_TABLE, 2, tag);
 
-	if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-		err(EXIT_FAILURE, "strftime");
+	t = 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%;";
+	PAIR_CLASS_INIT(&tag[0], "foot-date");
 	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+
+	print_text(h, m->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);
+	PAIR_CLASS_INIT(&tag[0], "foot-os");
+	if (NULL == h->style) {
+		PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+		print_otag(h, TAG_TD, 2, tag);
+	} else 
+		print_otag(h, TAG_TD, 1, tag);
+
 	print_text(h, m->os);
 	print_tagq(h, t);
 }
@@ -579,46 +542,61 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag[3];
 	struct tag	*t, *tt;
 	char		 b[BUFSIZ], title[BUFSIZ];
 
-	(void)strlcpy(b, m->vol, BUFSIZ);
+	strlcpy(b, m->vol, BUFSIZ);
 
 	if (m->arch) {
-		(void)strlcat(b, " (", BUFSIZ);
-		(void)strlcat(b, m->arch, BUFSIZ);
-		(void)strlcat(b, ")", BUFSIZ);
+		strlcat(b, " (", BUFSIZ);
+		strlcat(b, m->arch, BUFSIZ);
+		strlcat(b, ")", BUFSIZ);
 	}
 
-	(void)snprintf(title, BUFSIZ - 1, 
-			"%s(%d)", m->title, m->msec);
+	snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
-	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);
+	PAIR_SUMMARY_INIT(&tag[0], "Document Header");
+	PAIR_CLASS_INIT(&tag[1], "head");
+	if (NULL == h->style) {
+		PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+		t = print_otag(h, TAG_TABLE, 3, tag);
+		PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+		print_otag(h, TAG_COL, 1, tag);
+		print_otag(h, TAG_COL, 1, tag);
+		print_otag(h, TAG_COL, 1, tag);
+	} else
+		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: 10%;";
+	PAIR_CLASS_INIT(&tag[0], "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: 80%; white-space: nowrap; text-align: center;";
-	print_otag(h, TAG_TD, 1, tag);
+	PAIR_CLASS_INIT(&tag[0], "head-vol");
+	if (NULL == h->style) {
+		PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+		print_otag(h, TAG_TD, 2, tag);
+	} else 
+		print_otag(h, TAG_TD, 1, tag);
+
 	print_text(h, b);
 	print_stagq(h, tt);
 
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = "width: 10%; text-align: right;";
-	print_otag(h, TAG_TD, 1, tag);
+	PAIR_CLASS_INIT(&tag[0], "head-rtitle");
+	if (NULL == h->style) {
+		PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+		print_otag(h, TAG_TD, 2, tag);
+	} else 
+		print_otag(h, TAG_TD, 1, tag);
+
 	print_text(h, title);
 	print_tagq(h, t);
-
 	return(1);
 }
 
@@ -627,52 +605,25 @@ mdoc_root_pre(MDOC_ARGS)
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag;
+	char		 buf[BUFSIZ];
 
-	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(h, nn->string);
-			if (nn->next)
-				bufncat(h, " ", 1);
-		}
-		tag[0].key = ATTR_NAME;
-		tag[0].val = h->buf;
-		print_otag(h, TAG_A, 1, tag);
+	if (MDOC_BLOCK == n->type) {
+		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";
-
-		if (n->prev && NULL == n->prev->body->child) {
-			print_otag(h, TAG_DIV, 1, tag);
-			return(1);
-		}
-
-		bufcat(h, "margin-top: 1em;");
-		if (NULL == n->next)
-			bufcat(h, "margin-bottom: 1em;");
-
-		tag[1].key = ATTR_STYLE;
-		tag[1].val = h->buf;
-
-		print_otag(h, TAG_DIV, 2, tag);
+	} else if (MDOC_BODY == n->type)
 		return(1);
+
+	buf[0] = '\0';
+	for (n = n->child; n; n = n->next) {
+		html_idcat(buf, n->string, BUFSIZ);
+		if (n->next)
+			html_idcat(buf, " ", BUFSIZ);
 	}
 
-	buffmt(h, "margin-left: %dem;", INDENT);
-	
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "sec-body";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = h->buf;
-
-	print_otag(h, TAG_DIV, 2, tag);
+	PAIR_ID_INIT(&tag, buf);
+	print_otag(h, TAG_H1, 1, &tag);
 	return(1);
 }
 
@@ -681,54 +632,25 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	int		 	 i;
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag;
+	char		 buf[BUFSIZ];
 
-	i = 0;
-
-	if (MDOC_BODY == n->type) {
-		tag[i].key = ATTR_CLASS;
-		tag[i++].val = "ssec-body";
-		if (n->parent->next && n->child) {
-			bufcat(h, "margin-bottom: 1em;");
-			tag[i].key = ATTR_STYLE;
-			tag[i++].val = h->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(h, "margin-top: 1em;");
-			tag[i].key = ATTR_STYLE;
-			tag[i++].val = h->buf;
-		}
-		print_otag(h, TAG_DIV, i, tag);
+	} else if (MDOC_BODY == n->type)
 		return(1);
-	}
 
-	buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT);
-
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "ssec-head";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = h->buf;
-
-	print_otag(h, TAG_DIV, 2, tag);
-	print_otag(h, TAG_SPAN, 1, tag);
-
-	bufinit(h);
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(h, nn->string);
-		if (nn->next)
-			bufcat(h, " ");
+	buf[0] = '\0';
+	for (n = n->child; n; n = n->next) {
+		html_idcat(buf, n->string, BUFSIZ);
+		if (n->next)
+			html_idcat(buf, " ", BUFSIZ);
 	}
-	tag[0].key = ATTR_NAME;
-	tag[0].val = h->buf;
-	print_otag(h, TAG_A, 1, tag);
 
+	PAIR_ID_INIT(&tag, buf);
+	print_otag(h, TAG_H2, 1, &tag);
 	return(1);
 }
 
@@ -739,14 +661,21 @@ 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->child)
 		h->flags |= HTML_NOSPACE;
-	}
+	else if (n->next && n->next->line == n->line)
+		h->flags |= HTML_NOSPACE;
+
 	return(1);
 }
 
@@ -760,65 +689,60 @@ 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;
+	size_t		 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 && m->name)
+			print_text(h, m->name);
 		return(1);
+	case (MDOC_HEAD):
+		print_otag(h, TAG_TD, 0, NULL);
+		if (NULL == n->child && m->name)
+			print_text(h, m->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 += strlen(n->string);
 
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
-{
+	if (0 == len && m->name)
+		len = strlen(m->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, (double)len);
+	bufcat_su(h, "min-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);
 }
 
@@ -827,32 +751,34 @@ mdoc_nm_pre(MDOC_ARGS)
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag[2];
 
-	buffmt_man(h, n->child->string, 
-			n->child->next ? 
-			n->child->next->string : NULL);
+	if (NULL == n->child)
+		return(0);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-man";
-	tag[1].key = ATTR_HREF;
-	tag[1].val = h->buf;
-	print_otag(h, TAG_A, 2, tag);
+	PAIR_CLASS_INIT(&tag[0], "link-man");
 
-	nn = n->child;
-	print_text(h, nn->string);
+	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);
 
-	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);
 }
 
@@ -862,7 +788,8 @@ static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-	h->flags |= HTML_NOSPACE;
+	if ( ! (MDOC_LINE & n->flags))
+		h->flags |= HTML_NOSPACE;
 	return(1);
 }
 
@@ -873,10 +800,8 @@ 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);
 }
 
@@ -887,13 +812,14 @@ mdoc_xx_pre(MDOC_ARGS)
 {
 	const char	*pp;
 	struct htmlpair	 tag;
+	int		 flags;
 
 	switch (n->tok) {
 	case (MDOC_Bsx):
-		pp = "BSDI BSD/OS";
+		pp = "BSD/OS";
 		break;
 	case (MDOC_Dx):
-		pp = "DragonFlyBSD";
+		pp = "DragonFly";
 		break;
 	case (MDOC_Fx):
 		pp = "FreeBSD";
@@ -911,12 +837,17 @@ mdoc_xx_pre(MDOC_ARGS)
 		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);
 }
 
 
@@ -924,310 +855,266 @@ mdoc_xx_pre(MDOC_ARGS)
 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;
-	const struct mdoc_node	*nn;
+	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(h, "margin-left: %dem; clear: both;", o);
-		break;
-	default:
-		buffmt(h, "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) {
-		for (nn = n; nn; nn = nn->parent) {
-			if (MDOC_BLOCK != nn->type)
-				continue;
-			switch (nn->tok) {
-			case (MDOC_Ss):
-				/* FALLTHROUGH */
-			case (MDOC_Sh):
-				c = 1;
+	assert(bl);
+
+	type = bl->norm->Bl.type;
+
+	assert(lists[type]);
+	PAIR_CLASS_INIT(&tag[0], lists[type]);
+
+	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;
-			default:
+			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;
 			}
-			if (nn->prev)
-				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;
 		}
-		if (MDOC_Diag == t && n->prev)
-			if (NULL == n->prev->body->child)
-				c = 1;
-		if ( ! c)
-			bufcat(h, "padding-top: 1em;");
+	} else {
+		switch (type) {
+		case (LIST_column):
+			print_otag(h, TAG_TR, 1, tag);
+			break;
+		default:
+			break;
+		}
 	}
 
-	tag.key = ATTR_STYLE;
-	tag.val = h->buf;
-	print_otag(h, TAG_DIV, 1, &tag);
 	return(1);
 }
 
-
 /* ARGSUSED */
 static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
+mdoc_bl_pre(MDOC_ARGS)
 {
+	int		 i;
+	struct htmlpair	 tag[3];
+	struct roffsu	 su;
+	char		 buf[BUFSIZ];
 
-	print_otag(h, TAG_DIV, 0, NULL);
-	return(1);
-}
+	if (MDOC_BODY == n->type) {
+		if (LIST_column == n->norm->Bl.type)
+			print_otag(h, TAG_TBODY, 0, NULL);
+		return(1);
+	}
 
+	if (MDOC_HEAD == n->type) {
+		if (LIST_column != n->norm->Bl.type)
+			return(0);
 
-/* ARGSUSED */
-static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
-{
-	struct htmlpair	 tag;
-	struct ord	*ord;
-	char		 nbuf[BUFSIZ];
+		/*
+		 * For each column, print out the  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.
+		 */
 
-	switch (t) {
-	case (MDOC_Item):
-		/* FALLTHROUGH */
-	case (MDOC_Ohang):
-		print_otag(h, TAG_DIV, 0, NULL);
-		break;
-	case (MDOC_Column):
-		buffmt(h, "min-width: %dem;", w);
-		bufcat(h, "clear: none;");
-		if (n->next && MDOC_HEAD == n->next->type)
-			bufcat(h, "float: left;");
-		tag.key = ATTR_STYLE;
-		tag.val = h->buf;
-		print_otag(h, TAG_DIV, 1, &tag);
-		break;
-	default:
-		buffmt(h, "margin-left: -%dem; min-width: %dem;", 
-				w, w ? w - 1 : 0);
-		bufcat(h, "clear: left;");
-		if (n->next && n->next->child)
-			bufcat(h, "float: left;");
-		bufcat(h, "padding-right: 1em;");
-		tag.key = ATTR_STYLE;
-		tag.val = h->buf;
-		print_otag(h, TAG_DIV, 1, &tag);
-		break;
-	}
+		for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
+			a2width(n->norm->Bl.cols[i], &su);
+			bufinit(h);
+			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);
+		}
 
-	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;
 	}
 
-	return(1);
-}
+	SCALE_VS_INIT(&su, 0);
+	bufcat_su(h, "margin-top", &su);
+	bufcat_su(h, "margin-bottom", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
 
+	assert(lists[n->norm->Bl.type]);
+	strlcpy(buf, "list ", BUFSIZ);
+	strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+	PAIR_INIT(&tag[1], ATTR_CLASS, buf);
 
-static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
-{
-	int			 i, w, o, c, wp;
-	const struct mdoc_node	*bl, *nn;
+	/* Set the block's left-hand margin. */
 
-	bl = n->parent->parent;
-	if (MDOC_BLOCK != n->type) 
-		bl = bl->parent;
-
-	assert(bl->args);
-
-	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) {
+		a2offs(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);
-
-	/* Allocate an -enum on the stack of indices. */
-
-	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)
+	if (nchild > 1)
 		print_text(h, "utilities exit");
 	else
 		print_text(h, "utility exits");
@@ -1239,87 +1126,11 @@ mdoc_ex_pre(MDOC_ARGS)
 
 /* 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);
 }
@@ -1329,19 +1140,28 @@ mdoc_em_pre(MDOC_ARGS)
 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(h, "margin-left: %dem;", INDENT);
+	SCALE_VS_INIT(&su, 0);
+	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 = h->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);
 }
 
@@ -1350,21 +1170,20 @@ mdoc_d1_pre(MDOC_ARGS)
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	struct htmlpair	 tag[2];
+	char		 buf[BUFSIZ];
 
-	bufcat(h, "#");
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(h, nn->string);
-		if (nn->next)
-			bufcat(h, " ");
+	strlcpy(buf, "#", BUFSIZ);
+	for (n = n->child; n; n = n->next) {
+		html_idcat(buf, n->string, BUFSIZ);
+		if (n->next)
+			html_idcat(buf, " ", BUFSIZ);
 	}
 
-	tag[0].key = ATTR_HREF;
-	tag[0].val = h->buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "link-sec";
+	PAIR_CLASS_INIT(&tag[0], "link-sec");
+	PAIR_HREF_INIT(&tag[1], buf);
 
+	print_otag(h, TAG_I, 1, tag);
 	print_otag(h, TAG_A, 2, tag);
 	return(1);
 }
@@ -1372,113 +1191,92 @@ mdoc_sx_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
-mdoc_aq_pre(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(la");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_aq_post(MDOC_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(ra");
-}
-
-
-/* ARGSUSED */
-static int
 mdoc_bd_pre(MDOC_ARGS)
 {
 	struct htmlpair	 	 tag[2];
-	int		 	 t, c, o, i;
-	const struct mdoc_node	*bl, *nn;
+	int		 	 comp, sv;
+	const struct mdoc_node	*nn;
+	struct roffsu		 su;
 
-	if (MDOC_BLOCK == n->type)
-		bl = n;
-	else if (MDOC_HEAD == n->type)
+	if (MDOC_HEAD == n->type)
 		return(0);
-	else
-		bl = n->parent;
 
-	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):
-			/* FALLTHROUGH */
-		case (MDOC_Filled):
-			/* FALLTHROUGH */
-		case (MDOC_Unfilled):
-			/* FALLTHROUGH */
-		case (MDOC_Literal):
-			t = bl->args->argv[i].arg;
-			break;
-		}
-
 	if (MDOC_BLOCK == n->type) {
-		if (o)
-			buffmt(h, "margin-left: %dem;", o);
-		if ( ! c) {
-			for (nn = n; nn; nn = nn->parent) {
-				if (MDOC_BLOCK != nn->type)
-					continue;
-				switch (nn->tok) {
-				case (MDOC_Ss):
-					/* FALLTHROUGH */
-				case (MDOC_Sh):
-					c = 1;
-					break;
-				default:
-					break;
-				}
-				if (nn->prev)
-					break;
-			}
-			if ( ! c) 
-				bufcat(h, "margin-top: 1em;");
+		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;
 		}
-		tag[0].key = ATTR_STYLE;
-		tag[0].val = h->buf;
-		print_otag(h, TAG_DIV, 1, tag);
+		if ( ! comp)
+			print_otag(h, TAG_P, 0, NULL);
 		return(1);
 	}
 
-	if (MDOC_Unfilled != t && MDOC_Literal != t)
+	SCALE_HS_INIT(&su, 0);
+	if (n->norm->Bd.offs)
+		a2offs(n->norm->Bd.offs, &su);
+
+	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);
+	}
 
-	bufcat(h, "white-space: pre;");
-	tag[0].key = ATTR_STYLE;
-	tag[0].val = h->buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "lit";
+	PAIR_CLASS_INIT(&tag[1], "lit display");
+	print_otag(h, TAG_PRE, 2, tag);
 
-	print_otag(h, TAG_DIV, 2, tag);
+	/* This can be recursive: save & set our literal state. */
 
+	sv = h->flags & HTML_LITERAL;
+	h->flags |= HTML_LITERAL;
+
 	for (nn = n->child; nn; nn = nn->next) {
 		print_mdoc_node(m, nn, h);
-		if (NULL == nn->next)
+		/*
+		 * 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_br):
+			/* FALLTHROUGH */
+		case (MDOC_sp):
+			/* FALLTHROUGH */
+		case (MDOC_Bl):
+			/* FALLTHROUGH */
+		case (MDOC_D1):
+			/* FALLTHROUGH */
+		case (MDOC_Dl):
+			/* FALLTHROUGH */
+		case (MDOC_Lp):
+			/* FALLTHROUGH */
+		case (MDOC_Pp):
 			continue;
-		if (nn->prev && nn->prev->line < nn->line)
+		default:
+			break;
+		}
+		if (nn->next && nn->next->line == nn->line)
+			continue;
+		else if (nn->next)
 			print_text(h, "\n");
+
+		h->flags |= HTML_NOSPACE;
 	}
 
+	if (0 == sv)
+		h->flags &= ~HTML_LITERAL;
+
 	return(0);
 }
 
@@ -1489,10 +1287,8 @@ 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);
 }
 
@@ -1503,9 +1299,8 @@ 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);
 }
 
@@ -1516,8 +1311,9 @@ mdoc_an_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "author";
+	/* TODO: -split and -nosplit (see termp_an_pre()). */
+
+	PAIR_CLASS_INIT(&tag, "author");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
@@ -1529,9 +1325,9 @@ 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);
 }
 
@@ -1542,8 +1338,7 @@ 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);
 }
@@ -1555,8 +1350,7 @@ 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);
 }
@@ -1568,8 +1362,7 @@ 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);
 }
@@ -1583,24 +1376,26 @@ 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);
 }
@@ -1610,21 +1405,61 @@ mdoc_fa_pre(MDOC_ARGS)
 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);
+		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");
+		bufinit(h);
+		
+		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);
 }
 
 
@@ -1632,19 +1467,17 @@ mdoc_fd_pre(MDOC_ARGS)
 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);
 }
@@ -1654,20 +1487,11 @@ mdoc_vt_pre(MDOC_ARGS)
 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);
 }
 
@@ -1676,47 +1500,57 @@ mdoc_ft_pre(MDOC_ARGS)
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
-	struct tag		*t;
-	struct htmlpair	 	 tag[2];
-	const struct mdoc_node	*nn;
-	char			 nbuf[BUFSIZ];
-	const char		*sp, *ep;
-	int			 sz, i;
+	struct tag	*t;
+	struct htmlpair	 tag[2];
+	char		 nbuf[BUFSIZ];
+	const char	*sp, *ep;
+	int		 sz, i, pretty;
 
-	if (SEC_SYNOPSIS == n->sec) {
-		bufcat(h, "margin-left: 6em;");
-		bufcat(h, "text-indent: -6em;");
-		if (n->next) 
-			bufcat(h, "margin-bottom: 1em;");
-		tag[0].key = ATTR_STYLE;
-		tag[0].val = h->buf;
-		print_otag(h, TAG_DIV, 1, tag);
-	}
+	pretty = MDOC_SYNPRETTY & n->flags;
+	synopsis_pre(h, n);
 
 	/* Split apart into type and name. */
-
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "ftype";
-	t = print_otag(h, TAG_SPAN, 1, tag);
-
 	assert(n->child->string);
 	sp = n->child->string;
-	while (NULL != (ep = strchr(sp, ' '))) {
-		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, ' ');
+	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[0].key = ATTR_CLASS;
-	tag[0].val = "fname";
-	t = print_otag(h, TAG_SPAN, 1, tag);
+	/*
+	 * FIXME: only refer to IDs that we know exist.
+	 */
 
+#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) {
-		(void)strlcpy(nbuf, sp, BUFSIZ);
+		strlcpy(nbuf, sp, BUFSIZ);
 		print_text(h, nbuf);
 	}
 
@@ -1724,27 +1558,33 @@ mdoc_fn_pre(MDOC_ARGS)
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "(");
+	h->flags |= HTML_NOSPACE;
 
-	for (nn = n->child->next; nn; nn = nn->next) {
-		i = 0;
-		tag[i].key = ATTR_CLASS;
-		tag[i++].val = "farg";
-		if (SEC_SYNOPSIS == n->sec) {
-			tag[i].key = ATTR_STYLE;
-			tag[i++].val = "white-space: nowrap;";
-		}
-			
-		t = print_otag(h, TAG_SPAN, i, tag);
-		print_text(h, nn->string);
+	bufinit(h);
+	PAIR_CLASS_INIT(&tag[0], "farg");
+	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);
 }
@@ -1752,79 +1592,86 @@ mdoc_fn_pre(MDOC_ARGS)
 
 /* 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;
-	}
+	assert(n->child && MDOC_TEXT == n->child->type);
+	if (0 == strcmp("on", n->child->string)) {
+		/* 
+		 * FIXME: no p->col to check.  Thus, if we have
+		 *  .Bd -literal
+		 *  .Sm off
+		 *  1 2
+		 *  .Sm on
+		 *  3
+		 *  .Ed
+		 * the "3" is preceded by a space.
+		 */
+		h->flags &= ~HTML_NOSPACE;
+		h->flags &= ~HTML_NONOSPACE;
+	} else
+		h->flags |= HTML_NONOSPACE;
 
-	buffmt(h, "height: %dem", len);
-	tag.key = ATTR_STYLE;
-	tag.val = h->buf;
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
-
+	return(0);
 }
 
-
 /* ARGSUSED */
 static int
-mdoc_brq_pre(MDOC_ARGS)
+mdoc_pp_pre(MDOC_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(lC");
-	h->flags |= HTML_NOSPACE;
-	return(1);
+	print_otag(h, TAG_P, 0, NULL);
+	return(0);
+
 }
 
-
 /* ARGSUSED */
-static void
-mdoc_brq_post(MDOC_ARGS)
+static int
+mdoc_sp_pre(MDOC_ARGS)
 {
+	struct roffsu	 su;
+	struct htmlpair	 tag;
 
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rC");
-}
+	SCALE_VS_INIT(&su, 1);
 
+	if (MDOC_sp == n->tok) {
+		if (n->child)
+			a2roffsu(n->child->string, &su, SCALE_VS);
+	} else
+		su.scale = 0;
 
+	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);
+
+}
+
 /* ARGSUSED */
 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);
+	for (n = n->next; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+		print_text(h, n->string);
+	}
 
-	for (nn = nn->next; nn; nn = nn->next) 
-		print_text(h, nn->string);
-
 	return(0);
 }
 
@@ -1833,23 +1680,21 @@ mdoc_lk_pre(MDOC_ARGS)
 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) {
+	for (n = n->child; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+
 		bufinit(h);
 		bufcat(h, "mailto:");
-		bufcat(h, nn->string);
+		bufcat(h, n->string);
 
-		tag[1].key = ATTR_HREF;
-		tag[1].val = h->buf;
-
+		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);
 	}
 	
@@ -1861,20 +1706,29 @@ mdoc_mt_pre(MDOC_ARGS)
 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);
+
+	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);
 }
 
 
@@ -1882,6 +1736,7 @@ mdoc_fo_pre(MDOC_ARGS)
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
+
 	if (MDOC_BODY != n->type)
 		return;
 	h->flags |= HTML_NOSPACE;
@@ -1895,37 +1750,57 @@ mdoc_fo_post(MDOC_ARGS)
 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");
+		bufinit(h);
 
+		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);
 }
 
@@ -1936,10 +1811,8 @@ 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);
 }
 
@@ -1948,31 +1821,38 @@ mdoc_ic_pre(MDOC_ARGS)
 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);
 
+	PAIR_CLASS_INIT(&tag, "fname");
+
 	print_text(h, "The");
 
-	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);
+	nchild = n->nchild;
+	for (n = n->child; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+
+		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)
-			print_text(h, "(),");
-		else
-			print_text(h, "()");
+		print_text(h, "()");
+
+		if (nchild > 2 && n->next) {
+			h->flags |= HTML_NOSPACE;
+			print_text(h, ",");
+		}
+
+		if (n->next && NULL == n->next->next)
+			print_text(h, "and");
 	}
 
-	if (n->child->next)
+	if (nchild > 1)
 		print_text(h, "functions return");
 	else
 		print_text(h, "function returns");
@@ -1980,9 +1860,8 @@ mdoc_rv_pre(MDOC_ARGS)
        	print_text(h, "the value 0 if successful; otherwise the value "
 			"-1 is returned and the global variable");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "var";
-	t = print_otag(h, TAG_SPAN, 1, &tag);
+	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.");
@@ -1996,40 +1875,14 @@ 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)
-{
-	
-	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)
 {
 	
@@ -2044,47 +1897,32 @@ mdoc_ap_pre(MDOC_ARGS)
 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. 
+	 */
+	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);
 }
@@ -2096,8 +1934,7 @@ 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);
 }
@@ -2105,7 +1942,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
-mdoc_pf_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)
 {
 
 	h->flags |= HTML_IGNDELIM;
@@ -2118,7 +1955,6 @@ static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
-	h->flags &= ~HTML_IGNDELIM;
 	h->flags |= HTML_NOSPACE;
 }
 
@@ -2127,19 +1963,15 @@ mdoc_pf_post(MDOC_ARGS)
 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_otag(h, TAG_P, 0, NULL);
 
-	tag.key = ATTR_CLASS;
-	tag.val = "ref";
+	PAIR_CLASS_INIT(&tag, "ref");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
@@ -2152,9 +1984,7 @@ mdoc_li_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "lit";
-
+	PAIR_CLASS_INIT(&tag, "lit");
 	print_otag(h, TAG_SPAN, 1, &tag);
 	return(1);
 }
@@ -2166,9 +1996,7 @@ 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);
 }
@@ -2200,12 +2028,10 @@ 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);
 }
@@ -2215,58 +2041,73 @@ mdoc_lb_pre(MDOC_ARGS)
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	tag[2];
+	enum htmltag	t;
 
-	tag.key = ATTR_CLASS;
+	t = TAG_SPAN;
 
 	switch (n->tok) {
 	case(MDOC__A):
-		tag.val = "ref-auth";
+		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):
-		tag.val = "ref-book";
+		PAIR_CLASS_INIT(&tag[0], "ref-book");
+		t = TAG_I;
 		break;
 	case(MDOC__C):
-		tag.val = "ref-city";
+		PAIR_CLASS_INIT(&tag[0], "ref-city");
 		break;
 	case(MDOC__D):
-		tag.val = "ref-date";
+		PAIR_CLASS_INIT(&tag[0], "ref-date");
 		break;
 	case(MDOC__I):
-		tag.val = "ref-issue";
+		PAIR_CLASS_INIT(&tag[0], "ref-issue");
+		t = TAG_I;
 		break;
 	case(MDOC__J):
-		tag.val = "ref-jrnl";
+		PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
+		t = TAG_I;
 		break;
 	case(MDOC__N):
-		tag.val = "ref-num";
+		PAIR_CLASS_INIT(&tag[0], "ref-num");
 		break;
 	case(MDOC__O):
-		tag.val = "ref-opt";
+		PAIR_CLASS_INIT(&tag[0], "ref-opt");
 		break;
 	case(MDOC__P):
-		tag.val = "ref-page";
+		PAIR_CLASS_INIT(&tag[0], "ref-page");
 		break;
 	case(MDOC__Q):
-		tag.val = "ref-corp";
+		PAIR_CLASS_INIT(&tag[0], "ref-corp");
 		break;
 	case(MDOC__R):
-		tag.val = "ref-rep";
+		PAIR_CLASS_INIT(&tag[0], "ref-rep");
 		break;
 	case(MDOC__T):
-		print_text(h, "\\(lq");
-		h->flags |= HTML_NOSPACE;
-		tag.val = "ref-title";
+		PAIR_CLASS_INIT(&tag[0], "ref-title");
 		break;
+	case(MDOC__U):
+		PAIR_CLASS_INIT(&tag[0], "link-ref");
+		break;
 	case(MDOC__V):
-		tag.val = "ref-vol";
+		PAIR_CLASS_INIT(&tag[0], "ref-vol");
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	print_otag(h, TAG_SPAN, 1, &tag);
+	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);
 }
 
@@ -2276,14 +2117,173 @@ 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 ? "," : ".");
+}
+
+
+/* ARGSUSED */
+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);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+	if (MDOC_BODY == n->type)
+		h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_quote_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	if (MDOC_BODY != n->type)
+		return(1);
+
 	switch (n->tok) {
-	case (MDOC__T):
-		print_text(h, "\\(rq");
+	case (MDOC_Ao):
+		/* FALLTHROUGH */
+	case (MDOC_Aq):
+		print_text(h, "\\(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_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):
+		/* FALLTHROUGH */
+	case (MDOC_So):
+		/* FALLTHROUGH */
+	case (MDOC_Sq):
+		print_text(h, "\\(oq");
+		break;
 	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	h->flags |= HTML_NOSPACE;
+	return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_quote_post(MDOC_ARGS)
+{
+
+	if (MDOC_BODY != n->type)
+		return;
+
+	h->flags |= HTML_NOSPACE;
+
+	switch (n->tok) {
+	case (MDOC_Ao):
+		/* FALLTHROUGH */
+	case (MDOC_Aq):
+		print_text(h, "\\(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_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, "\\(aq");
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
 	}
-	print_text(h, n->next ? "," : ".");
 }
+
+