=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.10 retrieving revision 1.257 diff -u -p -r1.10 -r1.257 --- mandoc/mdoc_html.c 2009/09/24 23:54:43 1.10 +++ mandoc/mdoc_html.c 2017/01/20 21:37:56 1.257 @@ -1,87 +1,76 @@ -/* $Id: mdoc_html.c,v 1.10 2009/09/24 23:54:43 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.257 2017/01/20 21:37:56 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * 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 -#include -#include #include #include -#include #include #include #include #include -#include "html.h" +#include "mandoc_aux.h" +#include "roff.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, \ - const struct mdoc_node *n, \ +#define MDOC_ARGS const struct roff_meta *meta, \ + struct roff_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); }; -static void print_mdoc(MDOC_ARGS); +static char *make_id(const struct roff_node *); 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 roff_node *); -static int a2width(const char *); -static int a2offs(const char *); -static int a2list(const struct mdoc_node *); - 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); @@ -89,12 +78,15 @@ static int mdoc_fl_pre(MDOC_ARGS); static int mdoc_fn_pre(MDOC_ARGS); static int mdoc_ft_pre(MDOC_ARGS); static int mdoc_em_pre(MDOC_ARGS); +static void mdoc_eo_post(MDOC_ARGS); +static int mdoc_eo_pre(MDOC_ARGS); static int mdoc_er_pre(MDOC_ARGS); static int mdoc_ev_pre(MDOC_ARGS); 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); @@ -104,75 +96,67 @@ 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); -static int mdoc_ud_pre(MDOC_ARGS); static int mdoc_va_pre(MDOC_ARGS); 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 */ + {mdoc_ex_pre, NULL}, /* Rv */ + {NULL, NULL}, /* St */ {mdoc_va_pre, NULL}, /* Va */ - {mdoc_vt_pre, NULL}, /* Vt */ + {mdoc_vt_pre, NULL}, /* Vt */ {mdoc_xr_pre, NULL}, /* Xr */ {mdoc__x_pre, mdoc__x_post}, /* %A */ {mdoc__x_pre, mdoc__x_post}, /* %B */ @@ -186,1593 +170,1186 @@ 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_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_xx_pre, NULL}, /* Bx */ + {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_eo_pre, mdoc_eo_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}, /* Bt */ {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ - {mdoc_ud_pre, NULL}, /* Ud */ + {mdoc_em_pre, NULL}, /* Fr */ + {NULL, 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 */ - {mdoc__x_pre, mdoc__x_post}, /* %C */ - {NULL, NULL}, /* Es */ /* TODO */ - {NULL, NULL}, /* En */ /* TODO */ - {mdoc_xx_pre, NULL}, /* Dx */ - {mdoc__x_pre, mdoc__x_post}, /* %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 */ -#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) +/* + * See the same function in mdoc_term.c for documentation. + */ +static void +synopsis_pre(struct html *h, const struct roff_node *n) { - struct html *h; - struct tag *t; - h = (struct html *)arg; + if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags)) + return; - 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); + if (n->prev->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { + print_otag(h, TAG_BR, ""); + return; + } - printf("\n"); -} - - -static int -a2list(const struct mdoc_node *n) -{ - 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: + switch (n->prev->tok) { + case MDOC_Fd: + case MDOC_Fn: + case MDOC_Fo: + case MDOC_In: + case MDOC_Vt: + print_paragraph(h); + break; + case MDOC_Ft: + if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { + print_paragraph(h); break; } - - abort(); - /* NOTREACHED */ + /* FALLTHROUGH */ + default: + print_otag(h, TAG_BR, ""); + break; + } } - -static int -a2width(const char *p) +void +html_mdoc(void *arg, const struct roff_man *mdoc) { - 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); -} - - -static void -print_mdoc(MDOC_ARGS) -{ + struct html *h; struct tag *t; - struct htmlpair tag; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); - print_tagq(h, t); + h = (struct html *)arg; - t = print_otag(h, TAG_BODY, 0, NULL); + if ((h->oflags & HTML_FRAGMENT) == 0) { + print_gen_decls(h); + print_otag(h, TAG_HTML, ""); + t = print_otag(h, TAG_HEAD, ""); + print_mdoc_head(&mdoc->meta, mdoc->first->child, h); + print_tagq(h, t); + print_otag(h, TAG_BODY, ""); + } - tag.key = ATTR_CLASS; - tag.val = "body"; - print_otag(h, TAG_DIV, 1, &tag); - - print_mdoc_nodelist(m, n, h); + mdoc_root_pre(&mdoc->meta, mdoc->first->child, h); + t = print_otag(h, TAG_DIV, "c", "manual-text"); + print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h); print_tagq(h, t); + mdoc_root_post(&mdoc->meta, mdoc->first->child, h); + print_tagq(h, NULL); } - -/* ARGSUSED */ static void print_mdoc_head(MDOC_ARGS) { - char b[BUFSIZ]; + char *cp; print_gen_head(h); - (void)snprintf(b, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); + if (meta->arch != NULL && meta->msec != NULL) + mandoc_asprintf(&cp, "%s(%s) (%s)", meta->title, + meta->msec, meta->arch); + else if (meta->msec != NULL) + mandoc_asprintf(&cp, "%s(%s)", meta->title, meta->msec); + else if (meta->arch != NULL) + mandoc_asprintf(&cp, "%s (%s)", meta->title, meta->arch); + else + cp = mandoc_strdup(meta->title); - 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_otag(h, TAG_TITLE, ""); + print_text(h, cp); + free(cp); } - static void print_mdoc_nodelist(MDOC_ARGS) { - print_mdoc_node(m, n, h); - if (n->next) - print_mdoc_nodelist(m, n->next, h); + while (n != NULL) { + print_mdoc_node(meta, n, h); + n = n->next; + } } - static void print_mdoc_node(MDOC_ARGS) { int child; struct tag *t; + if (n->flags & NODE_NOPRT) + return; + child = 1; - t = SLIST_FIRST(&h->tags); + t = h->tags.head; + n->flags &= ~NODE_ENDED; - bufinit(); - switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); - break; - case (MDOC_TEXT): + case ROFFT_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 && NODE_LINE & n->flags)
+			if ( ! (HTML_LITERAL & h->flags))
+				print_otag(h, TAG_BR, "");
+		if (NODE_DELIMC & n->flags)
+			h->flags |= HTML_NOSPACE;
 		print_text(h, n->string);
+		if (NODE_DELIMO & n->flags)
+			h->flags |= HTML_NOSPACE;
+		return;
+	case ROFFT_EQN:
+		print_eqn(h, n->eqn);
 		break;
+	case ROFFT_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 (h->flags & HTML_KEEP && n->flags & NODE_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 ROFFT_EQN:
 		break;
-	case (MDOC_TEXT):
-		break;
 	default:
-		if (mdocs[n->tok].post)
-			(*mdocs[n->tok].post)(m, n, h);
+		if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED)
+			break;
+		(*mdocs[n->tok].post)(meta, n, h);
+		if (n->end != ENDBODY_NOT)
+			n->body->flags |= NODE_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 tag	*t, *tt;
-	char		 b[BUFSIZ];
 
-	(void)localtime_r(&m->date, &tm);
+	t = print_otag(h, TAG_TABLE, "c", "foot");
+	print_otag(h, TAG_TBODY, "");
+	tt = print_otag(h, TAG_TR, "");
 
-	if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-		err(EXIT_FAILURE, "strftime");
-
-	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);
+	print_otag(h, TAG_TD, "c", "foot-date");
+	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);
+	print_otag(h, TAG_TD, "c", "foot-os");
+	print_text(h, meta->os);
 	print_tagq(h, t);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
 	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);
+	t = print_otag(h, TAG_TABLE, "c", "head");
+	print_otag(h, TAG_TBODY, "");
+	tt = print_otag(h, TAG_TR, "");
 
-	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);
-	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);
+	print_otag(h, TAG_TD, "c", "head-ltitle");
 	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);
+	print_otag(h, TAG_TD, "c", "head-vol");
+	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);
+	print_otag(h, TAG_TD, "c", "head-rtitle");
 	print_text(h, title);
 	print_tagq(h, t);
 
-	return(1);
+	free(title);
+	free(volume);
+	return 1;
 }
 
-
-/* ARGSUSED */
-static int
-mdoc_sh_pre(MDOC_ARGS)
+static char *
+make_id(const struct roff_node *n)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nch;
+	char			*buf, *cp;
 
-	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 (nch = n->child; nch != NULL; nch = nch->next)
+		if (nch->type != ROFFT_TEXT)
+			return NULL;
 
-		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);
-		return(1);
-	} else if (MDOC_BLOCK == n->type) {
-		tag[0].key = ATTR_CLASS;
-		tag[0].val = "sec-block";
+	buf = NULL;
+	deroff(&buf, n);
 
-		if (n->prev && NULL == n->prev->body->child) {
-			print_otag(h, TAG_DIV, 1, tag);
-			return(1);
-		}
+	/* http://www.w3.org/TR/html5/dom.html#the-id-attribute */
 
-		bufcat("margin-top: 1em;");
-		if (NULL == n->next)
-			bufcat("margin-bottom: 1em;");
+	for (cp = buf; *cp != '\0'; cp++)
+		if (*cp == ' ')
+			*cp = '_';
 
-		tag[1].key = ATTR_STYLE;
-		tag[1].val = buf;
+	return buf;
+}
 
-		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
+static int
+mdoc_sh_pre(MDOC_ARGS)
+{
+	char	*id;
+
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		return 1;
+	case ROFFT_BODY:
+		if (n->sec == SEC_AUTHORS)
+			h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
+		return 1;
+	default:
+		break;
 	}
 
-	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 ((id = make_id(n)) != NULL) {
+		print_otag(h, TAG_H1, "ci", "Sh", id);
+		free(id);
+	} else
+		print_otag(h, TAG_H1, "c", "Sh");
 
-	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	int		 	 i;
-	const struct mdoc_node	*nn;
+	char	*id;
 
-	i = 0;
+	if (n->type != ROFFT_HEAD)
+		return 1;
 
-	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);
-		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);
-		return(1);
-	}
+	if ((id = make_id(n)) != NULL) {
+		print_otag(h, TAG_H2, "ci", "Ss", id);
+		free(id);
+	} else
+		print_otag(h, TAG_H2, "c", "Ss");
 
-	buffmt("margin-left: -%dem;", INDENT - HALFINDENT);
-
-	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(" ");
-	}
-	tag[0].key = ATTR_NAME;
-	tag[0].val = buf;
-	print_otag(h, TAG_A, 1, tag);
-
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag;
+	print_otag(h, TAG_B, "c", "flag");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "flag";
+	/* `Cm' has no leading hyphen. */
 
-	print_otag(h, TAG_SPAN, 1, &tag);
-	if (MDOC_Fl == n->tok) {
-		print_text(h, "\\-");
+	if (MDOC_Cm == n->tok)
+		return 1;
+
+	print_text(h, "\\-");
+
+	if (!(n->child == NULL &&
+	    (n->next == NULL ||
+	     n->next->type == ROFFT_TEXT ||
+	     n->next->flags & NODE_LINE)))
 		h->flags |= HTML_NOSPACE;
-	}
-	return(1);
+
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag;
+	if (n->type != ROFFT_BODY)
+		return 1;
 
-	if (MDOC_BODY != n->type)
-		return(1);
+	/* XXX: this tag in theory can contain block elements. */
 
-	/* XXX - this can contain block elements! */
 	print_text(h, "\\(em");
-	tag.key = ATTR_CLASS;
-	tag.val = "desc-body";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "desc");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_op_pre(MDOC_ARGS)
+mdoc_nm_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag;
+	int		 len;
 
-	if (MDOC_BODY != n->type)
-		return(1);
+	switch (n->type) {
+	case ROFFT_HEAD:
+		print_otag(h, TAG_TD, "");
+		/* FALLTHROUGH */
+	case ROFFT_ELEM:
+		print_otag(h, TAG_B, "c", "name");
+		if (n->child == NULL && meta->name != NULL)
+			print_text(h, meta->name);
+		return 1;
+	case ROFFT_BODY:
+		print_otag(h, TAG_TD, "");
+		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);
+	print_otag(h, TAG_TABLE, "c", "synopsis");
 
+	for (len = 0, n = n->head->child; n; n = n->next)
+		if (n->type == ROFFT_TEXT)
+			len += html_strlen(n->string);
 
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
-{
+	if (len == 0 && meta->name != NULL)
+		len = html_strlen(meta->name);
 
-	if (MDOC_BODY != n->type) 
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(rB");
+	print_otag(h, TAG_COL, "shw", len);
+	print_otag(h, TAG_COL, "");
+	print_otag(h, TAG_TBODY, "");
+	print_otag(h, TAG_TR, "");
+	return 1;
 }
 
-
 static int
-mdoc_nm_pre(MDOC_ARGS)
+mdoc_xr_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);
+		return 0;
 
-	return(1);
-}
+	if (h->base_man)
+		print_otag(h, TAG_A, "chM", "Xr",
+		    n->child->string, n->child->next == NULL ?
+		    NULL : n->child->next->string);
+	else
+		print_otag(h, TAG_A, "c", "Xr");
 
+	n = n->child;
+	print_text(h, n->string);
 
-/* ARGSUSED */
-static int
-mdoc_xr_pre(MDOC_ARGS)
-{
-	struct htmlpair	 	 tag[2];
-	const char		*name, *sec;
-	const struct mdoc_node	*nn;
+	if (NULL == (n = n->next))
+		return 0;
 
-	nn = n->child;
-	name = nn && nn->string ? nn->string : "";
-	nn = nn ? nn->next : NULL;
-	sec = nn && nn->string ? nn->string : "";
-
-	buffmt("%s%s%s.html", name, name && sec ? "." : "", sec);
-
-	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);
-
-	nn = n->child;
-	print_text(h, nn->string);
-	if (NULL == (nn = nn->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);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-	h->flags |= HTML_NOSPACE;
-	return(1);
+	if ( ! (NODE_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);
-	return(1);
+	print_otag(h, TAG_I, "c", "arg");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
-	const char	*pp;
-	struct htmlpair	 tag;
+	print_otag(h, TAG_SPAN, "c", "unix");
+	return 1;
+}
 
-	switch (n->tok) {
-	case (MDOC_Bsx):
-		pp = "BSDI BSD/OS";
+static int
+mdoc_it_pre(MDOC_ARGS)
+{
+	const struct roff_node	*bl;
+	const char		*cattr;
+	enum mdoc_list		 type;
+
+	bl = n->parent;
+	while (bl != NULL && bl->tok != MDOC_Bl)
+		bl = bl->parent;
+	type = bl->norm->Bl.type;
+
+	switch (type) {
+	case LIST_bullet:
+		cattr = "It-bullet";
 		break;
-	case (MDOC_Dx):
-		pp = "DragonFlyBSD";
+	case LIST_dash:
+	case LIST_hyphen:
+		cattr = "It-dash";
 		break;
-	case (MDOC_Fx):
-		pp = "FreeBSD";
+	case LIST_item:
+		cattr = "It-item";
 		break;
-	case (MDOC_Nx):
-		pp = "NetBSD";
+	case LIST_enum:
+		cattr = "It-enum";
 		break;
-	case (MDOC_Ox):
-		pp = "OpenBSD";
+	case LIST_diag:
+		cattr = "It-diag";
 		break;
-	case (MDOC_Ux):
-		pp = "UNIX";
+	case LIST_hang:
+		cattr = "It-hang";
 		break;
-	default:
-		return(1);
-	}
-
-	tag.key = ATTR_CLASS;
-	tag.val = "unix";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-	print_text(h, pp);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bx_pre(MDOC_ARGS)
-{
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "unix";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-
-	for (nn = n->child; nn; nn = nn->next)
-		print_mdoc_node(m, nn, h);
-
-	if (n->child)
-		h->flags |= HTML_NOSPACE;
-
-	print_text(h, "BSD");
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
-{
-	struct htmlpair	 tag;
-
-	switch (t) {
-	case (MDOC_Column):
-		/* FALLTHROUGH */
-	case (MDOC_Item):
-		/* FALLTHROUGH */
-	case (MDOC_Ohang):
-		buffmt("margin-left: %dem; clear: both;", o);
+	case LIST_inset:
+		cattr = "It-inset";
 		break;
-	default:
-		buffmt("margin-left: %dem; clear: both;", w + o);
+	case LIST_ohang:
+		cattr = "It-ohang";
 		break;
-	}
-
-	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;");
-	}
-
-	tag.key = ATTR_STYLE;
-	tag.val = buf;
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
-{
-
-	print_otag(h, TAG_DIV, 0, NULL);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
-{
-	struct htmlpair	 tag;
-	struct ord	*ord;
-	char		 nbuf[BUFSIZ];
-
-	switch (t) {
-	case (MDOC_Item):
-		/* FALLTHROUGH */
-	case (MDOC_Ohang):
-		print_otag(h, TAG_DIV, 0, NULL);
+	case LIST_tag:
+		cattr = "It-tag";
 		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);
+	case LIST_column:
+		cattr = "It-column";
 		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;
 	}
 
-	switch (t) {
-	case (MDOC_Diag):
-		tag.key = ATTR_CLASS;
-		tag.val = "diag";
-		print_otag(h, TAG_SPAN, 1, &tag);
+	switch (type) {
+	case LIST_bullet:
+	case LIST_dash:
+	case LIST_hyphen:
+	case LIST_item:
+	case LIST_enum:
+		switch (n->type) {
+		case ROFFT_HEAD:
+			return 0;
+		case ROFFT_BODY:
+			print_otag(h, TAG_LI, "csvt", cattr,
+			    !bl->norm->Bl.comp);
+			break;
+		default:
+			break;
+		}
 		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);
+	case LIST_diag:
+	case LIST_hang:
+	case LIST_inset:
+	case LIST_ohang:
+	case LIST_tag:
+		switch (n->type) {
+		case ROFFT_HEAD:
+			print_otag(h, TAG_DT, "csvt", cattr,
+			    !bl->norm->Bl.comp);
+			if (type == LIST_diag)
+				print_otag(h, TAG_B, "c", cattr);
+			break;
+		case ROFFT_BODY:
+			if (bl->norm->Bl.width == NULL)
+				print_otag(h, TAG_DD, "c", cattr);
+			else
+				print_otag(h, TAG_DD, "cswl", cattr,
+				    bl->norm->Bl.width);
+			break;
+		default:
+			break;
+		}
+		break;
+	case LIST_column:
+		switch (n->type) {
+		case ROFFT_HEAD:
+			break;
+		case ROFFT_BODY:
+			print_otag(h, TAG_TD, "csvt", cattr,
+			    !bl->norm->Bl.comp);
+			break;
+		default:
+			print_otag(h, TAG_TR, "c", cattr);
+		}
 	default:
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
-
 static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
+mdoc_bl_pre(MDOC_ARGS)
 {
-	int			 i, w, o, c, wp;
-	const struct mdoc_node	*bl, *nn;
+	const char	*cattr;
+	int		 i;
+	enum htmltag	 elemtype;
 
-	bl = n->parent->parent;
-	if (MDOC_BLOCK != n->type) 
-		bl = bl->parent;
+	if (n->type == ROFFT_BODY) {
+		if (LIST_column == n->norm->Bl.type)
+			print_otag(h, TAG_TBODY, "");
+		return 1;
+	}
 
-	/* FIXME: fmt_vspace() equivalent. */
+	if (n->type == ROFFT_HEAD) {
+		if (LIST_column != n->norm->Bl.type)
+			return 0;
 
-	assert(bl->args);
+		/*
+		 * 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.
+		 */
 
-	w = o = c = 0;
-	wp = -1;
+		for (i = 0; i < (int)n->norm->Bl.ncols - 1; i++)
+			print_otag(h, TAG_COL, "sww", n->norm->Bl.cols[i]);
+		print_otag(h, TAG_COL, "swW", n->norm->Bl.cols[i]);
 
-	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]);
+		return 0;
 	}
 
-	switch (type) {
-	case (MDOC_Enum):
-		/* FALLTHROUGH */
-	case (MDOC_Dash):
-		/* FALLTHROUGH */
-	case (MDOC_Hyphen):
-		/* FALLTHROUGH */
-	case (MDOC_Bullet):
-		if (w < 4)
-			w = 4;
+	switch (n->norm->Bl.type) {
+	case LIST_bullet:
+		elemtype = TAG_UL;
+		cattr = "Bl-bullet";
 		break;
-	case (MDOC_Inset):
-		/* FALLTHROUGH */
-	case (MDOC_Diag):
-		w = 1;
+	case LIST_dash:
+	case LIST_hyphen:
+		elemtype = TAG_UL;
+		cattr = "Bl-dash";
 		break;
-	default:
-		if (0 == w)
-			w = 10;
+	case LIST_item:
+		elemtype = TAG_UL;
+		cattr = "Bl-item";
 		break;
-	}
-
-	switch (n->type) {
-	case (MDOC_BLOCK):
+	case LIST_enum:
+		elemtype = TAG_OL;
+		cattr = "Bl-enum";
 		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));
+	case LIST_diag:
+		elemtype = TAG_DL;
+		cattr = "Bl-diag";
+		break;
+	case LIST_hang:
+		elemtype = TAG_DL;
+		cattr = "Bl-hang";
+		break;
+	case LIST_inset:
+		elemtype = TAG_DL;
+		cattr = "Bl-inset";
+		break;
+	case LIST_ohang:
+		elemtype = TAG_DL;
+		cattr = "Bl-ohang";
+		break;
+	case LIST_tag:
+		elemtype = TAG_DL;
+		cattr = "Bl-tag";
+		break;
+	case LIST_column:
+		elemtype = TAG_TABLE;
+		cattr = "Bl-column";
+		break;
 	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)
-{
-	int		 type;
-
-	if (MDOC_BLOCK == n->type)
-		type = a2list(n->parent->parent);
+	if (n->norm->Bl.offs)
+		print_otag(h, elemtype, "csvtvbwl", cattr, 0, 0,
+		    n->norm->Bl.offs);
 	else
-		type = a2list(n->parent->parent->parent);
+		print_otag(h, elemtype, "csvtvb", cattr, 0, 0);
 
-	return(mdoc_tbl_pre(m, n, h, type));
+	return 1;
 }
 
-
-/* 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";
-
-	for (nn = n->child; nn; nn = nn->next) {
-		t = print_otag(h, TAG_SPAN, 1, &tag);
-		print_text(h, nn->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
-			h->flags &= ~HTML_NOSPACE;
-	}
-
-	if (n->child->next)
-		print_text(h, "utilities exit");
-	else
-		print_text(h, "utility exits");
-
-       	print_text(h, "0 on success, and >0 if an error occurs.");
-	return(0);
+	if (n->prev)
+		print_otag(h, TAG_BR, "");
+	return 1;
 }
 
-
-/* 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";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "emph");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag[2];
+	if (n->type != ROFFT_BLOCK)
+		return 1;
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
+	print_otag(h, TAG_DIV, "c", "D1");
 
-	buffmt("margin-left: %dem;", INDENT);
+	if (n->tok == MDOC_Dl)
+		print_otag(h, TAG_CODE, "c", "Li");
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "lit";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = buf;
-
-	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
+	char	*id;
 
-	bufcat("#");
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(nn->string);
-		if (nn->next)
-			bufcat(" ");
-	}
+	if ((id = make_id(n)) != NULL) {
+		print_otag(h, TAG_A, "chR", "Sx", id);
+		free(id);
+	} else
+		print_otag(h, TAG_A, "c", "Sx");
 
-	tag[0].key = ATTR_HREF;
-	tag[0].val = buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "link-sec";
-
-	print_otag(h, TAG_A, 2, tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_aq_pre(MDOC_ARGS)
+mdoc_bd_pre(MDOC_ARGS)
 {
+	int			 comp, offs, sv;
+	struct roff_node	*nn;
 
-	if (MDOC_BODY != n->type)
-		return(1);
-	print_text(h, "\\(la");
-	h->flags |= HTML_NOSPACE;
-	return(1);
-}
+	if (n->type == ROFFT_HEAD)
+		return 0;
 
+	if (n->type == ROFFT_BLOCK) {
+		comp = n->norm->Bd.comp;
+		for (nn = n; nn && ! comp; nn = nn->parent) {
+			if (nn->type != ROFFT_BLOCK)
+				continue;
+			if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
+				comp = 1;
+			if (nn->prev)
+				break;
+		}
+		if ( ! comp)
+			print_paragraph(h);
+		return 1;
+	}
 
-/* ARGSUSED */
-static void
-mdoc_aq_post(MDOC_ARGS)
-{
+	/* Handle the -offset argument. */
 
-	if (MDOC_BODY != n->type)
-		return;
-	h->flags |= HTML_NOSPACE;
-	print_text(h, "\\(ra");
-}
+	if (n->norm->Bd.offs == NULL ||
+	    ! strcmp(n->norm->Bd.offs, "left"))
+		offs = 0;
+	else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+		offs = INDENT;
+	else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+		offs = INDENT * 2;
+	else
+		offs = -1;
 
+	if (offs == -1)
+		print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);
+	else
+		print_otag(h, TAG_DIV, "cshl", "Bd", offs);
 
-/* ARGSUSED */
-static int
-mdoc_bd_pre(MDOC_ARGS)
-{
-	struct htmlpair	 	 tag[2];
-	int		 	 t, c, o, i;
-	const struct mdoc_node	*bl;
+	if (n->norm->Bd.type != DISP_unfilled &&
+	    n->norm->Bd.type != DISP_literal)
+		return 1;
 
-	/* FIXME: fmt_vspace() shit. */
+	print_otag(h, TAG_PRE, "c", "Li");
 
-	if (MDOC_BLOCK == n->type)
-		bl = n;
-	else if (MDOC_HEAD == n->type)
-		return(0);
-	else
-		bl = n->parent;
+	/* This can be recursive: save & set our literal state. */
 
-	t = o = c = 0;
+	sv = h->flags & HTML_LITERAL;
+	h->flags |= HTML_LITERAL;
 
-	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]);
+	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:
+		case MDOC_br:
+		case MDOC_sp:
+		case MDOC_Bl:
+		case MDOC_D1:
+		case MDOC_Dl:
+		case MDOC_Lp:
+		case MDOC_Pp:
+			continue;
+		default:
 			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 (h->flags & HTML_NONEWLINE ||
+		    (nn->next && ! (nn->next->flags & NODE_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");
 	}
 
-	return(0);
+	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);
-	return(1);
+	print_otag(h, TAG_I, "c", "file");
+	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);
-	return(1);
+	print_otag(h, TAG_I, "c", "addr");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_an_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	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;
+	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "author";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
-}
+	if (h->flags & HTML_SPLIT)
+		print_otag(h, TAG_BR, "");
 
+	if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
+		h->flags |= HTML_SPLIT;
 
-/* ARGSUSED */
+	print_otag(h, TAG_SPAN, "c", "author");
+	return 1;
+}
+
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "config";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	synopsis_pre(h, n);
+	print_otag(h, TAG_B, "c", "config");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "define";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "define");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "env";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "env");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_er_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "errno";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "errno");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
+	const struct roff_node	*nn;
 	struct tag		*t;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "farg";
-
 	if (n->parent->tok != MDOC_Fo) {
-		print_otag(h, TAG_SPAN, 1, &tag);
-		return(1);
+		print_otag(h, TAG_I, "c", "farg");
+		return 1;
 	}
 
 	for (nn = n->child; nn; nn = nn->next) {
-		t = print_otag(h, TAG_SPAN, 1, &tag);
+		t = print_otag(h, TAG_I, "c", "farg");
 		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);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct tag	*t;
+	char		*buf, *cp;
 
-	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);
+	synopsis_pre(h, n);
+
+	if (NULL == (n = n->child))
+		return 0;
+
+	assert(n->type == ROFFT_TEXT);
+
+	if (strcmp(n->string, "#include")) {
+		print_otag(h, TAG_B, "c", "macro");
+		return 1;
+	}
+
+	print_otag(h, TAG_B, "c", "includes");
+	print_text(h, n->string);
+
+	if (NULL != (n = n->next)) {
+		assert(n->type == ROFFT_TEXT);
+
+		if (h->base_includes) {
+			cp = n->string;
+			if (*cp == '<' || *cp == '"')
+				cp++;
+			buf = mandoc_strdup(cp);
+			cp = strchr(buf, '\0') - 1;
+			if (cp >= buf && (*cp == '>' || *cp == '"'))
+				*cp = '\0';
+			t = print_otag(h, TAG_A, "chI", "link-includes", buf);
+			free(buf);
 		} else
-			print_otag(h, TAG_DIV, 0, NULL);
+			t = print_otag(h, TAG_A, "c", "link-includes");
+
+		print_text(h, n->string);
+		print_tagq(h, t);
+
+		n = n->next;
 	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "macro";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	for ( ; n; n = n->next) {
+		assert(n->type == ROFFT_TEXT);
+		print_text(h, n->string);
+	}
+
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	if (n->type == ROFFT_BLOCK) {
+		synopsis_pre(h, n);
+		return 1;
+	} else if (n->type == ROFFT_ELEM) {
+		synopsis_pre(h, n);
+	} else if (n->type == ROFFT_HEAD)
+		return 0;
 
-	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);
-	}
-
-	tag.key = ATTR_CLASS;
-	tag.val = "type";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "type");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
-	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);
-	return(1);
+	synopsis_pre(h, n);
+	print_otag(h, TAG_I, "c", "ftype");
+	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;
+	char		 nbuf[BUFSIZ];
+	const char	*sp, *ep;
+	int		 sz, 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 = NODE_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((int)(ep - sp), BUFSIZ - 1);
-		(void)memcpy(nbuf, sp, (size_t)sz);
-		nbuf[sz] = '\0';
-		print_text(h, nbuf);
-		sp = ++ep;
-	}
 
-	print_tagq(h, t);
+	ep = strchr(sp, ' ');
+	if (NULL != ep) {
+		t = print_otag(h, TAG_I, "c", "ftype");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "fname";
-	t = print_otag(h, TAG_SPAN, 1, &tag);
-
-	if (sp) {
-		(void)strlcpy(nbuf, sp, BUFSIZ);
-		print_text(h, nbuf);
+		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);
 	}
 
+	t = print_otag(h, TAG_B, "c", "fname");
+
+	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);
+	for (n = n->child->next; n; n = n->next) {
+		if (NODE_SYNPRETTY & n->flags)
+			t = print_otag(h, TAG_I, "css?", "farg",
+			    "white-space", "nowrap");
+		else
+			t = print_otag(h, TAG_I, "c", "farg");
+		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);
+	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;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_lk_pre(MDOC_ARGS)
+mdoc_sp_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag[2];
+	struct roffsu	 su;
 
-	nn = n->child;
+	SCALE_VS_INIT(&su, 1);
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-ext";
-	tag[1].key = ATTR_HREF;
-	tag[1].val = nn->string;
+	if (MDOC_sp == n->tok) {
+		if (NULL != (n = n->child)) {
+			if ( ! a2roffsu(n->string, &su, SCALE_VS))
+				su.scale = 1.0;
+			else if (su.scale < 0.0)
+				su.scale = 0.0;
+		}
+	} else
+		su.scale = 0.0;
 
-	print_otag(h, TAG_A, 2, tag);
+	print_otag(h, TAG_DIV, "suh", &su);
 
-	if (NULL == nn->next)
-		return(1);
+	/* So the div isn't empty: */
+	print_text(h, "\\~");
 
-	for (nn = nn->next; nn; nn = nn->next) 
-		print_text(h, nn->string);
+	return 0;
 
-	return(0);
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_mt_pre(MDOC_ARGS)
+mdoc_lk_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
-	struct tag		*t;
-	const struct mdoc_node	*nn;
+	if (NULL == (n = n->child))
+		return 0;
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-mail";
+	assert(n->type == ROFFT_TEXT);
 
-	for (nn = n->child; nn; nn = nn->next) {
-		bufinit();
-		bufcat("mailto:");
-		bufcat(nn->string);
+	print_otag(h, TAG_A, "ch", "link-ext", n->string);
 
-		tag[1].key = ATTR_HREF;
-		tag[1].val = buf;
+	if (NULL == n->next)
+		print_text(h, n->string);
 
-		t = print_otag(h, TAG_A, 2, tag);
-		print_text(h, nn->string);
+	for (n = n->next; n; n = n->next)
+		print_text(h, n->string);
+
+	return 0;
+}
+
+static int
+mdoc_mt_pre(MDOC_ARGS)
+{
+	struct tag	*t;
+	char		*cp;
+
+	for (n = n->child; n; n = n->next) {
+		assert(n->type == ROFFT_TEXT);
+
+		mandoc_asprintf(&cp, "mailto:%s", n->string);
+		t = print_otag(h, TAG_A, "ch", "link-mail", cp);
+		print_text(h, n->string);
 		print_tagq(h, t);
+		free(cp);
 	}
-	
-	return(0);
+
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct tag	*t;
 
-	if (MDOC_BODY == n->type) {
+	if (n->type == ROFFT_BODY) {
 		h->flags |= HTML_NOSPACE;
 		print_text(h, "(");
 		h->flags |= HTML_NOSPACE;
-		return(1);
-	} else if (MDOC_BLOCK == n->type)
-		return(1);
+		return 1;
+	} else if (n->type == ROFFT_BLOCK) {
+		synopsis_pre(h, n);
+		return 1;
+	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "fname";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	if (n->child == NULL)
+		return 0;
+
+	assert(n->child->string);
+	t = print_otag(h, TAG_B, "c", "fname");
+	print_text(h, n->child->string);
+	print_tagq(h, t);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
-	if (MDOC_BODY != n->type)
+
+	if (n->type != ROFFT_BODY)
 		return;
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
@@ -1780,400 +1357,431 @@ 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;
 
-	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);
+	print_otag(h, TAG_B, "c", "includes");
 
-	tag.key = ATTR_CLASS;
-	tag.val = "includes";
+	/*
+	 * 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.
+	 */
 
-	print_otag(h, TAG_SPAN, 1, &tag);
-
-	if (SEC_SYNOPSIS == n->sec)
+	if (NODE_SYNPRETTY & n->flags && NODE_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(n->type == ROFFT_TEXT);
 
-	for (nn = n->child; nn; nn = nn->next)
-		print_mdoc_node(m, nn, h);
+		if (h->base_includes)
+			t = print_otag(h, TAG_A, "chI", "link-includes",
+			    n->string);
+		else
+			t = print_otag(h, TAG_A, "c", "link-includes");
+		print_text(h, n->string);
+		print_tagq(h, t);
 
+		n = n->next;
+	}
+
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ">");
 
-	return(0);
+	for ( ; n; n = n->next) {
+		assert(n->type == ROFFT_TEXT);
+		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);
-	return(1);
+	print_otag(h, TAG_B, "c", "cmd");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_rv_pre(MDOC_ARGS)
-{
-	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
-	struct tag		*t;
-
-	print_otag(h, TAG_DIV, 0, NULL);
-
-	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);
-		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, "()");
-	}
-
-	if (n->child->next)
-		print_text(h, "functions return");
-	else
-		print_text(h, "function returns");
-
-       	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);
-	print_text(h, "errno");
-	print_tagq(h, t);
-       	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);
-	return(1);
+	print_otag(h, TAG_B, "c", "var");
+	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);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
-	int		i;
-	struct htmlpair	tag[2];
+	const char	*cattr;
 
-	if (MDOC_HEAD == n->type)
-		return(0);
-	else if (MDOC_BLOCK != n->type)
-		return(1);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type != ROFFT_BODY)
+		return 1;
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = NULL;
+	if (FONT_Em == n->norm->Bf.font)
+		cattr = "emph";
+	else if (FONT_Sy == n->norm->Bf.font)
+		cattr = "symb";
+	else if (FONT_Li == n->norm->Bf.font)
+		cattr = "Li";
+	else
+		cattr = "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;
-			}
-	}
+	/*
+	 * We want this to be inline-formatted, but needs to be div to
+	 * accept block children.
+	 */
 
-	/* 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;";
-	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	print_otag(h, TAG_DIV, "css?hl", cattr, "display", "inline", 1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "symb";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "symb");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_pf_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)
 {
 
 	h->flags |= HTML_IGNDELIM;
-	return(1);
+	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 & NODE_LINE))
+		h->flags |= HTML_NOSPACE;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	if (n->type != ROFFT_BLOCK)
+		return 1;
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
+	if (n->prev && SEC_SEE_ALSO == n->sec)
+		print_paragraph(h);
 
-	if (n->prev && SEC_SEE_ALSO == n->sec) {
-		tag.key = ATTR_STYLE;
-		tag.val = "margin-top: 1em;";
-		print_otag(h, TAG_DIV, 1, &tag);
-	}
+	print_otag(h, TAG_SPAN, "c", "Rs");
+	return 1;
+}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "ref";
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+static int
+mdoc_no_pre(MDOC_ARGS)
+{
+	print_otag(h, TAG_SPAN, "c", "none");
+	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);
-	return(1);
+	print_otag(h, TAG_CODE, "c", "Li");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "symb";
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SPAN, "c", "symb");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_bt_pre(MDOC_ARGS)
+mdoc_lb_pre(MDOC_ARGS)
 {
+	if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
+		print_otag(h, TAG_BR, "");
 
-	print_text(h, "is currently in beta test.");
-	return(0);
+	print_otag(h, TAG_SPAN, "c", "lib");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-mdoc_ud_pre(MDOC_ARGS)
+mdoc__x_pre(MDOC_ARGS)
 {
+	const char	*cattr;
+	enum htmltag	 t;
 
-	print_text(h, "currently under development.");
-	return(0);
+	t = TAG_SPAN;
+
+	switch (n->tok) {
+	case MDOC__A:
+		cattr = "RsA";
+		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:
+		t = TAG_I;
+		cattr = "RsB";
+		break;
+	case MDOC__C:
+		cattr = "RsC";
+		break;
+	case MDOC__D:
+		cattr = "RsD";
+		break;
+	case MDOC__I:
+		t = TAG_I;
+		cattr = "RsI";
+		break;
+	case MDOC__J:
+		t = TAG_I;
+		cattr = "RsJ";
+		break;
+	case MDOC__N:
+		cattr = "RsN";
+		break;
+	case MDOC__O:
+		cattr = "RsO";
+		break;
+	case MDOC__P:
+		cattr = "RsP";
+		break;
+	case MDOC__Q:
+		cattr = "RsQ";
+		break;
+	case MDOC__R:
+		cattr = "RsR";
+		break;
+	case MDOC__T:
+		cattr = "RsT";
+		break;
+	case MDOC__U:
+		print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+		return 1;
+	case MDOC__V:
+		cattr = "RsV";
+		break;
+	default:
+		abort();
+	}
+
+	print_otag(h, t, "c", cattr);
+	return 1;
 }
 
+static void
+mdoc__x_post(MDOC_ARGS)
+{
 
-/* ARGSUSED */
+	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_lb_pre(MDOC_ARGS)
+mdoc_bk_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
 
-	tag.key = ATTR_CLASS;
-	tag.val = "lib";
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		break;
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
+		if (n->parent->args != NULL || n->prev->child == NULL)
+			h->flags |= HTML_PREKEEP;
+		break;
+	default:
+		abort();
+	}
 
-	if (SEC_SYNOPSIS == n->sec)
-		print_otag(h, TAG_DIV, 0, NULL);
-
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
 
-/* ARGSUSED */
+	if (n->type == ROFFT_BODY)
+		h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}
+
 static int
-mdoc__x_pre(MDOC_ARGS)
+mdoc_quote_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	if (n->type != ROFFT_BODY)
+		return 1;
 
-	tag.key = ATTR_CLASS;
-
 	switch (n->tok) {
-	case(MDOC__A):
-		tag.val = "ref-auth";
+	case MDOC_Ao:
+	case MDOC_Aq:
+		print_text(h, n->child != NULL && n->child->next == NULL &&
+		    n->child->tok == MDOC_Mt ?  "<" : "\\(la");
 		break;
-	case(MDOC__B):
-		tag.val = "ref-book";
+	case MDOC_Bro:
+	case MDOC_Brq:
+		print_text(h, "\\(lC");
 		break;
-	case(MDOC__C):
-		tag.val = "ref-city";
+	case MDOC_Bo:
+	case MDOC_Bq:
+		print_text(h, "\\(lB");
 		break;
-	case(MDOC__D):
-		tag.val = "ref-date";
+	case MDOC_Oo:
+	case MDOC_Op:
+		print_text(h, "\\(lB");
+		h->flags |= HTML_NOSPACE;
+		print_otag(h, TAG_SPAN, "c", "opt");
 		break;
-	case(MDOC__I):
-		tag.val = "ref-issue";
+	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__J):
-		tag.val = "ref-jrnl";
+	case MDOC_Do:
+	case MDOC_Dq:
+	case MDOC_Qo:
+	case MDOC_Qq:
+		print_text(h, "\\(lq");
 		break;
-	case(MDOC__N):
-		tag.val = "ref-num";
+	case MDOC_Po:
+	case MDOC_Pq:
+		print_text(h, "(");
 		break;
-	case(MDOC__O):
-		tag.val = "ref-opt";
-		break;
-	case(MDOC__P):
-		tag.val = "ref-page";
-		break;
-	case(MDOC__Q):
-		tag.val = "ref-corp";
-		break;
-	case(MDOC__R):
-		tag.val = "ref-rep";
-		break;
-	case(MDOC__T):
-		print_text(h, "\\(lq");
+	case MDOC_Ql:
+		print_text(h, "\\(oq");
 		h->flags |= HTML_NOSPACE;
-		tag.val = "ref-title";
+		print_otag(h, TAG_CODE, "c", "Li");
 		break;
-	case(MDOC__V):
-		tag.val = "ref-vol";
+	case MDOC_So:
+	case MDOC_Sq:
+		print_text(h, "\\(oq");
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	h->flags |= HTML_NOSPACE;
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
-mdoc__x_post(MDOC_ARGS)
+mdoc_quote_post(MDOC_ARGS)
 {
 
+	if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
+		return;
+
 	h->flags |= HTML_NOSPACE;
+
 	switch (n->tok) {
-	case (MDOC__T):
+	case MDOC_Ao:
+	case MDOC_Aq:
+		print_text(h, n->child != NULL && n->child->next == NULL &&
+		    n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
+		break;
+	case MDOC_Bro:
+	case MDOC_Brq:
+		print_text(h, "\\(rC");
+		break;
+	case MDOC_Oo:
+	case MDOC_Op:
+	case MDOC_Bo:
+	case MDOC_Bq:
+		print_text(h, "\\(rB");
+		break;
+	case MDOC_En:
+		if (n->norm->Es == NULL ||
+		    n->norm->Es->child == NULL ||
+		    n->norm->Es->child->next == NULL)
+			h->flags &= ~HTML_NOSPACE;
+		else
+			print_text(h, n->norm->Es->child->next->string);
+		break;
+	case MDOC_Qo:
+	case MDOC_Qq:
+	case MDOC_Do:
+	case MDOC_Dq:
 		print_text(h, "\\(rq");
-		h->flags |= HTML_NOSPACE;
 		break;
-	default:
+	case MDOC_Po:
+	case MDOC_Pq:
+		print_text(h, ")");
 		break;
+	case MDOC_Ql:
+	case MDOC_So:
+	case MDOC_Sq:
+		print_text(h, "\\(cq");
+		break;
+	default:
+		abort();
 	}
-	print_text(h, n->next ? "," : ".");
+}
+
+static int
+mdoc_eo_pre(MDOC_ARGS)
+{
+
+	if (n->type != ROFFT_BODY)
+		return 1;
+
+	if (n->end == ENDBODY_NOT &&
+	    n->parent->head->child == NULL &&
+	    n->child != NULL &&
+	    n->child->end != ENDBODY_NOT)
+		print_text(h, "\\&");
+	else if (n->end != ENDBODY_NOT ? n->child != NULL :
+	    n->parent->head->child != NULL && (n->child != NULL ||
+	    (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+		h->flags |= HTML_NOSPACE;
+	return 1;
+}
+
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+	int	 body, tail;
+
+	if (n->type != ROFFT_BODY)
+		return;
+
+	if (n->end != ENDBODY_NOT) {
+		h->flags &= ~HTML_NOSPACE;
+		return;
+	}
+
+	body = n->child != NULL || n->parent->head->child != NULL;
+	tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+	if (body && tail)
+		h->flags |= HTML_NOSPACE;
+	else if ( ! tail)
+		h->flags &= ~HTML_NOSPACE;
 }