===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.13
retrieving revision 1.163
diff -u -p -r1.13 -r1.163
--- mandoc/man_html.c	2009/10/24 05:45:04	1.13
+++ mandoc/man_html.c	2019/01/05 09:14:44	1.163
@@ -1,91 +1,89 @@
-/*	$Id: man_html.c,v 1.13 2009/10/24 05:45:04 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.163 2019/01/05 09:14:44 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * 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 <sys/types.h>
-#include <sys/queue.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"
 #include "out.h"
 #include "html.h"
-#include "man.h"
 #include "main.h"
 
-/* TODO: preserve ident widths. */
 /* FIXME: have PD set the default vspace width. */
 
-#define	INDENT		  5
-#define	HALFINDENT	  3
-
-#define	MAN_ARGS	  const struct man_meta *m, \
-			  const struct man_node *n, \
+#define	MAN_ARGS	  const struct roff_meta *man, \
+			  const struct roff_node *n, \
 			  struct html *h
 
-struct	htmlman {
+struct	man_html_act {
 	int		(*pre)(MAN_ARGS);
 	int		(*post)(MAN_ARGS);
 };
 
-static	void		  print_man(MAN_ARGS);
-static	void		  print_man_head(MAN_ARGS);
+static	void		  print_bvspace(struct html *,
+				const struct roff_node *);
+static	void		  print_man_head(const struct roff_meta *,
+				struct html *);
 static	void		  print_man_nodelist(MAN_ARGS);
 static	void		  print_man_node(MAN_ARGS);
-
-static	int		  a2width(const struct man_node *,
-				struct roffsu *);
-
-static	int		  man_alt_pre(MAN_ARGS);
-static	int		  man_br_pre(MAN_ARGS);
-static	int		  man_ign_pre(MAN_ARGS);
-static	void		  man_root_post(MAN_ARGS);
-static	int		  man_root_pre(MAN_ARGS);
 static	int		  man_B_pre(MAN_ARGS);
 static	int		  man_HP_pre(MAN_ARGS);
-static	int		  man_I_pre(MAN_ARGS);
 static	int		  man_IP_pre(MAN_ARGS);
+static	int		  man_I_pre(MAN_ARGS);
+static	int		  man_OP_pre(MAN_ARGS);
 static	int		  man_PP_pre(MAN_ARGS);
 static	int		  man_RS_pre(MAN_ARGS);
-static	int		  man_SB_pre(MAN_ARGS);
 static	int		  man_SH_pre(MAN_ARGS);
 static	int		  man_SM_pre(MAN_ARGS);
 static	int		  man_SS_pre(MAN_ARGS);
+static	int		  man_SY_pre(MAN_ARGS);
+static	int		  man_UR_pre(MAN_ARGS);
+static	int		  man_abort_pre(MAN_ARGS);
+static	int		  man_alt_pre(MAN_ARGS);
+static	int		  man_ign_pre(MAN_ARGS);
+static	int		  man_in_pre(MAN_ARGS);
+static	void		  man_root_post(const struct roff_meta *,
+				struct html *);
+static	void		  man_root_pre(const struct roff_meta *,
+				struct html *);
 
-#ifdef __linux__
-extern	size_t	  	  strlcpy(char *, const char *, size_t);
-extern	size_t	  	  strlcat(char *, const char *, size_t);
-#endif
-
-static	const struct htmlman mans[MAN_MAX] = {
-	{ man_br_pre, NULL }, /* br */
+static	const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
 	{ NULL, NULL }, /* TH */
 	{ man_SH_pre, NULL }, /* SH */
 	{ man_SS_pre, NULL }, /* SS */
 	{ man_IP_pre, NULL }, /* TP */
-	{ man_PP_pre, NULL }, /* LP */
+	{ man_IP_pre, NULL }, /* TQ */
+	{ man_abort_pre, NULL }, /* LP */
 	{ man_PP_pre, NULL }, /* PP */
-	{ man_PP_pre, NULL }, /* P */
+	{ man_abort_pre, NULL }, /* P */
 	{ man_IP_pre, NULL }, /* IP */
-	{ man_HP_pre, NULL }, /* HP */ 
+	{ man_HP_pre, NULL }, /* HP */
 	{ man_SM_pre, NULL }, /* SM */
-	{ man_SB_pre, NULL }, /* SB */
+	{ man_SM_pre, NULL }, /* SB */
 	{ man_alt_pre, NULL }, /* BI */
 	{ man_alt_pre, NULL }, /* IB */
 	{ man_alt_pre, NULL }, /* BR */
@@ -95,605 +93,486 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_I_pre, NULL }, /* I */
 	{ man_alt_pre, NULL }, /* IR */
 	{ man_alt_pre, NULL }, /* RI */
-	{ NULL, NULL }, /* na */
-	{ NULL, NULL }, /* i */
-	{ man_br_pre, NULL }, /* sp */
-	{ NULL, NULL }, /* nf */
-	{ NULL, NULL }, /* fi */
-	{ NULL, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
 	{ man_RS_pre, NULL }, /* RS */
 	{ man_ign_pre, NULL }, /* DT */
 	{ man_ign_pre, NULL }, /* UC */
 	{ man_ign_pre, NULL }, /* PD */
+	{ man_ign_pre, NULL }, /* AT */
+	{ man_in_pre, NULL }, /* in */
+	{ man_SY_pre, NULL }, /* SY */
+	{ NULL, NULL }, /* YS */
+	{ man_OP_pre, NULL }, /* OP */
+	{ NULL, NULL }, /* EX */
+	{ NULL, NULL }, /* EE */
+	{ man_UR_pre, NULL }, /* UR */
+	{ NULL, NULL }, /* UE */
+	{ man_UR_pre, NULL }, /* MT */
+	{ NULL, NULL }, /* ME */
 };
 
 
-void
-html_man(void *arg, const struct man *m)
+/*
+ * Printing leading vertical space before a block.
+ * This is used for the paragraph macros.
+ * The rules are pretty simple, since there's very little nesting going
+ * on here.  Basically, if we're the first within another block (SS/SH),
+ * then don't emit vertical space.  If we are (RS), then do.  If not the
+ * first, print it.
+ */
+static void
+print_bvspace(struct html *h, const struct roff_node *n)
 {
-	struct html	*h;
-	struct tag	*t;
 
-	h = (struct html *)arg;
+	if (n->body && n->body->child)
+		if (n->body->child->type == ROFFT_TBL)
+			return;
 
-	print_gen_doctype(h);
+	if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
+		if (NULL == n->prev)
+			return;
 
-	t = print_otag(h, TAG_HTML, 0, NULL);
-	print_man(man_meta(m), man_node(m), h);
-	print_tagq(h, t);
-
-	printf("\n");
+	print_paragraph(h);
 }
 
-
-static void
-print_man(MAN_ARGS) 
+void
+html_man(void *arg, const struct roff_meta *man)
 {
-	struct tag	*t;
-	struct htmlpair	 tag;
+	struct html		*h;
+	struct roff_node	*n;
+	struct tag		*t;
 
-	t = print_otag(h, TAG_HEAD, 0, NULL);
+	h = (struct html *)arg;
+	n = man->first->child;
 
-	print_man_head(m, n, h);
-	print_tagq(h, t);
-	t = print_otag(h, TAG_BODY, 0, NULL);
+	if ((h->oflags & HTML_FRAGMENT) == 0) {
+		print_gen_decls(h);
+		print_otag(h, TAG_HTML, "");
+		if (n->type == ROFFT_COMMENT)
+			print_gen_comment(h, n);
+		t = print_otag(h, TAG_HEAD, "");
+		print_man_head(man, 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_man_nodelist(m, n, h);
-
+	man_root_pre(man, h);
+	t = print_otag(h, TAG_DIV, "c", "manual-text");
+	print_man_nodelist(man, n, h);
 	print_tagq(h, t);
+	man_root_post(man, h);
+	print_tagq(h, NULL);
 }
 
-
-/* ARGSUSED */
 static void
-print_man_head(MAN_ARGS)
+print_man_head(const struct roff_meta *man, struct html *h)
 {
+	char	*cp;
 
 	print_gen_head(h);
-	bufinit(h);
-	buffmt(h, "%s(%d)", m->title, m->msec);
-
-	print_otag(h, TAG_TITLE, 0, NULL);
-	print_text(h, h->buf);
+	mandoc_asprintf(&cp, "%s(%s)", man->title, man->msec);
+	print_otag(h, TAG_TITLE, "");
+	print_text(h, cp);
+	free(cp);
 }
 
-
 static void
 print_man_nodelist(MAN_ARGS)
 {
 
-	print_man_node(m, n, h);
-	if (n->next)
-		print_man_nodelist(m, n->next, h);
+	while (n != NULL) {
+		print_man_node(man, n, h);
+		n = n->next;
+	}
 }
 
-
 static void
 print_man_node(MAN_ARGS)
 {
-	int		 child;
 	struct tag	*t;
+	int		 child;
 
-	child = 1;
-	t = SLIST_FIRST(&h->tags);
+	html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
 
-	bufinit(h);
-
+	child = 1;
 	switch (n->type) {
-	case (MAN_ROOT):
-		child = man_root_pre(m, n, h);
-		break;
-	case (MAN_TEXT):
+	case ROFFT_TEXT:
+		if (*n->string == '\0') {
+			print_endline(h);
+			return;
+		}
+		t = h->tag;
+		if (*n->string == ' ' && n->flags & NODE_LINE &&
+		    (h->flags & HTML_NONEWLINE) == 0)
+			print_endline(h);
+		else if (n->flags & NODE_DELIMC)
+			h->flags |= HTML_NOSPACE;
 		print_text(h, n->string);
 		break;
+	case ROFFT_COMMENT:
+		return;
+	case ROFFT_EQN:
+		t = h->tag;
+		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 (mans[n->tok].pre)
-			child = (*mans[n->tok].pre)(m, n, h);
+		/*
+		 * Close out scope of font prior to opening a macro
+		 * scope.
+		 */
+		if (HTMLFONT_NONE != h->metac) {
+			h->metal = h->metac;
+			h->metac = HTMLFONT_NONE;
+		}
+
+		/*
+		 * Close out the current table, if it's open, and unset
+		 * the "meta" table state.  This will be reopened on the
+		 * next table element.
+		 */
+		if (h->tblt)
+			print_tblclose(h);
+
+		t = h->tag;
+		if (n->tok < ROFF_MAX) {
+			roff_html_pre(h, n);
+			print_stagq(h, t);
+			return;
+		}
+
+		assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
+		if (man_html_acts[n->tok - MAN_TH].pre != NULL)
+			child = (*man_html_acts[n->tok - MAN_TH].pre)(man,
+			    n, h);
 		break;
 	}
 
 	if (child && n->child)
-		print_man_nodelist(m, n->child, h);
+		print_man_nodelist(man, n->child, h);
 
+	/* This will automatically close out any font scope. */
 	print_stagq(h, t);
 
-	bufinit(h);
-
-	switch (n->type) {
-	case (MAN_ROOT):
-		man_root_post(m, n, h);
-		break;
-	case (MAN_TEXT):
-		break;
-	default:
-		if (mans[n->tok].post)
-			(*mans[n->tok].post)(m, n, h);
-		break;
+	if (n->flags & NODE_NOFILL &&
+	    (n->next == NULL || n->next->flags & NODE_LINE)) {
+		/* In .nf = <pre>, print even empty lines. */
+		h->col++;
+		print_endline(h);
 	}
 }
 
-
-static int
-a2width(const struct man_node *n, struct roffsu *su)
+static void
+man_root_pre(const struct roff_meta *man, struct html *h)
 {
-
-	if (MAN_TEXT != n->type)
-		return(0);
-	if (a2roffsu(n->string, su, SCALE_BU))
-		return(1);
-
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-man_root_pre(MAN_ARGS)
-{
-	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
-	char		 b[BUFSIZ], title[BUFSIZ];
+	char		*title;
 
-	b[0] = 0;
-	if (m->vol)
-		(void)strlcat(b, m->vol, BUFSIZ);
+	assert(man->title);
+	assert(man->msec);
+	mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
-	(void)snprintf(title, BUFSIZ - 1, 
-			"%s(%d)", m->title, m->msec);
+	t = print_otag(h, TAG_TABLE, "c", "head");
+	tt = print_otag(h, TAG_TR, "");
 
-	PAIR_CLASS_INIT(&tag[0], "header");
-	bufcat_style(h, "width", "100%");
-	PAIR_STYLE_INIT(&tag[1], h);
-	t = print_otag(h, TAG_TABLE, 2, tag);
-	tt = print_otag(h, TAG_TR, 0, NULL);
-
-	bufinit(h);
-	bufcat_style(h, "width", "10%");
-	PAIR_STYLE_INIT(&tag[0], h);
-	print_otag(h, TAG_TD, 1, tag);
+	print_otag(h, TAG_TD, "c", "head-ltitle");
 	print_text(h, title);
 	print_stagq(h, tt);
 
-	bufinit(h);
-	bufcat_style(h, "width", "80%");
-	bufcat_style(h, "white-space", "nowrap");
-	bufcat_style(h, "text-align", "center");
-	PAIR_STYLE_INIT(&tag[0], h);
-	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+	print_otag(h, TAG_TD, "c", "head-vol");
+	if (NULL != man->vol)
+		print_text(h, man->vol);
 	print_stagq(h, tt);
 
-	bufinit(h);
-	bufcat_style(h, "width", "10%");
-	bufcat_style(h, "text-align", "right");
-	PAIR_STYLE_INIT(&tag[0], h);
-	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);
 }
 
-
-/* ARGSUSED */
 static void
-man_root_post(MAN_ARGS)
+man_root_post(const struct roff_meta *man, struct html *h)
 {
-	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
-	char		 b[DATESIZ];
 
-	time2a(m->date, b, DATESIZ);
+	t = print_otag(h, TAG_TABLE, "c", "foot");
+	tt = print_otag(h, TAG_TR, "");
 
-	PAIR_CLASS_INIT(&tag[0], "footer");
-	bufcat_style(h, "width", "100%");
-	PAIR_STYLE_INIT(&tag[1], h);
-	t = print_otag(h, TAG_TABLE, 2, tag);
-	tt = print_otag(h, TAG_TR, 0, NULL);
-
-	bufinit(h);
-	bufcat_style(h, "width", "50%");
-	PAIR_STYLE_INIT(&tag[0], h);
-	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+	print_otag(h, TAG_TD, "c", "foot-date");
+	print_text(h, man->date);
 	print_stagq(h, tt);
 
-	bufinit(h);
-	bufcat_style(h, "width", "50%");
-	bufcat_style(h, "text-align", "right");
-	PAIR_STYLE_INIT(&tag[0], h);
-	print_otag(h, TAG_TD, 1, tag);
-	if (m->source)
-		print_text(h, m->source);
+	print_otag(h, TAG_TD, "c", "foot-os");
+	if (man->os)
+		print_text(h, man->os);
 	print_tagq(h, t);
 }
 
-
-
-/* ARGSUSED */
 static int
-man_br_pre(MAN_ARGS)
-{
-	struct roffsu	 su;
-	struct htmlpair	 tag;
-
-	SCALE_VS_INIT(&su, 1);
-
-	if (MAN_sp == n->tok && n->child)
-		a2roffsu(n->child->string, &su, SCALE_VS);
-	else if (MAN_br == n->tok)
-		su.scale = 0;
-
-	bufcat_su(h, "height", &su);
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 man_SH_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[2];
-	struct roffsu	 su;
+	char	*id;
 
-	if (MAN_BODY == n->type) {
-		SCALE_HS_INIT(&su, INDENT);
-		bufcat_su(h, "margin-left", &su);
-		PAIR_CLASS_INIT(&tag[0], "sec-body");
-		PAIR_STYLE_INIT(&tag[1], h);
-		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
-	} else if (MAN_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag[0], "sec-block");
-		if (n->prev && MAN_SH == n->prev->tok)
-			if (NULL == n->prev->body->child) {
-				print_otag(h, TAG_DIV, 1, tag);
-				return(1);
-			}
-
-		SCALE_VS_INIT(&su, 1);
-		bufcat_su(h, "margin-top", &su);
-		if (NULL == n->next)
-			bufcat_su(h, "margin-bottom", &su);
-		PAIR_STYLE_INIT(&tag[1], h);
-		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
+	if (n->type == ROFFT_HEAD) {
+		id = html_make_id(n, 1);
+		print_otag(h, TAG_H1, "cTi", "Sh", id);
+		if (id != NULL)
+			print_otag(h, TAG_A, "chR", "permalink", id);
 	}
-
-	PAIR_CLASS_INIT(&tag[0], "sec-head");
-	print_otag(h, TAG_DIV, 1, tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_alt_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
-	struct tag		*t;
-	int			 i;
-	struct htmlpair		 tagi, tagb, *tagp;
+	const struct roff_node	*nn;
+	int		 i;
+	enum htmltag	 fp;
+	struct tag	*t;
 
-	PAIR_CLASS_INIT(&tagi, "italic");
-	PAIR_CLASS_INIT(&tagb, "bold");
-
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		switch (n->tok) {
-		case (MAN_BI):
-			tagp = i % 2 ? &tagi : &tagb;
+		case MAN_BI:
+			fp = i % 2 ? TAG_I : TAG_B;
 			break;
-		case (MAN_IB):
-			tagp = i % 2 ? &tagb : &tagi;
+		case MAN_IB:
+			fp = i % 2 ? TAG_B : TAG_I;
 			break;
-		case (MAN_RI):
-			tagp = i % 2 ? &tagi : NULL;
+		case MAN_RI:
+			fp = i % 2 ? TAG_I : TAG_MAX;
 			break;
-		case (MAN_IR):
-			tagp = i % 2 ? NULL : &tagi;
+		case MAN_IR:
+			fp = i % 2 ? TAG_MAX : TAG_I;
 			break;
-		case (MAN_BR):
-			tagp = i % 2 ? NULL : &tagb;
+		case MAN_BR:
+			fp = i % 2 ? TAG_MAX : TAG_B;
 			break;
-		case (MAN_RB):
-			tagp = i % 2 ? &tagb : NULL;
+		case MAN_RB:
+			fp = i % 2 ? TAG_B : TAG_MAX;
 			break;
 		default:
 			abort();
-			/* NOTREACHED */
 		}
 
 		if (i)
 			h->flags |= HTML_NOSPACE;
 
-		if (tagp) {
-			t = print_otag(h, TAG_SPAN, 1, tagp);
-			print_man_node(m, nn, h);
+		if (fp != TAG_MAX)
+			t = print_otag(h, fp, "");
+
+		print_text(h, nn->string);
+
+		if (fp != TAG_MAX)
 			print_tagq(h, t);
-		} else
-			print_man_node(m, nn, h);
 	}
-
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
-man_SB_pre(MAN_ARGS)
-{
-	struct htmlpair	 tag;
-	
-	PAIR_CLASS_INIT(&tag, "small bold");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
 man_SM_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-	
-	PAIR_CLASS_INIT(&tag, "small");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_SMALL, "");
+	if (MAN_SB == n->tok)
+		print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_SS_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[3];
-	struct roffsu	 su;
+	char	*id;
 
-	SCALE_VS_INIT(&su, 1);
-
-	if (MAN_BODY == n->type) {
-		PAIR_CLASS_INIT(&tag[0], "ssec-body");
-		if (n->parent->next && n->child) {
-			bufcat_su(h, "margin-bottom", &su);
-			PAIR_STYLE_INIT(&tag[1], h);
-			print_otag(h, TAG_DIV, 2, tag);
-			return(1);
-		}
-
-		print_otag(h, TAG_DIV, 1, tag);
-		return(1);
-	} else if (MAN_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag[0], "ssec-block");
-		if (n->prev && MAN_SS == n->prev->tok) 
-			if (n->prev->body->child) {
-				bufcat_su(h, "margin-top", &su);
-				PAIR_STYLE_INIT(&tag[1], h);
-				print_otag(h, TAG_DIV, 2, tag);
-				return(1);
-			}
-
-		print_otag(h, TAG_DIV, 1, tag);
-		return(1);
+	if (n->type == ROFFT_HEAD) {
+		id = html_make_id(n, 1);
+		print_otag(h, TAG_H2, "cTi", "Ss", id);
+		if (id != NULL)
+			print_otag(h, TAG_A, "chR", "permalink", id);
 	}
-
-	SCALE_HS_INIT(&su, INDENT - HALFINDENT);
-	bufcat_su(h, "margin-left", &su);
-	PAIR_CLASS_INIT(&tag[0], "ssec-head");
-	PAIR_STYLE_INIT(&tag[1], h);
-	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_PP_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-	struct roffsu	 su;
-	int		 i;
 
-	if (MAN_BLOCK != n->type)
-		return(1);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type == ROFFT_BLOCK)
+		print_bvspace(h, n);
 
-	i = 0;
-
-	if (MAN_ROOT == n->parent->tok) {
-		SCALE_HS_INIT(&su, INDENT);
-		bufcat_su(h, "margin-left", &su);
-		i++;
-	}
-	if (n->next && n->next->child) {
-		SCALE_VS_INIT(&su, 1);
-		bufcat_su(h, "margin-bottom", &su);
-		i++;
-	}
-
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, i ? 1 : 0, &tag);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_IP_pre(MAN_ARGS)
 {
-	struct roffsu		 su;
-	struct htmlpair	 	 tag;
-	const struct man_node	*nn;
-	int			 width;
+	const struct roff_node	*nn;
 
-	/*
-	 * This scattering of 1-BU margins and pads is to make sure that
-	 * when text overruns its box, the subsequent text isn't flush
-	 * up against it.  However, the rest of the right-hand box must
-	 * also be adjusted in consideration of this 1-BU space.
-	 */
-
-	if (MAN_BODY == n->type) { 
-		SCALE_HS_INIT(&su, INDENT);
-		bufcat_su(h, "margin-left", &su);
-		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
+	if (n->type == ROFFT_BODY) {
+		print_otag(h, TAG_DD, "");
+		return 1;
+	} else if (n->type != ROFFT_HEAD) {
+		print_otag(h, TAG_DL, "c", "Bl-tag");
+		return 1;
 	}
 
-	nn = MAN_BLOCK == n->type ? 
-		n->head->child : n->parent->head->child;
+	print_otag(h, TAG_DT, "");
 
-	SCALE_HS_INIT(&su, INDENT);
-	width = 0;
-
-	if (MAN_IP == n->tok && NULL != nn)
-		if (NULL != (nn = nn->next)) {
-			for ( ; nn->next; nn = nn->next)
-				/* Do nothing. */ ;
-			width = a2width(nn, &su);
+	switch(n->tok) {
+	case MAN_IP:  /* Only print the first header element. */
+		if (n->child != NULL)
+			print_man_node(man, n->child, h);
+		break;
+	case MAN_TP:  /* Only print next-line header elements. */
+	case MAN_TQ:
+		nn = n->child;
+		while (nn != NULL && (NODE_LINE & nn->flags) == 0)
+			nn = nn->next;
+		while (nn != NULL) {
+			print_man_node(man, nn, h);
+			nn = nn->next;
 		}
+		break;
+	default:
+		abort();
+	}
 
-	if (MAN_TP == n->tok && NULL != nn)
-		width = a2width(nn, &su);
-
-	if (MAN_BLOCK == n->type) {
-		bufcat_su(h, "margin-left", &su);
-		SCALE_VS_INIT(&su, 1);
-		bufcat_su(h, "margin-top", &su);
-		bufcat_style(h, "clear", "both");
-		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
-	} 
-
-	bufcat_su(h, "min-width", &su);
-	SCALE_INVERT(&su);
-	bufcat_su(h, "margin-left", &su);
-	SCALE_HS_INIT(&su, 1);
-	bufcat_su(h, "margin-right", &su);
-	bufcat_style(h, "clear", "left");
-
-	if (n->next && n->next->child)
-		bufcat_style(h, "float", "left");
-
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-
-	/* With a length string, manually omit the last child. */
-
-	if ( ! width)
-		return(1);
-
-	if (MAN_IP == n->tok)
-		for (nn = n->child; nn->next; nn = nn->next)
-			print_man_node(m, nn, h);
-	if (MAN_TP == n->tok)
-		for (nn = n->child->next; nn; nn = nn->next)
-			print_man_node(m, nn, h);
-
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_HP_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
-	struct htmlpair	 	 tag;
-	struct roffsu		 su;
+	if (n->type == ROFFT_HEAD)
+		return 0;
 
-	if (MAN_HEAD == n->type)
-		return(0);
+	if (n->type == ROFFT_BLOCK) {
+		print_bvspace(h, n);
+		print_otag(h, TAG_DIV, "c", "HP");
+	}
+	return 1;
+}
 
-	nn = MAN_BLOCK == n->type ?
-		n->head->child : n->parent->head->child;
+static int
+man_OP_pre(MAN_ARGS)
+{
+	struct tag	*tt;
 
-	SCALE_HS_INIT(&su, INDENT);
+	print_text(h, "[");
+	h->flags |= HTML_NOSPACE;
+	tt = print_otag(h, TAG_SPAN, "c", "Op");
 
-	if (NULL != nn)
-		(void)a2width(nn, &su);
-
-	if (MAN_BLOCK == n->type) {
-		bufcat_su(h, "margin-left", &su);
-		SCALE_VS_INIT(&su, 1);
-		bufcat_su(h, "margin-top", &su);
-		bufcat_style(h, "clear", "both");
-		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
+	if (NULL != (n = n->child)) {
+		print_otag(h, TAG_B, "");
+		print_text(h, n->string);
 	}
 
-	bufcat_su(h, "margin-left", &su);
-	SCALE_INVERT(&su);
-	bufcat_su(h, "text-indent", &su);
+	print_stagq(h, tt);
 
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	if (NULL != n && NULL != n->next) {
+		print_otag(h, TAG_I, "");
+		print_text(h, n->next->string);
+	}
+
+	print_stagq(h, tt);
+	h->flags |= HTML_NOSPACE;
+	print_text(h, "]");
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_B_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-
-	PAIR_CLASS_INIT(&tag, "bold");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_I_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
+	print_otag(h, TAG_I, "");
+	return 1;
+}
 
-	PAIR_CLASS_INIT(&tag, "italic");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+static int
+man_in_pre(MAN_ARGS)
+{
+	print_otag(h, TAG_BR, "");
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_ign_pre(MAN_ARGS)
 {
 
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_RS_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-	struct roffsu	 su;
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	if (n->type == ROFFT_BLOCK)
+		print_otag(h, TAG_DIV, "c", "Bd-indent");
+	return 1;
+}
 
-	if (MAN_HEAD == n->type)
-		return(0);
-	else if (MAN_BODY == n->type)
-		return(1);
+static int
+man_SY_pre(MAN_ARGS)
+{
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		print_otag(h, TAG_TABLE, "c", "Nm");
+		print_otag(h, TAG_TR, "");
+		break;
+	case ROFFT_HEAD:
+		print_otag(h, TAG_TD, "");
+		print_otag(h, TAG_CODE, "cT", "Nm");
+		break;
+	case ROFFT_BODY:
+		print_otag(h, TAG_TD, "");
+		break;
+	default:
+		abort();
+	}
+	return 1;
+}
 
-	SCALE_HS_INIT(&su, INDENT);
-	bufcat_su(h, "margin-left", &su);
-
-	if (n->head->child) {
-		SCALE_VS_INIT(&su, 1);
-		a2width(n->head->child, &su);
-		bufcat_su(h, "margin-top", &su);
+static int
+man_UR_pre(MAN_ARGS)
+{
+	char *cp;
+	n = n->child;
+	assert(n->type == ROFFT_HEAD);
+	if (n->child != NULL) {
+		assert(n->child->type == ROFFT_TEXT);
+		if (n->tok == MAN_MT) {
+			mandoc_asprintf(&cp, "mailto:%s", n->child->string);
+			print_otag(h, TAG_A, "cTh", "Mt", cp);
+			free(cp);
+		} else
+			print_otag(h, TAG_A, "cTh", "Lk", n->child->string);
 	}
 
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	assert(n->next->type == ROFFT_BODY);
+	if (n->next->child != NULL)
+		n = n->next;
+
+	print_man_nodelist(man, n->child, h);
+
+	return 0;
+}
+
+static int
+man_abort_pre(MAN_ARGS)
+{
+	abort();
 }