===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.63
retrieving revision 1.133
diff -u -p -r1.63 -r1.133
--- mandoc/man_html.c	2011/01/12 10:43:22	1.63
+++ mandoc/man_html.c	2017/02/05 18:15:39	1.133
@@ -1,22 +1,21 @@
-/*	$Id: man_html.c,v 1.63 2011/01/12 10:43:22 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.133 2017/02/05 18:15:39 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014, 2015, 2017 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.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -26,57 +25,51 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mandoc.h"
+#include "mandoc_aux.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, \
-			  struct mhtml *mh, \
+#define	MAN_ARGS	  const struct roff_meta *man, \
+			  const struct roff_node *n, \
 			  struct html *h
 
-struct	mhtml {
-	int		  fl;
-#define	MANH_LITERAL	 (1 << 0) /* literal context */
-};
-
 struct	htmlman {
 	int		(*pre)(MAN_ARGS);
 	int		(*post)(MAN_ARGS);
 };
 
-static	void		  print_man(MAN_ARGS);
+static	void		  print_bvspace(struct html *,
+				const struct roff_node *);
 static	void		  print_man_head(MAN_ARGS);
 static	void		  print_man_nodelist(MAN_ARGS);
 static	void		  print_man_node(MAN_ARGS);
-
-static	int		  a2width(const struct man_node *,
+static	int		  fillmode(struct html *, int);
+static	int		  a2width(const struct roff_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	int		  man_in_pre(MAN_ARGS);
-static	int		  man_literal_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_SH_pre(MAN_ARGS);
 static	int		  man_SM_pre(MAN_ARGS);
 static	int		  man_SS_pre(MAN_ARGS);
+static	int		  man_UR_pre(MAN_ARGS);
+static	int		  man_alt_pre(MAN_ARGS);
+static	int		  man_br_pre(MAN_ARGS);
+static	int		  man_ign_pre(MAN_ARGS);
+static	int		  man_in_pre(MAN_ARGS);
+static	void		  man_root_post(MAN_ARGS);
+static	void		  man_root_pre(MAN_ARGS);
 
 static	const struct htmlman mans[MAN_MAX] = {
 	{ man_br_pre, NULL }, /* br */
@@ -88,7 +81,7 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_PP_pre, NULL }, /* PP */
 	{ man_PP_pre, NULL }, /* P */
 	{ man_IP_pre, NULL }, /* IP */
-	{ man_HP_pre, NULL }, /* HP */ 
+	{ man_HP_pre, NULL }, /* HP */
 	{ man_SM_pre, NULL }, /* SM */
 	{ man_SM_pre, NULL }, /* SB */
 	{ man_alt_pre, NULL }, /* BI */
@@ -100,10 +93,9 @@ 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 */
 	{ man_br_pre, NULL }, /* sp */
-	{ man_literal_pre, NULL }, /* nf */
-	{ man_literal_pre, NULL }, /* fi */
+	{ NULL, NULL }, /* nf */
+	{ NULL, NULL }, /* fi */
 	{ NULL, NULL }, /* RE */
 	{ man_RS_pre, NULL }, /* RS */
 	{ man_ign_pre, NULL }, /* DT */
@@ -112,582 +104,566 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_ign_pre, NULL }, /* AT */
 	{ man_in_pre, NULL }, /* in */
 	{ man_ign_pre, NULL }, /* ft */
+	{ man_OP_pre, NULL }, /* OP */
+	{ NULL, NULL }, /* EX */
+	{ NULL, NULL }, /* EE */
+	{ man_UR_pre, NULL }, /* UR */
+	{ NULL, NULL }, /* UE */
+	{ man_ign_pre, NULL }, /* ll */
 };
 
 
-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;
-	struct mhtml	 mh;
 
-	h = (struct html *)arg;
+	if (n->body && n->body->child)
+		if (n->body->child->type == ROFFT_TBL)
+			return;
 
-	print_gen_decls(h);
+	if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
+		if (NULL == n->prev)
+			return;
 
-	memset(&mh, 0, sizeof(struct mhtml));
-
-	t = print_otag(h, TAG_HTML, 0, NULL);
-	print_man(man_meta(m), man_node(m), &mh, h);
-	print_tagq(h, t);
-
-	printf("\n");
+	print_paragraph(h);
 }
 
-
-static void
-print_man(MAN_ARGS) 
+void
+html_man(void *arg, const struct roff_man *man)
 {
+	struct html	*h;
 	struct tag	*t;
 
-	t = print_otag(h, TAG_HEAD, 0, NULL);
-	print_man_head(m, n, mh, h);
-	print_tagq(h, t);
+	h = (struct html *)arg;
 
-	t = print_otag(h, TAG_BODY, 0, NULL);
-	print_man_nodelist(m, n, mh, h);
+	if ((h->oflags & HTML_FRAGMENT) == 0) {
+		print_gen_decls(h);
+		print_otag(h, TAG_HTML, "");
+		t = print_otag(h, TAG_HEAD, "");
+		print_man_head(&man->meta, man->first, h);
+		print_tagq(h, t);
+		print_otag(h, TAG_BODY, "");
+	}
+
+	man_root_pre(&man->meta, man->first, h);
+	t = print_otag(h, TAG_DIV, "c", "manual-text");
+	print_man_nodelist(&man->meta, man->first->child, h);
 	print_tagq(h, t);
+	man_root_post(&man->meta, man->first, h);
+	print_tagq(h, NULL);
 }
 
-
-/* ARGSUSED */
 static void
 print_man_head(MAN_ARGS)
 {
+	char	*cp;
 
 	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, mh, h);
-	if (n->next)
-		print_man_nodelist(m, n->next, mh, h);
+	while (n != NULL) {
+		print_man_node(man, n, h);
+		n = n->next;
+	}
 }
 
-
 static void
 print_man_node(MAN_ARGS)
 {
-	int		 child;
+	static int	 want_fillmode = MAN_fi;
+	static int	 save_fillmode;
+
 	struct tag	*t;
+	int		 child;
 
-	child = 1;
-	t = h->tags.head;
-
-	bufinit(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.
+	 * Handle fill mode switch requests up front,
+	 * they would just cause trouble in the subsequent code.
 	 */
 
-	switch (n->type) {
-	case (MAN_ROOT):
-		child = man_root_pre(m, n, mh, h);
+	switch (n->tok) {
+	case MAN_nf:
+	case MAN_EX:
+		want_fillmode = MAN_nf;
+		return;
+	case MAN_fi:
+	case MAN_EE:
+		want_fillmode = MAN_fi;
+		if (fillmode(h, 0) == MAN_fi)
+			print_otag(h, TAG_BR, "");
+		return;
+	default:
 		break;
-	case (MAN_TEXT):
-		if ('\0' == *n->string) {
-			print_otag(h, TAG_P, 0, NULL);
-			return;
+	}
+
+	/* Set up fill mode for the upcoming node. */
+
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		save_fillmode = 0;
+		/* Some block macros suspend or cancel .nf. */
+		switch (n->tok) {
+		case MAN_TP:  /* Tagged paragraphs		*/
+		case MAN_IP:  /* temporarily disable .nf	*/
+		case MAN_HP:  /* for the head.			*/
+			save_fillmode = want_fillmode;
+			/* FALLTHROUGH */
+		case MAN_SH:  /* Section headers		*/
+		case MAN_SS:  /* permanently cancel .nf.	*/
+			want_fillmode = MAN_fi;
+			/* FALLTHROUGH */
+		case MAN_PP:  /* These have no head.		*/
+		case MAN_LP:  /* They will simply		*/
+		case MAN_P:   /* reopen .nf in the body.	*/
+		case MAN_RS:
+		case MAN_UR:
+			fillmode(h, MAN_fi);
+			break;
+		default:
+			break;
 		}
+		break;
+	case ROFFT_TBL:
+		fillmode(h, MAN_fi);
+		break;
+	case ROFFT_ELEM:
+		/*
+		 * Some in-line macros produce tags and/or text
+		 * in the handler, so they require fill mode to be
+		 * configured up front just like for text nodes.
+		 * For the others, keep the traditional approach
+		 * of doing the same, for now.
+		 */
+		fillmode(h, want_fillmode);
+		break;
+	case ROFFT_TEXT:
+		if (fillmode(h, want_fillmode) == MAN_fi &&
+		    want_fillmode == MAN_fi &&
+		    n->flags & NODE_LINE && *n->string == ' ')
+			print_otag(h, TAG_BR, "");
+		if (*n->string != '\0')
+			break;
+		print_paragraph(h);
+		return;
+	default:
+		break;
+	}
 
-		if (' ' == *n->string && MAN_LINE & n->flags)
-			print_otag(h, TAG_BR, 0, NULL);
+	/* Produce output for this node. */
 
+	child = 1;
+	switch (n->type) {
+	case ROFFT_TEXT:
+		t = h->tag;
 		print_text(h, n->string);
-
-		if (MANH_LITERAL & mh->fl)
-			print_otag(h, TAG_BR, 0, NULL);
-		return;
-	case (MAN_TBL):
-		print_tbl(h, n->span);
 		break;
+	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:
-		/* 
+		/*
 		 * 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 (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 (mans[n->tok].pre)
-			child = (*mans[n->tok].pre)(m, n, mh, h);
+			child = (*mans[n->tok].pre)(man, n, h);
+
+		/* Some block macros resume .nf in the body. */
+		if (save_fillmode && n->type == ROFFT_BODY)
+			want_fillmode = save_fillmode;
+
 		break;
 	}
 
 	if (child && n->child)
-		print_man_nodelist(m, n->child, mh, h);
+		print_man_nodelist(man, n->child, h);
 
 	/* This will automatically close out any font scope. */
 	print_stagq(h, t);
 
-	bufinit(h);
+	if (fillmode(h, 0) == MAN_nf &&
+	    n->next != NULL && n->next->flags & NODE_LINE)
+		print_endline(h);
+}
 
-	switch (n->type) {
-	case (MAN_ROOT):
-		man_root_post(m, n, mh, h);
-		break;
-	case (MAN_TBL):
-		break;
-	default:
-		if (mans[n->tok].post)
-			(*mans[n->tok].post)(m, n, mh, h);
-		break;
+/*
+ * MAN_nf switches to no-fill mode, MAN_fi to fill mode.
+ * Other arguments do not switch.
+ * The old mode is returned.
+ */
+static int
+fillmode(struct html *h, int want)
+{
+	struct tag	*pre;
+	int		 had;
+
+	for (pre = h->tag; pre != NULL; pre = pre->next)
+		if (pre->tag == TAG_PRE)
+			break;
+
+	had = pre == NULL ? MAN_fi : MAN_nf;
+
+	if (want && want != had) {
+		if (want == MAN_nf)
+			print_otag(h, TAG_PRE, "");
+		else
+			print_tagq(h, pre);
 	}
+	return had;
 }
 
-
 static int
-a2width(const struct man_node *n, struct roffsu *su)
+a2width(const struct roff_node *n, struct roffsu *su)
 {
 
-	if (MAN_TEXT != n->type)
-		return(0);
-	if (a2roffsu(n->string, su, SCALE_BU))
-		return(1);
+	if (n->type != ROFFT_TEXT)
+		return 0;
+	if (a2roffsu(n->string, su, SCALE_EN))
+		return 1;
 
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
-static int
+static void
 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_SUMMARY_INIT(&tag[0], "Document Header");
-	PAIR_CLASS_INIT(&tag[1], "head");
-	if (NULL == h->style) {
-		PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-		t = print_otag(h, TAG_TABLE, 3, tag);
-		PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
-		print_otag(h, TAG_COL, 1, tag);
-		print_otag(h, TAG_COL, 1, tag);
-		print_otag(h, TAG_COL, 1, tag);
-	} else
-		t = print_otag(h, TAG_TABLE, 2, tag);
-
-	print_otag(h, TAG_TBODY, 0, NULL);
-
-	tt = print_otag(h, TAG_TR, 0, NULL);
-
-	PAIR_CLASS_INIT(&tag[0], "head-ltitle");
-	print_otag(h, TAG_TD, 1, tag);
-
+	print_otag(h, TAG_TD, "c", "head-ltitle");
 	print_text(h, title);
 	print_stagq(h, tt);
 
-	PAIR_CLASS_INIT(&tag[0], "head-vol");
-	if (NULL == h->style) {
-		PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
-		print_otag(h, TAG_TD, 2, tag);
-	} else 
-		print_otag(h, TAG_TD, 1, tag);
-
-	print_text(h, b);
+	print_otag(h, TAG_TD, "c", "head-vol");
+	if (NULL != man->vol)
+		print_text(h, man->vol);
 	print_stagq(h, tt);
 
-	PAIR_CLASS_INIT(&tag[0], "head-rtitle");
-	if (NULL == h->style) {
-		PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-		print_otag(h, TAG_TD, 2, tag);
-	} else 
-		print_otag(h, TAG_TD, 1, tag);
-
+	print_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)
 {
-	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_SUMMARY_INIT(&tag[0], "Document Footer");
-	PAIR_CLASS_INIT(&tag[1], "foot");
-	if (NULL == h->style) {
-		PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-		t = print_otag(h, TAG_TABLE, 3, tag);
-		PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
-		print_otag(h, TAG_COL, 1, tag);
-		print_otag(h, TAG_COL, 1, tag);
-	} else
-		t = print_otag(h, TAG_TABLE, 2, tag);
-
-	tt = print_otag(h, TAG_TR, 0, NULL);
-
-	PAIR_CLASS_INIT(&tag[0], "foot-date");
-	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);
 
-	PAIR_CLASS_INIT(&tag[0], "foot-os");
-	if (NULL == h->style) {
-		PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-		print_otag(h, TAG_TD, 2, tag);
-	} else 
-		print_otag(h, TAG_TD, 1, tag);
-
-	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) {
-		if (n->child)
-			a2roffsu(n->child->string, &su, SCALE_VS);
+		if (NULL != (n = n->child))
+			if ( ! a2roffsu(n->string, &su, SCALE_VS))
+				su.scale = 1.0;
 	} else
-		su.scale = 0;
+		su.scale = 0.0;
 
-	bufcat_su(h, "height", &su);
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
+	print_otag(h, TAG_DIV, "suh", &su);
 
 	/* So the div isn't empty: */
 	print_text(h, "\\~");
 
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_SH_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-
-	if (MAN_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag, "section");
-		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
-	} else if (MAN_BODY == n->type)
-		return(1);
-
-	print_otag(h, TAG_H1, 0, NULL);
-	return(1);
+	if (n->type == ROFFT_HEAD)
+		print_otag(h, TAG_H1, "c", "Sh");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_alt_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
+	const struct roff_node	*nn;
 	int		 i;
 	enum htmltag	 fp;
 	struct tag	*t;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		t = NULL;
 		switch (n->tok) {
-		case (MAN_BI):
+		case MAN_BI:
 			fp = i % 2 ? TAG_I : TAG_B;
 			break;
-		case (MAN_IB):
+		case MAN_IB:
 			fp = i % 2 ? TAG_B : TAG_I;
 			break;
-		case (MAN_RI):
+		case MAN_RI:
 			fp = i % 2 ? TAG_I : TAG_MAX;
 			break;
-		case (MAN_IR):
+		case MAN_IR:
 			fp = i % 2 ? TAG_MAX : TAG_I;
 			break;
-		case (MAN_BR):
+		case MAN_BR:
 			fp = i % 2 ? TAG_MAX : TAG_B;
 			break;
-		case (MAN_RB):
+		case MAN_RB:
 			fp = i % 2 ? TAG_B : TAG_MAX;
 			break;
 		default:
 			abort();
-			/* NOTREACHED */
 		}
 
 		if (i)
 			h->flags |= HTML_NOSPACE;
 
-		if (TAG_MAX != fp)
-			t = print_otag(h, fp, 0, NULL);
+		if (fp != TAG_MAX)
+			t = print_otag(h, fp, "");
 
-		print_man_node(m, nn, mh, h);
+		print_text(h, nn->string);
 
-		if (t)
+		if (fp != TAG_MAX)
 			print_tagq(h, t);
 	}
-
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 man_SM_pre(MAN_ARGS)
 {
-	
-	print_otag(h, TAG_SMALL, 0, NULL);
+	print_otag(h, TAG_SMALL, "");
 	if (MAN_SB == n->tok)
-		print_otag(h, TAG_B, 0, NULL);
-	return(1);
+		print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_SS_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-
-	if (MAN_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag, "subsection");
-		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
-	} else if (MAN_BODY == n->type)
-		return(1);
-
-	print_otag(h, TAG_H2, 0, NULL);
-	return(1);
+	if (n->type == ROFFT_HEAD)
+		print_otag(h, TAG_H2, "c", "Ss");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_PP_pre(MAN_ARGS)
 {
 
-	if (MAN_HEAD == n->type)
-		return(0);
-	else if (MAN_BODY == n->type && n->prev)
-		print_otag(h, TAG_P, 0, NULL);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type == ROFFT_BLOCK)
+		print_bvspace(h, n);
 
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_IP_pre(MAN_ARGS)
 {
-	struct roffsu		 su;
-	struct htmlpair	 	 tag;
-	const struct man_node	*nn;
+	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) { 
-		print_otag(h, TAG_TD, 0, NULL);
-		return(1);
+	if (n->type == ROFFT_BODY) {
+		print_otag(h, TAG_DD, "c", "It-tag");
+		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;
+	/* FIXME: width specification. */
 
-	SCALE_HS_INIT(&su, INDENT);
+	print_otag(h, TAG_DT, "c", "It-tag");
 
-	/* Width is the second token. */
+	/* For IP, only print the first header element. */
 
-	if (MAN_IP == n->tok && NULL != nn)
-		if (NULL != (nn = nn->next))
-			a2width(nn, &su);
+	if (MAN_IP == n->tok && n->child)
+		print_man_node(man, n->child, h);
 
-	/* Width is the first token. */
+	/* For TP, only print next-line header elements. */
 
-	if (MAN_TP == n->tok && NULL != nn) {
-		/* Skip past non-text children. */
-		while (nn && MAN_TEXT != nn->type)
+	if (MAN_TP == n->tok) {
+		nn = n->child;
+		while (NULL != nn && 0 == (NODE_LINE & nn->flags))
 			nn = nn->next;
-		if (nn)
-			a2width(nn, &su);
+		while (NULL != nn) {
+			print_man_node(man, nn, h);
+			nn = nn->next;
+		}
 	}
 
-	if (MAN_BLOCK == n->type) {
-		print_otag(h, TAG_P, 0, NULL);
-		print_otag(h, TAG_TABLE, 0, NULL);
-		bufcat_su(h, "width", &su);
-		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_COL, 1, &tag);
-		print_otag(h, TAG_COL, 0, NULL);
-		print_otag(h, TAG_TBODY, 0, NULL);
-		print_otag(h, TAG_TR, 0, NULL);
-		return(1);
-	} 
+	return 0;
+}
 
-	print_otag(h, TAG_TD, 0, NULL);
+static int
+man_HP_pre(MAN_ARGS)
+{
+	struct roffsu	 sum, sui;
+	const struct roff_node *np;
 
-	/* For IP, only print the first header element. */
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type != ROFFT_BLOCK)
+		return 1;
 
-	if (MAN_IP == n->tok && n->child)
-		print_man_node(m, n->child, mh, h);
+	np = n->head->child;
 
-	/* For TP, only print next-line header elements. */
+	if (np == NULL || !a2width(np, &sum))
+		SCALE_HS_INIT(&sum, INDENT);
 
-	if (MAN_TP == n->tok)
-		for (nn = n->child; nn; nn = nn->next)
-			if (nn->line > n->line)
-				print_man_node(m, nn, mh, h);
+	sui.unit = sum.unit;
+	sui.scale = -sum.scale;
 
-	return(0);
+	print_bvspace(h, n);
+	print_otag(h, TAG_DIV, "csului", "Pp", &sum, &sui);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-man_HP_pre(MAN_ARGS)
+man_OP_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-	struct roffsu	 su;
-	const struct man_node *np;
+	struct tag	*tt;
 
-	np = MAN_BLOCK == n->type ? 
-		n->head->child : 
-		n->parent->head->child;
+	print_text(h, "[");
+	h->flags |= HTML_NOSPACE;
+	tt = print_otag(h, TAG_SPAN, "c", "Op");
 
-	if (NULL == np || ! a2width(np, &su))
-		SCALE_HS_INIT(&su, INDENT);
+	if (NULL != (n = n->child)) {
+		print_otag(h, TAG_B, "");
+		print_text(h, n->string);
+	}
 
-	if (MAN_HEAD == n->type) {
-		print_otag(h, TAG_TD, 0, NULL);
-		return(0);
-	} else if (MAN_BLOCK == n->type) {
-		print_otag(h, TAG_P, 0, NULL);
-		print_otag(h, TAG_TABLE, 0, NULL);
-		bufcat_su(h, "width", &su);
-		PAIR_STYLE_INIT(&tag, h);
-		print_otag(h, TAG_COL, 1, &tag);
-		print_otag(h, TAG_COL, 0, NULL);
-		print_otag(h, TAG_TBODY, 0, NULL);
-		print_otag(h, TAG_TR, 0, NULL);
-		return(1);
+	print_stagq(h, tt);
+
+	if (NULL != n && NULL != n->next) {
+		print_otag(h, TAG_I, "");
+		print_text(h, n->next->string);
 	}
 
-	su.scale = -su.scale;
-	bufcat_su(h, "text-indent", &su);
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_TD, 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_otag(h, TAG_B, 0, NULL);
-	return(1);
+	print_otag(h, TAG_B, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 man_I_pre(MAN_ARGS)
 {
-	
-	print_otag(h, TAG_I, 0, NULL);
-	return(1);
+	print_otag(h, TAG_I, "");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
-man_literal_pre(MAN_ARGS)
-{
-
-	if (MAN_nf == n->tok) {
-		print_otag(h, TAG_BR, 0, NULL);
-		mh->fl |= MANH_LITERAL;
-	} else
-		mh->fl &= ~MANH_LITERAL;
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
 man_in_pre(MAN_ARGS)
 {
-
-	print_otag(h, TAG_BR, 0, NULL);
-	return(0);
+	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 (MAN_HEAD == n->type)
-		return(0);
-	else if (MAN_BODY == n->type)
-		return(1);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type == ROFFT_BODY)
+		return 1;
 
 	SCALE_HS_INIT(&su, INDENT);
 	if (n->head->child)
 		a2width(n->head->child, &su);
 
-	bufcat_su(h, "margin-left", &su);
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	print_otag(h, TAG_DIV, "sul", &su);
+	return 1;
+}
+
+static int
+man_UR_pre(MAN_ARGS)
+{
+	n = n->child;
+	assert(n->type == ROFFT_HEAD);
+	if (n->child != NULL) {
+		assert(n->child->type == ROFFT_TEXT);
+		print_otag(h, TAG_A, "ch", "Lk", n->child->string);
+	}
+
+	assert(n->next->type == ROFFT_BODY);
+	if (n->next->child != NULL)
+		n = n->next;
+
+	print_man_nodelist(man, n->child, h);
+
+	return 0;
 }