===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.36
retrieving revision 1.180
diff -u -p -r1.36 -r1.180
--- mandoc/man_html.c	2010/05/26 14:03:54	1.36
+++ mandoc/man_html.c	2022/07/03 14:29:45	1.180
@@ -1,22 +1,23 @@
-/*	$Id: man_html.c,v 1.36 2010/05/26 14:03:54 kristaps Exp $ */
+/* $Id: man_html.c,v 1.180 2022/07/03 14:29:45 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * 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.
+ *
+ * HTML formatter for man(7) used by mandoc(1).
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -26,64 +27,61 @@
 #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, \
+			  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_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	char		  list_continues(const struct roff_node *,
+				const struct roff_node *);
 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 *);
 
-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_SH_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_PP_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 */
@@ -93,659 +91,550 @@ 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_br_pre, NULL }, /* Sp */
-	{ man_ign_pre, NULL }, /* Vb */
-	{ NULL, NULL }, /* Ve */
 	{ 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)
+html_man(void *arg, const struct roff_meta *man)
 {
-	struct html	*h;
-	struct tag	*t;
+	struct html		*h;
+	struct roff_node	*n;
+	struct tag		*t;
 
 	h = (struct html *)arg;
+	n = man->first->child;
 
-	print_gen_decls(h);
+	if ((h->oflags & HTML_FRAGMENT) == 0) {
+		print_gen_decls(h);
+		print_otag(h, TAG_HTML, "");
+		if (n != NULL && 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, "");
+	}
 
-	t = print_otag(h, TAG_HTML, 0, NULL);
-	print_man(man_meta(m), man_node(m), h);
+	man_root_pre(man, h);
+	t = print_otag(h, TAG_MAIN, "c", "manual-text");
+	print_man_nodelist(man, n, h);
 	print_tagq(h, t);
-
-	printf("\n");
+	man_root_post(man, h);
+	print_tagq(h, NULL);
 }
 
-
 static void
-print_man(MAN_ARGS) 
+print_man_head(const struct roff_meta *man, struct html *h)
 {
-	struct tag	*t;
-	struct htmlpair	 tag;
+	char	*cp;
 
-	t = print_otag(h, TAG_HEAD, 0, NULL);
-
-	print_man_head(m, n, h);
-	print_tagq(h, t);
-	t = print_otag(h, TAG_BODY, 0, NULL);
-
-	tag.key = ATTR_CLASS;
-	tag.val = "body";
-	print_otag(h, TAG_DIV, 1, &tag);
-
-	print_man_nodelist(m, n, h);
-
-	print_tagq(h, t);
-}
-
-
-/* ARGSUSED */
-static void
-print_man_head(MAN_ARGS)
-{
-
 	print_gen_head(h);
-	bufinit(h);
-	buffmt(h, "%s(%s)", 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 = h->tags.head;
+	if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+		return;
 
-	bufinit(h);
+	if ((n->flags & NODE_NOFILL) == 0)
+		html_fillmode(h, ROFF_fi);
+	else if (html_fillmode(h, ROFF_nf) == ROFF_nf &&
+	    n->tok != ROFF_fi && n->flags & NODE_LINE &&
+	    (n->prev == NULL || n->prev->tok != MAN_YS))
+		print_endline(h);
 
-	/*
-	 * FIXME: embedded elements within next-line scopes (e.g., `br'
-	 * within an empty `B') will cause formatting to be forgotten
-	 * due to scope closing out.
-	 */
-
+	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;
+		}
+		if (*n->string == ' ' && n->flags & NODE_LINE &&
+		    (h->flags & HTML_NONEWLINE) == 0)
+			print_otag(h, TAG_BR, "");
+		else if (n->flags & NODE_DELIMC)
+			h->flags |= HTML_NOSPACE;
+		t = h->tag;
+		t->refcnt++;
 		print_text(h, n->string);
+		break;
+	case ROFFT_EQN:
+		t = h->tag;
+		t->refcnt++;
+		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:
-		/* 
+		/*
 		 * Close out scope of font prior to opening a macro
-		 * scope.  Assert that the metafont is on the top of the
-		 * stack (it's never nested).
+		 * scope.
 		 */
-		if (h->metaf) {
-			assert(h->metaf == t);
-			print_tagq(h, h->metaf);
-			assert(NULL == h->metaf);
-			t = h->tags.head;
+		if (h->metac != ESCAPE_FONTROMAN) {
+			h->metal = h->metac;
+			h->metac = ESCAPE_FONTROMAN;
 		}
-		if (mans[n->tok].pre)
-			child = (*mans[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->tag;
+		t->refcnt++;
+		if (n->tok < ROFF_MAX) {
+			roff_html_pre(h, n);
+			t->refcnt--;
+			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);
+	if (child && n->child != NULL)
+		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;
+	t->refcnt--;
+	if (n->type == ROFFT_BLOCK &&
+	    (n->tok == MAN_IP || n->tok == MAN_TP || n->tok == MAN_TQ)) {
+		t = h->tag;
+		while (t->tag != TAG_DL && t->tag != TAG_UL)
+			t = t->next;
+		/*
+		 * Close the list if no further item of the same type
+		 * follows; otherwise, close the item only.
+		 */
+		if (list_continues(n, roff_node_next(n)) == '\0') {
+			print_tagq(h, t);
+			t = NULL;
+		}
 	}
+	if (t != NULL)
+		print_stagq(h, t);
 }
 
-
-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[3];
 	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);
 
-	snprintf(title, BUFSIZ - 1, "%s(%s)", 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);
-	PAIR_SUMMARY_INIT(&tag[2], "header");
-
-	t = print_otag(h, TAG_TABLE, 3, 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 (man->vol != NULL)
+		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[3];
 	struct tag	*t, *tt;
-	char		 b[DATESIZ];
 
-	if (m->rawdate)
-		strlcpy(b, m->rawdate, DATESIZ);
-	else
-		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);
-	PAIR_SUMMARY_INIT(&tag[2], "footer");
-
-	t = print_otag(h, TAG_TABLE, 3, 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 != NULL)
+		print_text(h, man->os);
 	print_tagq(h, t);
 }
 
-
-
-/* ARGSUSED */
 static int
-man_br_pre(MAN_ARGS)
+man_SH_pre(MAN_ARGS)
 {
-	struct roffsu	 su;
-	struct htmlpair	 tag;
+	const char	*class;
+	enum htmltag	 tag;
 
-	SCALE_VS_INIT(&su, 1);
-
-	switch (n->tok) {
-	case (MAN_Sp):
-		SCALE_VS_INIT(&su, 0.5);
+	if (n->tok == MAN_SH) {
+		tag = TAG_H1;
+		class = "Sh";
+	} else {
+		tag = TAG_H2;
+		class = "Ss";
+	}
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		html_close_paragraph(h);
+		print_otag(h, TAG_SECTION, "c", class);
 		break;
-	case (MAN_sp):
-		if (n->child)
-			a2roffsu(n->child->string, &su, SCALE_VS);
+	case ROFFT_HEAD:
+		print_otag_id(h, tag, class, n);
 		break;
-	default:
-		su.scale = 0;
+	case ROFFT_BODY:
 		break;
+	default:
+		abort();
 	}
-
-	bufcat_su(h, "height", &su);
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-
-	/* So the div isn't empty: */
-	print_text(h, "\\~");
-
-	return(0);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-man_SH_pre(MAN_ARGS)
-{
-	struct htmlpair	 tag[2];
-	struct roffsu	 su;
-
-	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);
-	}
-
-	PAIR_CLASS_INIT(&tag[0], "sec-head");
-	print_otag(h, TAG_DIV, 1, tag);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
 man_alt_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
-	struct tag		*t;
-	int			 i;
-	enum htmlfont		 fp;
+	const struct roff_node	*nn;
+	struct tag	*t;
+	int		 i;
+	enum htmltag	 fp;
 
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+	for (i = 0, nn = n->child; nn != NULL; nn = nn->next, i++) {
 		switch (n->tok) {
-		case (MAN_BI):
-			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;
+		case MAN_BI:
+			fp = i % 2 ? TAG_I : TAG_B;
 			break;
-		case (MAN_IB):
-			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;
+		case MAN_IB:
+			fp = i % 2 ? TAG_B : TAG_I;
 			break;
-		case (MAN_RI):
-			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;
+		case MAN_RI:
+			fp = i % 2 ? TAG_I : TAG_MAX;
 			break;
-		case (MAN_IR):
-			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;
+		case MAN_IR:
+			fp = i % 2 ? TAG_MAX : TAG_I;
 			break;
-		case (MAN_BR):
-			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;
+		case MAN_BR:
+			fp = i % 2 ? TAG_MAX : TAG_B;
 			break;
-		case (MAN_RB):
-			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;
+		case MAN_RB:
+			fp = i % 2 ? TAG_B : TAG_MAX;
 			break;
 		default:
 			abort();
-			/* NOTREACHED */
 		}
 
 		if (i)
 			h->flags |= HTML_NOSPACE;
 
-		/* 
-		 * Open and close the scope with each argument, so that
-		 * internal \f escapes, which are common, are also
-		 * closed out with the scope.
-		 */
-		t = print_ofont(h, fp);
-		print_man_node(m, nn, h);
-		print_tagq(h, t);
-	}
+		if (fp != TAG_MAX)
+			t = print_otag(h, fp, "");
 
-	return(0);
-}
+		print_text(h, nn->string);
 
-
-/* ARGSUSED */
-static int
-man_SB_pre(MAN_ARGS)
-{
-	struct htmlpair	 tag;
-	
-	/* FIXME: print_ofont(). */
-	PAIR_CLASS_INIT(&tag, "small bold");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+		if (fp != TAG_MAX)
+			print_tagq(h, t);
+	}
+	return 0;
 }
 
-
-/* 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 (n->tok == MAN_SB)
+		print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-man_SS_pre(MAN_ARGS)
+man_PP_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[3];
-	struct roffsu	 su;
-
-	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);
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		html_close_paragraph(h);
+		break;
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
+		if (n->child != NULL &&
+		    (n->child->flags & NODE_NOFILL) == 0)
+			print_otag(h, TAG_P, "c",
+			    n->tok == MAN_PP ? "Pp" : "Pp HP");
+		break;
+	default:
+		abort();
 	}
-
-	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)
+static char
+list_continues(const struct roff_node *n1, const struct roff_node *n2)
 {
-	struct htmlpair	 tag;
-	struct roffsu	 su;
-	int		 i;
+	const char *s1, *s2;
+	char c1, c2;
 
-	if (MAN_BLOCK != n->type)
-		return(1);
-
-	i = 0;
-
-	if (MAN_ROOT == n->parent->type) {
-		SCALE_HS_INIT(&su, INDENT);
-		bufcat_su(h, "margin-left", &su);
-		i = 1;
-	}
-	if (n->prev) {
-		SCALE_VS_INIT(&su, 1);
-		bufcat_su(h, "margin-top", &su);
-		i = 1;
-	}
-
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, i, &tag);
-	return(1);
+	if (n1 == NULL || n1->type != ROFFT_BLOCK ||
+	    n2 == NULL || n2->type != ROFFT_BLOCK)
+		return '\0';
+	if ((n1->tok == MAN_TP || n1->tok == MAN_TQ) &&
+	    (n2->tok == MAN_TP || n2->tok == MAN_TQ))
+		return ' ';
+	if (n1->tok != MAN_IP || n2->tok != MAN_IP)
+		return '\0';
+	n1 = n1->head->child;
+	n2 = n2->head->child;
+	s1 = n1 == NULL ? "" : n1->string;
+	s2 = n2 == NULL ? "" : n2->string;
+	c1 = strcmp(s1, "*") == 0 ? '*' :
+	     strcmp(s1, "\\-") == 0 ? '-' :
+	     strcmp(s1, "\\(bu") == 0 ? 'b' : ' ';
+	c2 = strcmp(s2, "*") == 0 ? '*' :
+	     strcmp(s2, "\\-") == 0 ? '-' :
+	     strcmp(s2, "\\(bu") == 0 ? 'b' : ' ';
+	return c1 != c2 ? '\0' : c1 == 'b' ? '*' : c1;
 }
 
-
-/* ARGSUSED */
 static int
 man_IP_pre(MAN_ARGS)
 {
-	struct roffsu		 su;
-	struct htmlpair	 	 tag;
-	const struct man_node	*nn;
-	int			 width;
+	struct roff_node	*nn;
+	const char		*list_class;
+	enum htmltag		 list_elem, body_elem;
+	char			 list_type;
 
-	/*
-	 * 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);
+	nn = n->type == ROFFT_BLOCK ? n : n->parent;
+	list_type = list_continues(roff_node_prev(nn), nn);
+	if (list_type == '\0') {
+		/* Start a new list. */
+		list_type = list_continues(nn, roff_node_next(nn));
+		if (list_type == '\0')
+			list_type = ' ';
+		switch (list_type) {
+		case ' ':
+			list_class = "Bl-tag";
+			list_elem = TAG_DL;
+			break;
+		case '*':
+			list_class = "Bl-bullet";
+			list_elem = TAG_UL;
+			break;
+		case '-':
+			list_class = "Bl-dash";
+			list_elem = TAG_UL;
+			break;
+		default:
+			abort();
+		}
+	} else {
+		/* Continue a list that was started earlier. */
+		list_class = NULL;
+		list_elem = TAG_MAX;
 	}
+	body_elem = list_type == ' ' ? TAG_DD : TAG_LI;
 
-	nn = MAN_BLOCK == n->type ? 
-		n->head->child : n->parent->head->child;
-
-	SCALE_HS_INIT(&su, INDENT);
-	width = 0;
-
-	/* Width is the last token. */
-
-	if (MAN_IP == n->tok && NULL != nn)
-		if (NULL != (nn = nn->next)) {
-			for ( ; nn->next; nn = nn->next)
-				/* Do nothing. */ ;
-			width = a2width(nn, &su);
-		}
-
-	/* Width is the first token. */
-
-	if (MAN_TP == n->tok && NULL != nn) {
-		/* Skip past non-text children. */
-		while (nn && MAN_TEXT != nn->type)
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		html_close_paragraph(h);
+		if (list_elem != TAG_MAX)
+			print_otag(h, list_elem, "c", list_class);
+		return 1;
+	case ROFFT_HEAD:
+		if (body_elem == TAG_LI)
+			return 0;
+		print_otag_id(h, TAG_DT, NULL, n);
+		break;
+	case ROFFT_BODY:
+		print_otag(h, body_elem, "");
+		return 1;
+	default:
+		abort();
+	}
+	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;
-		if (nn)
-			width = a2width(nn, &su);
+		while (nn != NULL) {
+			print_man_node(man, nn, h);
+			nn = nn->next;
+		}
+		break;
+	default:
+		abort();
 	}
-
-	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);
-
-	/*
-	 * Without a length string, we can print all of our children.
-	 */
-
-	if ( ! width)
-		return(1);
-
-	/*
-	 * When a length has been specified, we need to carefully print
-	 * our child context:  IP gets all children printed but the last
-	 * (the width), while TP gets all children printed but the first
-	 * (the width).
-	 */
-
-	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)
+man_OP_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
-	struct htmlpair	 	 tag;
-	struct roffsu		 su;
+	struct tag	*tt;
 
-	if (MAN_HEAD == n->type)
-		return(0);
+	print_text(h, "[");
+	h->flags |= HTML_NOSPACE;
+	tt = print_otag(h, TAG_SPAN, "c", "Op");
 
-	nn = MAN_BLOCK == n->type ?
-		n->head->child : n->parent->head->child;
+	if ((n = n->child) != NULL) {
+		print_otag(h, TAG_B, "");
+		print_text(h, n->string);
+	}
 
-	SCALE_HS_INIT(&su, INDENT);
+	print_stagq(h, tt);
 
-	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 (n != NULL && n->next != NULL) {
+		print_otag(h, TAG_I, "");
+		print_text(h, n->next->string);
 	}
 
-	bufcat_su(h, "margin-left", &su);
-	SCALE_INVERT(&su);
-	bufcat_su(h, "text-indent", &su);
-
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	print_stagq(h, tt);
+	h->flags |= HTML_NOSPACE;
+	print_text(h, "]");
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_B_pre(MAN_ARGS)
 {
-
-	print_ofont(h, HTMLFONT_BOLD);
-	return(1);
+	print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_I_pre(MAN_ARGS)
 {
-	
-	print_ofont(h, HTMLFONT_ITALIC);
-	return(1);
+	print_otag(h, TAG_I, "");
+	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;
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		html_close_paragraph(h);
+		break;
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
+		print_otag(h, TAG_DIV, "c", "Bd-indent");
+		break;
+	default:
+		abort();
+	}
+	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:
+		html_close_paragraph(h);
+		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, "c", "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);
+static int
+man_UR_pre(MAN_ARGS)
+{
+	char *cp;
 
-	if (n->head->child) {
-		SCALE_VS_INIT(&su, 1);
-		a2width(n->head->child, &su);
-		bufcat_su(h, "margin-top", &su);
+	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, "ch", "Mt", cp);
+			free(cp);
+		} else
+			print_otag(h, TAG_A, "ch", "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();
 }