===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.38
retrieving revision 1.44
diff -u -p -r1.38 -r1.44
--- mandoc/html.c	2009/09/20 17:48:13	1.38
+++ mandoc/html.c	2009/09/21 13:42:01	1.44
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.38 2009/09/20 17:48:13 kristaps Exp $ */
+/*	$Id: html.c,v 1.44 2009/09/21 13:42:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
 #include <sys/queue.h>
 
 #include <assert.h>
@@ -32,7 +33,6 @@
 
 #define	INDENT		 5
 #define	HALFINDENT	 3
-#define	PX_MULT		 8
 
 enum	htmltag {
 	TAG_HTML,
@@ -55,6 +55,7 @@ enum	htmltag {
 	TAG_LI,
 	TAG_UL,
 	TAG_OL,
+	TAG_BASE,
 	TAG_MAX
 };
 
@@ -101,6 +102,7 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"li",		HTML_CLRLINE}, /* TAG_LI */
 	{"ul",		HTML_CLRLINE}, /* TAG_UL */
 	{"ol",		HTML_CLRLINE}, /* TAG_OL */
+	{"base",	HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
 };
 
 static	const char	 *const htmlattrs[ATTR_MAX] = {
@@ -143,6 +145,8 @@ struct	html {
 	struct tagq	  tags;
 	struct ordq	  ords;
 	void		 *symtab;
+	char		 *base;
+	char		 *style;
 };
 
 #define	MDOC_ARGS	  const struct mdoc_meta *m, \
@@ -160,11 +164,10 @@ static	void		  print_gen_doctype(struct html *);
 static	void		  print_gen_head(struct html *);
 static	void		  print_mdoc(MDOC_ARGS);
 static	void		  print_mdoc_head(MDOC_ARGS);
-static	void		  print_mdoc_title(MDOC_ARGS);
 static	void		  print_mdoc_node(MDOC_ARGS);
+static	void		  print_mdoc_nodelist(MDOC_ARGS);
 static	void		  print_man(MAN_ARGS);
 static	void		  print_man_head(MAN_ARGS);
-static	void		  print_man_body(MAN_ARGS);
 static	struct tag	 *print_otag(struct html *, enum htmltag, 
 				int, const struct htmlpair *);
 static	void		  print_tagq(struct html *, const struct tag *);
@@ -180,22 +183,34 @@ 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	int		  mdoc_ad_pre(MDOC_ARGS);
+static	int		  mdoc_an_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	void		  mdoc_bl_post(MDOC_ARGS);
 static	int		  mdoc_bl_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);
 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	int		  mdoc_er_pre(MDOC_ARGS);
+static	int		  mdoc_ev_pre(MDOC_ARGS);
 static	int		  mdoc_ex_pre(MDOC_ARGS);
 static	int		  mdoc_it_pre(MDOC_ARGS);
 static	int		  mdoc_nd_pre(MDOC_ARGS);
@@ -203,24 +218,29 @@ 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	int		  mdoc_pp_pre(MDOC_ARGS);
 static	void		  mdoc_pq_post(MDOC_ARGS);
 static	int		  mdoc_pq_pre(MDOC_ARGS);
+static	void		  mdoc_qq_post(MDOC_ARGS);
+static	int		  mdoc_qq_pre(MDOC_ARGS);
 static	int		  mdoc_sh_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_vt_pre(MDOC_ARGS);
 static	int		  mdoc_xr_pre(MDOC_ARGS);
 static	int		  mdoc_xx_pre(MDOC_ARGS);
 
 #ifdef __linux__
+extern	int		  getsubopt(char **, char * const *, char **);
 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] = {
-	{NULL, NULL}, /* Ap */
+	{mdoc_pp_pre, NULL}, /* Ap */
 	{NULL, NULL}, /* Dd */
 	{NULL, NULL}, /* Dt */
 	{NULL, NULL}, /* Os */
@@ -229,25 +249,25 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_pp_pre, NULL}, /* Pp */ 
 	{mdoc_d1_pre, NULL}, /* D1 */
 	{mdoc_d1_pre, NULL}, /* Dl */
-	{NULL, NULL}, /* Bd */
+	{mdoc_bd_pre, NULL}, /* Bd */
 	{NULL, NULL}, /* Ed */
 	{mdoc_bl_pre, mdoc_bl_post}, /* Bl */
 	{NULL, NULL}, /* El */
 	{mdoc_it_pre, NULL}, /* It */
-	{NULL, NULL}, /* Ad */ 
-	{NULL, NULL}, /* An */
+	{mdoc_ad_pre, NULL}, /* Ad */ 
+	{mdoc_an_pre, NULL}, /* An */
 	{mdoc_ar_pre, NULL}, /* Ar */
-	{NULL, NULL}, /* Cd */
-	{NULL, NULL}, /* Cm */
-	{NULL, NULL}, /* Dv */ 
-	{NULL, NULL}, /* Er */ 
-	{NULL, NULL}, /* Ev */ 
+	{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_ex_pre, NULL}, /* Ex */
-	{NULL, NULL}, /* Fa */ 
-	{NULL, NULL}, /* Fd */ 
+	{mdoc_fa_pre, NULL}, /* Fa */ 
+	{mdoc_fd_pre, NULL}, /* Fd */ 
 	{mdoc_fl_pre, NULL}, /* Fl */
-	{NULL, NULL}, /* Fn */ 
-	{NULL, NULL}, /* Ft */ 
+	{mdoc_fn_pre, NULL}, /* Fn */ 
+	{mdoc_ft_pre, NULL}, /* Ft */ 
 	{NULL, NULL}, /* Ic */ 
 	{NULL, NULL}, /* In */ 
 	{NULL, NULL}, /* Li */
@@ -255,11 +275,11 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_nm_pre, NULL}, /* Nm */ 
 	{mdoc_op_pre, mdoc_op_post}, /* Op */
 	{NULL, NULL}, /* Ot */
-	{NULL, NULL}, /* Pa */
+	{mdoc_pa_pre, NULL}, /* Pa */
 	{NULL, NULL}, /* Rv */
 	{NULL, NULL}, /* St */ 
 	{NULL, NULL}, /* Va */
-	{NULL, NULL}, /* Vt */ 
+	{mdoc_vt_pre, NULL}, /* Vt */ 
 	{mdoc_xr_pre, NULL}, /* Xr */
 	{NULL, NULL}, /* %A */
 	{NULL, NULL}, /* %B */
@@ -302,8 +322,8 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_pq_pre, mdoc_pq_post}, /* Pq */
 	{NULL, NULL}, /* Qc */
 	{NULL, NULL}, /* Ql */
-	{NULL, NULL}, /* Qo */
-	{NULL, NULL}, /* Qq */
+	{mdoc_qq_pre, mdoc_qq_post}, /* Qo */
+	{mdoc_qq_pre, mdoc_qq_post}, /* Qq */
 	{NULL, NULL}, /* Re */
 	{NULL, NULL}, /* Rs */
 	{NULL, NULL}, /* Sc */
@@ -383,10 +403,15 @@ html_man(void *arg, const struct man *m)
 
 
 void *
-html_alloc(void)
+html_alloc(char *outopts)
 {
 	struct html	*h;
+	char		*toks[3], *v;
 
+	toks[0] = "style";
+	toks[1] = "base";
+	toks[2] = NULL;
+
 	if (NULL == (h = calloc(1, sizeof(struct html))))
 		return(NULL);
 
@@ -397,6 +422,19 @@ html_alloc(void)
 		free(h);
 		return(NULL);
 	}
+
+	while (*outopts)
+		switch (getsubopt(&outopts, toks, &v)) {
+		case (0):
+			h->style = v;
+			break;
+		case (1):
+			h->base = v;
+			break;
+		default:
+			break;
+		}
+
 	return(h);
 }
 
@@ -428,6 +466,93 @@ html_free(void *p)
 }
 
 
+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:
+			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);
+}
+
+
 static void
 print_mdoc(MDOC_ARGS)
 {
@@ -438,8 +563,7 @@ print_mdoc(MDOC_ARGS)
 	print_tagq(h, t);
 
 	t = print_otag(h, TAG_BODY, 0, NULL);
-	print_mdoc_title(m, n, h);
-	print_mdoc_node(m, n, h);
+	print_mdoc_nodelist(m, n, h);
 	print_tagq(h, t);
 }
 
@@ -447,32 +571,37 @@ print_mdoc(MDOC_ARGS)
 static void
 print_gen_head(struct html *h)
 {
-	struct htmlpair	 meta0[2];
-	struct htmlpair	 meta1[2];
-	struct htmlpair	 link[4];
+	struct htmlpair	 tag[4];
 
-	meta0[0].key = ATTR_HTTPEQUIV;
-	meta0[0].val = "Content-Type";
-	meta0[1].key = ATTR_CONTENT;
-	meta0[1].val = "text/html; charset=utf-8";
+	tag[0].key = ATTR_HTTPEQUIV;
+	tag[0].val = "Content-Type";
+	tag[1].key = ATTR_CONTENT;
+	tag[1].val = "text/html; charset=utf-8";
+	print_otag(h, TAG_META, 2, tag);
 
-	meta1[0].key = ATTR_NAME;
-	meta1[0].val = "resource-type";
-	meta1[1].key = ATTR_CONTENT;
-	meta1[1].val = "document";
+	tag[0].key = ATTR_NAME;
+	tag[0].val = "resource-type";
+	tag[1].key = ATTR_CONTENT;
+	tag[1].val = "document";
+	print_otag(h, TAG_META, 2, tag);
 
-	link[0].key = ATTR_REL;
-	link[0].val = "stylesheet";
-	link[1].key = ATTR_HREF;
-	link[1].val = "style.css"; /* XXX */
-	link[2].key = ATTR_TYPE;
-	link[2].val = "text/css";
-	link[3].key = ATTR_MEDIA;
-	link[3].val = "all";
+	if (h->style) {
+		tag[0].key = ATTR_REL;
+		tag[0].val = "stylesheet";
+		tag[1].key = ATTR_HREF;
+		tag[1].val = h->style;
+		tag[2].key = ATTR_TYPE;
+		tag[2].val = "text/css";
+		tag[3].key = ATTR_MEDIA;
+		tag[3].val = "all";
+		print_otag(h, TAG_LINK, 4, tag);
+	}
 
-	print_otag(h, TAG_META, 2, meta0);
-	print_otag(h, TAG_META, 2, meta1);
-	print_otag(h, TAG_LINK, 4, link);
+	if (h->base) {
+		tag[0].key = ATTR_HREF;
+		tag[1].val = h->base;
+		print_otag(h, TAG_BASE, 1, tag);
+	}
 }
 
 
@@ -483,16 +612,17 @@ print_mdoc_head(MDOC_ARGS)
 
 	print_gen_head(h);
 	print_otag(h, TAG_TITLE, 0, NULL);
-	print_encode(h, m->title);
+	print_text(h, m->title);
 }
 
 
-/* ARGSUSED */
 static void
-print_mdoc_title(MDOC_ARGS)
+print_mdoc_nodelist(MDOC_ARGS)
 {
 
-	/* TODO */
+	print_mdoc_node(m, n, h);
+	if (n->next)
+		print_mdoc_nodelist(m, n->next, h);
 }
 
 
@@ -521,7 +651,7 @@ print_mdoc_node(MDOC_ARGS)
 	}
 
 	if (child && n->child)
-		print_mdoc_node(m, n->child, h);
+		print_mdoc_nodelist(m, n->child, h);
 
 	print_stagq(h, t);
 
@@ -529,6 +659,7 @@ print_mdoc_node(MDOC_ARGS)
 
 	switch (n->type) {
 	case (MDOC_ROOT):
+		mdoc_root_post(m, n, h);
 		break;
 	case (MDOC_TEXT):
 		break;
@@ -537,9 +668,6 @@ print_mdoc_node(MDOC_ARGS)
 			(*mdocs[n->tok].post)(m, n, h);
 		break;
 	}
-
-	if (n->next)
-		print_mdoc_node(m, n->next, h);
 }
 
 
@@ -553,7 +681,7 @@ print_man(MAN_ARGS)
 	print_tagq(h, t);
 
 	t = print_otag(h, TAG_BODY, 0, NULL);
-	print_man_body(m, n, h);
+	/*print_man_body(m, n, h);*/
 	print_tagq(h, t);
 }
 
@@ -565,20 +693,11 @@ print_man_head(MAN_ARGS)
 
 	print_gen_head(h);
 	print_otag(h, TAG_TITLE, 0, NULL);
-	print_encode(h, m->title);
+	print_text(h, m->title);
 }
 
 
-/* ARGSUSED */
 static void
-print_man_body(MAN_ARGS)
-{
-
-	/* TODO */
-}
-
-
-static void
 print_spec(struct html *h, const char *p, int len)
 {
 	const char	*rhs;
@@ -884,108 +1003,89 @@ print_stagq(struct html *h, const struct tag *suntil)
 }
 
 
-/* FIXME: put in utility file for front-ends. */
-static int
-a2offs(const char *p)
+/* ARGSUSED */
+static void
+mdoc_root_post(MDOC_ARGS)
 {
-	int		 len, i;
+	struct tm	 tm;
+	struct htmlpair	 tag[2];
+	struct tag	*t, *tt;
+	char		 b[BUFSIZ];
 
-	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);
+	(void)localtime_r(&m->date, &tm);
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
+	if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
+		err(EXIT_FAILURE, "strftime");
 
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+	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);
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
+	tag[0].key = ATTR_STYLE;
+	tag[0].val = "width: 50%;";
+	print_otag(h, TAG_TD, 1, tag);
+	print_text(h, b);
+	print_stagq(h, tt);
 
-	return(len);
+	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_tagq(h, t);
 }
 
 
-/* FIXME: put in utility file for front-ends. */
+/* ARGSUSED */
 static int
-a2list(const struct mdoc_node *bl)
+mdoc_root_pre(MDOC_ARGS)
 {
-	int		 i;
+	struct htmlpair	 tag[2];
+	struct tag	*t, *tt;
+	char		 b[BUFSIZ], title[BUFSIZ];
 
-	assert(MDOC_BLOCK == bl->type && MDOC_Bl == bl->tok);
-	assert(bl->args);
+	(void)strlcpy(b, m->vol, BUFSIZ);
 
-	for (i = 0; i < (int)bl->args->argc; i++) 
-		switch (bl->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(bl->args->argv[i].arg);
-		default:
-			break;
-		}
+	if (m->arch) {
+		(void)strlcat(b, " (", BUFSIZ);
+		(void)strlcat(b, m->arch, BUFSIZ);
+		(void)strlcat(b, ")", BUFSIZ);
+	}
 
-	abort();
-	/* NOTREACHED */
-}
+	(void)snprintf(title, BUFSIZ - 1, 
+			"%s(%d)", m->title, m->msec);
 
+	tag[0].key = ATTR_CLASS;
+	tag[0].val = "body";
+	t = print_otag(h, TAG_DIV, 1, tag);
 
-/* FIXME: put in utility file for front-ends. */
-static int
-a2width(const char *p)
-{
-	int		 i, len;
+	tag[0].key = ATTR_CLASS;
+	tag[0].val = "header";
+	tag[1].key = ATTR_STYLE;
+	tag[1].val = "width: 100%;";
+	print_otag(h, TAG_TABLE, 2, tag);
+	tt = print_otag(h, TAG_TR, 0, NULL);
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+	tag[0].key = ATTR_STYLE;
+	tag[0].val = "width: 33%;";
+	print_otag(h, TAG_TD, 1, tag);
+	print_text(h, b);
+	print_stagq(h, tt);
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p) + 2);
+	tag[0].key = ATTR_STYLE;
+	tag[0].val = "width: 33%; text-align: center;";
+	print_otag(h, TAG_TD, 1, tag);
+	print_text(h, title);
+	print_stagq(h, tt);
 
-	return(len + 2);
-}
+	tag[0].key = ATTR_STYLE;
+	tag[0].val = "width: 33%; text-align: right;";
+	print_otag(h, TAG_TD, 1, tag);
+	print_text(h, b);
+	print_stagq(h, t);
 
-
-
-
-/* ARGSUSED */
-static int
-mdoc_root_pre(MDOC_ARGS)
-{
-	struct htmlpair	 tag;
-
-	tag.key = ATTR_CLASS;
-	tag.val = "body";
-
-	print_otag(h, TAG_DIV, 1, &tag);
 	return(1);
 }
 
@@ -994,26 +1094,46 @@ mdoc_root_pre(MDOC_ARGS)
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag[2];
+	struct htmlpair		 tag[2];
+	const struct mdoc_node	*nn;
 
 	if (MDOC_HEAD == n->type) {
 		tag[0].key = ATTR_CLASS;
 		tag[0].val = "sec-head";
 		print_otag(h, TAG_DIV, 1, tag);
 		print_otag(h, TAG_SPAN, 1, tag);
+
+		for (nn = n->child; nn; nn = nn->next) {
+			bufcat(nn->string);
+			if (nn->next)
+				bufcat(" ");
+		}
+		tag[0].key = ATTR_NAME;
+		tag[0].val = buf;
+		print_otag(h, TAG_A, 1, tag);
 		return(1);
 	} else if (MDOC_BLOCK == n->type) {
 		tag[0].key = ATTR_CLASS;
 		tag[0].val = "sec-block";
-		print_otag(h, TAG_DIV, 1, tag);
+
+		if (n->prev && NULL == n->prev->body->child) {
+			print_otag(h, TAG_DIV, 1, tag);
+			return(1);
+		}
+
+		bufcat("margin-top: 1em;");
+		if (NULL == n->next)
+			bufcat("margin-bottom: 1em;");
+
+		tag[1].key = ATTR_STYLE;
+		tag[1].val = buf;
+
+		print_otag(h, TAG_DIV, 2, tag);
 		return(1);
 	}
 
 	buffmt("margin-left: %dem;", INDENT);
 	
-	if (n->parent->next && n->child)
-		bufcat("margin-bottom: 1em;");
-
 	tag[0].key = ATTR_CLASS;
 	tag[0].val = "sec-body";
 	tag[1].key = ATTR_STYLE;
@@ -1028,8 +1148,9 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
-	int		 i;
+	struct htmlpair	 	 tag[2];
+	int		 	 i;
+	const struct mdoc_node	*nn;
 
 	i = 0;
 
@@ -1064,6 +1185,17 @@ mdoc_ss_pre(MDOC_ARGS)
 
 	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);
 }
 
@@ -1078,8 +1210,10 @@ mdoc_fl_pre(MDOC_ARGS)
 	tag.val = "flag";
 
 	print_otag(h, TAG_SPAN, 1, &tag);
-	print_text(h, "\\-");
-	h->flags |= HTML_NOSPACE;
+	if (MDOC_Fl == n->tok) {
+		print_text(h, "\\-");
+		h->flags |= HTML_NOSPACE;
+	}
 	return(1);
 }
 
@@ -1090,12 +1224,8 @@ mdoc_pp_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	bufcat("clear: both;");
-	bufcat("height: 1em;");
-
 	tag.key = ATTR_STYLE;
-	tag.val = buf;
-
+	tag.val = "clear: both; height: 1em;";
 	print_otag(h, TAG_DIV, 1, &tag);
 	return(0);
 }
@@ -1176,24 +1306,32 @@ mdoc_nm_pre(MDOC_ARGS)
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag[2];
+	struct htmlpair	 	 tag[2];
+	const char		*name, *sec;
+	const struct mdoc_node	*nn;
 
+	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 = "#"; /* TODO */
-
+	tag[1].val = buf;
 	print_otag(h, TAG_A, 2, tag);
 
-	n = n->child;
-	print_text(h, n->string);
-	if (NULL == (n = n->next))
+	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, n->string);
+	print_text(h, nn->string);
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
 
@@ -1443,6 +1581,7 @@ mdoc_tbl_pre(MDOC_ARGS, int type)
 }
 
 
+/* ARGSUSED */
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
@@ -1464,6 +1603,7 @@ mdoc_bl_pre(MDOC_ARGS)
 }
 
 
+/* ARGSUSED */
 static void
 mdoc_bl_post(MDOC_ARGS)
 {
@@ -1646,10 +1786,18 @@ mdoc_d1_pre(MDOC_ARGS)
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag[2];
+	struct htmlpair		 tag[2];
+	const struct mdoc_node	*nn;
 
+	bufcat("#");
+	for (nn = n->child; nn; nn = nn->next) {
+		bufcat(nn->string);
+		if (nn->next)
+			bufcat(" ");
+	}
+
 	tag[0].key = ATTR_HREF;
-	tag[0].val = "#"; /* XXX */
+	tag[0].val = buf;
 	tag[1].key = ATTR_CLASS;
 	tag[1].val = "link-sec";
 
@@ -1682,3 +1830,337 @@ mdoc_aq_post(MDOC_ARGS)
 	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;
+
+	/* FIXME: fmt_vspace() shit. */
+
+	if (MDOC_BLOCK == n->type)
+		bl = n;
+	else 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("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-block";
+
+	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);
+}
+
+
+/* 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);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_qq_pre(MDOC_ARGS)
+{
+
+	if (MDOC_BODY != n->type)
+		return(1);
+	print_text(h, "\\*q");
+	h->flags |= HTML_NOSPACE;
+	return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_qq_post(MDOC_ARGS)
+{
+
+	if (MDOC_BODY != n->type)
+		return;
+	h->flags |= HTML_NOSPACE;
+	print_text(h, "\\*q");
+}
+
+
+/* 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);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_an_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	tag.key = ATTR_CLASS;
+	tag.val = "author";
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_cd_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	tag.key = ATTR_CLASS;
+	tag.val = "config";
+	print_otag(h, TAG_SPAN, 1, &tag);
+	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);
+}
+
+
+/* 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);
+}
+
+
+/* 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);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_fa_pre(MDOC_ARGS)
+{
+	const struct mdoc_node	*nn;
+	struct htmlpair		 tag;
+	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);
+	}
+
+	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);
+		if (nn->next)
+			print_text(h, ",");
+	}
+
+	if (n->child && n->next && n->next->tok == MDOC_Fa)
+		print_text(h, ",");
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_fd_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	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);
+	}
+
+	tag.key = ATTR_CLASS;
+	tag.val = "macro";
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_vt_pre(MDOC_ARGS)
+{
+	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);
+	}
+
+	tag.key = ATTR_CLASS;
+	tag.val = "type";
+	print_otag(h, TAG_SPAN, 1, &tag);
+	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 = "magin-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);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_fn_pre(MDOC_ARGS)
+{
+	struct tag		*t;
+	struct htmlpair	 	 tag;
+	const struct mdoc_node	*nn;
+
+	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);
+	}
+
+	tag.key = ATTR_CLASS;
+	tag.val = "type";
+
+	t = print_otag(h, TAG_SPAN, 1, &tag);
+	print_text(h, n->child->string);
+	print_tagq(h, t);
+
+	h->flags |= HTML_NOSPACE;
+	print_text(h, "(");
+
+	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);
+		print_tagq(h, t);
+		if (nn->next)
+			print_text(h, ",");
+	}
+
+	print_text(h, ")");
+
+	if (SEC_SYNOPSIS == n->sec)
+		print_text(h, ";");
+
+	return(0);
+}