===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.43
retrieving revision 1.70
diff -u -p -r1.43 -r1.70
--- mandoc/man_html.c	2010/07/22 23:03:15	1.43
+++ mandoc/man_html.c	2011/03/07 01:35:51	1.70
@@ -1,6 +1,6 @@
-/*	$Id: man_html.c,v 1.43 2010/07/22 23:03:15 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.70 2011/03/07 01:35:51 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 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
@@ -40,8 +40,14 @@
 
 #define	MAN_ARGS	  const struct man_meta *m, \
 			  const struct man_node *n, \
+			  struct mhtml *mh, \
 			  struct html *h
 
+struct	mhtml {
+	int		  fl;
+#define	MANH_LITERAL	 (1 << 0) /* literal context */
+};
+
 struct	htmlman {
 	int		(*pre)(MAN_ARGS);
 	int		(*post)(MAN_ARGS);
@@ -58,15 +64,16 @@ static	int		  a2width(const struct man_node *,
 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	void		  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_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);
@@ -83,7 +90,7 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_IP_pre, NULL }, /* IP */
 	{ 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 */
@@ -93,22 +100,18 @@ 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_ign_pre, NULL }, /* na */
 	{ man_br_pre, NULL }, /* sp */
-	{ NULL, NULL }, /* nf */
-	{ NULL, NULL }, /* fi */
-	{ NULL, NULL }, /* r */
+	{ man_literal_pre, NULL }, /* nf */
+	{ man_literal_pre, NULL }, /* fi */
 	{ 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_in_pre, NULL }, /* in */
+	{ man_ign_pre, NULL }, /* ft */
 };
 
 
@@ -117,13 +120,16 @@ html_man(void *arg, const struct man *m)
 {
 	struct html	*h;
 	struct tag	*t;
+	struct mhtml	 mh;
 
 	h = (struct html *)arg;
 
 	print_gen_decls(h);
 
+	memset(&mh, 0, sizeof(struct mhtml));
+
 	t = print_otag(h, TAG_HTML, 0, NULL);
-	print_man(man_meta(m), man_node(m), h);
+	print_man(man_meta(m), man_node(m), &mh, h);
 	print_tagq(h, t);
 
 	printf("\n");
@@ -134,20 +140,13 @@ static void
 print_man(MAN_ARGS) 
 {
 	struct tag	*t;
-	struct htmlpair	 tag;
 
 	t = print_otag(h, TAG_HEAD, 0, NULL);
-
-	print_man_head(m, n, h);
+	print_man_head(m, n, mh, 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);
-
+	t = print_otag(h, TAG_BODY, 0, NULL);
+	print_man_nodelist(m, n, mh, h);
 	print_tagq(h, t);
 }
 
@@ -170,9 +169,9 @@ static void
 print_man_nodelist(MAN_ARGS)
 {
 
-	print_man_node(m, n, h);
+	print_man_node(m, n, mh, h);
 	if (n->next)
-		print_man_nodelist(m, n->next, h);
+		print_man_nodelist(m, n->next, mh, h);
 }
 
 
@@ -181,44 +180,81 @@ print_man_node(MAN_ARGS)
 {
 	int		 child;
 	struct tag	*t;
+	struct htmlpair	 tag;
 
 	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.
-	 */
-
 	switch (n->type) {
 	case (MAN_ROOT):
-		child = man_root_pre(m, n, h);
+		man_root_pre(m, n, mh, h);
 		break;
 	case (MAN_TEXT):
+		/*
+		 * If we have a blank line, output a vertical space.
+		 * If we have a space as the first character, break
+		 * before printing the line's data.
+		 */
+		if ('\0' == *n->string) {
+			print_otag(h, TAG_P, 0, NULL);
+			return;
+		} else if (' ' == *n->string && MAN_LINE & n->flags)
+			print_otag(h, TAG_BR, 0, NULL);
+
 		print_text(h, n->string);
+
+		/*
+		 * If we're in a literal context, make sure that words
+		 * togehter on the same line stay together.  This is a
+		 * POST-printing call, so we check the NEXT word.  Since
+		 * -man doesn't have nested macros, we don't need to be
+		 * more specific than this.
+		 */
+		if (MANH_LITERAL & mh->fl &&
+				(NULL == n->next ||
+				 n->next->line > n->line))
+			print_otag(h, TAG_BR, 0, NULL);
 		return;
+	case (MAN_EQN):
+		PAIR_CLASS_INIT(&tag, "eqn");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		print_text(h, n->eqn->data);
+		break;
+	case (MAN_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);
+		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->tags.head;
 		}
 		if (mans[n->tok].pre)
-			child = (*mans[n->tok].pre)(m, n, h);
+			child = (*mans[n->tok].pre)(m, n, mh, h);
 		break;
 	}
 
 	if (child && n->child)
-		print_man_nodelist(m, n->child, h);
+		print_man_nodelist(m, n->child, mh, h);
 
 	/* This will automatically close out any font scope. */
 	print_stagq(h, t);
@@ -227,13 +263,13 @@ print_man_node(MAN_ARGS)
 
 	switch (n->type) {
 	case (MAN_ROOT):
-		man_root_post(m, n, h);
+		man_root_post(m, n, mh, h);
 		break;
-	case (MAN_TEXT):
+	case (MAN_EQN):
 		break;
 	default:
 		if (mans[n->tok].post)
-			(*mans[n->tok].post)(m, n, h);
+			(*mans[n->tok].post)(m, n, mh, h);
 		break;
 	}
 }
@@ -253,7 +289,7 @@ a2width(const struct man_node *n, struct roffsu *su)
 
 
 /* ARGSUSED */
-static int
+static void
 man_root_pre(MAN_ARGS)
 {
 	struct htmlpair	 tag[3];
@@ -266,38 +302,47 @@ man_root_pre(MAN_ARGS)
 
 	snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
-	PAIR_CLASS_INIT(&tag[0], "header");
-	bufcat_style(h, "width", "100%");
-	PAIR_STYLE_INIT(&tag[1], h);
-	PAIR_SUMMARY_INIT(&tag[2], "header");
+	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);
 
-	t = print_otag(h, TAG_TABLE, 3, tag);
+	print_otag(h, TAG_TBODY, 0, NULL);
+
 	tt = print_otag(h, TAG_TR, 0, NULL);
 
-	bufinit(h);
-	bufcat_style(h, "width", "10%");
-	PAIR_STYLE_INIT(&tag[0], h);
+	PAIR_CLASS_INIT(&tag[0], "head-ltitle");
 	print_otag(h, TAG_TD, 1, tag);
+
 	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);
+	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_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);
+	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_text(h, title);
 	print_tagq(h, t);
-	return(1);
 }
 
 
@@ -307,33 +352,33 @@ 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);
+	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);
 
-	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);
+	PAIR_CLASS_INIT(&tag[0], "foot-date");
 	print_otag(h, TAG_TD, 1, tag);
-	print_text(h, b);
+
+	print_text(h, m->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);
+	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_tagq(h, t);
@@ -350,18 +395,11 @@ man_br_pre(MAN_ARGS)
 
 	SCALE_VS_INIT(&su, 1);
 
-	switch (n->tok) {
-	case (MAN_Sp):
-		SCALE_VS_INIT(&su, 0.5);
-		break;
-	case (MAN_sp):
+	if (MAN_sp == n->tok) {
 		if (n->child)
 			a2roffsu(n->child->string, &su, SCALE_VS);
-		break;
-	default:
+	} else
 		su.scale = 0;
-		break;
-	}
 
 	bufcat_su(h, "height", &su);
 	PAIR_STYLE_INIT(&tag, h);
@@ -378,35 +416,16 @@ man_br_pre(MAN_ARGS)
 static int
 man_SH_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[2];
-	struct roffsu	 su;
+	struct htmlpair	 tag;
 
-	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);
+	if (MAN_BLOCK == n->type) {
+		PAIR_CLASS_INIT(&tag, "section");
+		print_otag(h, TAG_DIV, 1, &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);
+	} else if (MAN_BODY == n->type)
 		return(1);
-	}
 
-	PAIR_CLASS_INIT(&tag[0], "sec-head");
-	print_otag(h, TAG_DIV, 1, tag);
+	print_otag(h, TAG_H1, 0, NULL);
 	return(1);
 }
 
@@ -416,29 +435,30 @@ static int
 man_alt_pre(MAN_ARGS)
 {
 	const struct man_node	*nn;
-	struct tag		*t;
-	int			 i;
-	enum htmlfont		 fp;
+	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):
-			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;
+			fp = i % 2 ? TAG_I : TAG_B;
 			break;
 		case (MAN_IB):
-			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;
+			fp = i % 2 ? TAG_B : TAG_I;
 			break;
 		case (MAN_RI):
-			fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;
+			fp = i % 2 ? TAG_I : TAG_MAX;
 			break;
 		case (MAN_IR):
-			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;
+			fp = i % 2 ? TAG_MAX : TAG_I;
 			break;
 		case (MAN_BR):
-			fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;
+			fp = i % 2 ? TAG_MAX : TAG_B;
 			break;
 		case (MAN_RB):
-			fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;
+			fp = i % 2 ? TAG_B : TAG_MAX;
 			break;
 		default:
 			abort();
@@ -448,14 +468,13 @@ man_alt_pre(MAN_ARGS)
 		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 (TAG_MAX != fp)
+			t = print_otag(h, fp, 0, NULL);
+
+		print_man_node(m, nn, mh, h);
+
+		if (t)
+			print_tagq(h, t);
 	}
 
 	return(0);
@@ -464,25 +483,12 @@ man_alt_pre(MAN_ARGS)
 
 /* 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);
-}
-
-
-/* ARGSUSED */
-static int
 man_SM_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
 	
-	PAIR_CLASS_INIT(&tag, "small");
-	print_otag(h, TAG_SPAN, 1, &tag);
+	print_otag(h, TAG_SMALL, 0, NULL);
+	if (MAN_SB == n->tok)
+		print_otag(h, TAG_B, 0, NULL);
 	return(1);
 }
 
@@ -491,41 +497,16 @@ man_SM_pre(MAN_ARGS)
 static int
 man_SS_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[3];
-	struct roffsu	 su;
+	struct htmlpair	 tag;
 
-	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);
+	if (MAN_BLOCK == n->type) {
+		PAIR_CLASS_INIT(&tag, "subsection");
+		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);
+	} else if (MAN_BODY == n->type)
 		return(1);
-	}
 
-	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);
+	print_otag(h, TAG_H2, 0, NULL);
 	return(1);
 }
 
@@ -534,28 +515,12 @@ man_SS_pre(MAN_ARGS)
 static int
 man_PP_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
-	struct roffsu	 su;
-	int		 i;
 
-	if (MAN_BLOCK != n->type)
-		return(1);
+	if (MAN_HEAD == n->type)
+		return(0);
+	else if (MAN_BODY == n->type && n->prev)
+		print_otag(h, TAG_P, 0, NULL);
 
-	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);
 }
 
@@ -567,7 +532,6 @@ man_IP_pre(MAN_ARGS)
 	struct roffsu		 su;
 	struct htmlpair	 	 tag;
 	const struct man_node	*nn;
-	int			 width;
 
 	/*
 	 * This scattering of 1-BU margins and pads is to make sure that
@@ -577,10 +541,7 @@ man_IP_pre(MAN_ARGS)
 	 */
 
 	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);
+		print_otag(h, TAG_TD, 0, NULL);
 		return(1);
 	}
 
@@ -588,16 +549,12 @@ man_IP_pre(MAN_ARGS)
 		n->head->child : n->parent->head->child;
 
 	SCALE_HS_INIT(&su, INDENT);
-	width = 0;
 
-	/* Width is the last token. */
+	/* Width is the second 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);
-		}
+		if (NULL != (nn = nn->next))
+			a2width(nn, &su);
 
 	/* Width is the first token. */
 
@@ -606,52 +563,34 @@ man_IP_pre(MAN_ARGS)
 		while (nn && MAN_TEXT != nn->type)
 			nn = nn->next;
 		if (nn)
-			width = a2width(nn, &su);
+			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");
+		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_DIV, 1, &tag);
+		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);
 	} 
 
-	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");
+	print_otag(h, TAG_TD, 0, NULL);
 
-	if (n->next && n->next->child)
-		bufcat_style(h, "float", "left");
+	/* For IP, only print the first header element. */
 
-	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
+	if (MAN_IP == n->tok && n->child)
+		print_man_node(m, n->child, mh, h);
 
-	/*
-	 * Without a length string, we can print all of our children.
-	 */
+	/* For TP, only print next-line header elements. */
 
-	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);
+		for (nn = n->child; nn; nn = nn->next)
+			if (nn->line > n->line)
+				print_man_node(m, nn, mh, h);
 
 	return(0);
 }
@@ -661,37 +600,36 @@ man_IP_pre(MAN_ARGS)
 static int
 man_HP_pre(MAN_ARGS)
 {
-	const struct man_node	*nn;
-	struct htmlpair	 	 tag;
-	struct roffsu		 su;
+	struct htmlpair	 tag;
+	struct roffsu	 su;
+	const struct man_node *np;
 
-	if (MAN_HEAD == n->type)
-		return(0);
+	np = MAN_BLOCK == n->type ? 
+		n->head->child : 
+		n->parent->head->child;
 
-	nn = MAN_BLOCK == n->type ?
-		n->head->child : n->parent->head->child;
+	if (NULL == np || ! a2width(np, &su))
+		SCALE_HS_INIT(&su, INDENT);
 
-	SCALE_HS_INIT(&su, INDENT);
-
-	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");
+	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_DIV, 1, &tag);
+		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);
 	}
 
-	bufcat_su(h, "margin-left", &su);
-	SCALE_INVERT(&su);
+	su.scale = -su.scale;
 	bufcat_su(h, "text-indent", &su);
-
 	PAIR_STYLE_INIT(&tag, h);
-	print_otag(h, TAG_DIV, 1, &tag);
+	print_otag(h, TAG_TD, 1, &tag);
 	return(1);
 }
 
@@ -701,7 +639,7 @@ static int
 man_B_pre(MAN_ARGS)
 {
 
-	print_ofont(h, HTMLFONT_BOLD);
+	print_otag(h, TAG_B, 0, NULL);
 	return(1);
 }
 
@@ -711,13 +649,38 @@ static int
 man_I_pre(MAN_ARGS)
 {
 	
-	print_ofont(h, HTMLFONT_ITALIC);
+	print_otag(h, TAG_I, 0, NULL);
 	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(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_in_pre(MAN_ARGS)
+{
+
+	print_otag(h, TAG_BR, 0, NULL);
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
 man_ign_pre(MAN_ARGS)
 {
 
@@ -738,14 +701,10 @@ man_RS_pre(MAN_ARGS)
 		return(1);
 
 	SCALE_HS_INIT(&su, INDENT);
-	bufcat_su(h, "margin-left", &su);
-
-	if (n->head->child) {
-		SCALE_VS_INIT(&su, 1);
+	if (n->head->child)
 		a2width(n->head->child, &su);
-		bufcat_su(h, "margin-top", &su);
-	}
 
+	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);
 	return(1);