===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.56
retrieving revision 1.63
diff -u -p -r1.56 -r1.63
--- mandoc/man_html.c	2010/12/22 09:51:27	1.56
+++ mandoc/man_html.c	2011/01/12 10:43:22	1.63
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.56 2010/12/22 09:51:27 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.63 2011/01/12 10:43:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -197,23 +197,31 @@ print_man_node(MAN_ARGS)
 		child = man_root_pre(m, n, mh, h);
 		break;
 	case (MAN_TEXT):
+		if ('\0' == *n->string) {
+			print_otag(h, TAG_P, 0, NULL);
+			return;
+		}
+
+		if (' ' == *n->string && MAN_LINE & n->flags)
+			print_otag(h, TAG_BR, 0, NULL);
+
 		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;
 	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).
 		 */
-		if (h->metaf) {
-			assert(h->metaf == t);
-			print_tagq(h, h->metaf);
-			assert(NULL == h->metaf);
-			t = h->tags.head;
+		if (HTMLFONT_NONE != h->metac) {
+			h->metal = h->metac;
+			h->metac = HTMLFONT_NONE;
 		}
 		if (mans[n->tok].pre)
 			child = (*mans[n->tok].pre)(m, n, mh, h);
@@ -232,7 +240,7 @@ print_man_node(MAN_ARGS)
 	case (MAN_ROOT):
 		man_root_post(m, n, mh, h);
 		break;
-	case (MAN_TEXT):
+	case (MAN_TBL):
 		break;
 	default:
 		if (mans[n->tok].post)
@@ -409,29 +417,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();
@@ -441,14 +450,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);
+		if (TAG_MAX != fp)
+			t = print_otag(h, fp, 0, NULL);
+
 		print_man_node(m, nn, mh, h);
-		print_tagq(h, t);
+
+		if (t)
+			print_tagq(h, t);
 	}
 
 	return(0);
@@ -459,13 +467,10 @@ man_alt_pre(MAN_ARGS)
 static int
 man_SM_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag;
 	
-	/* FIXME: print_ofont(). */
-	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_ofont(h, HTMLFONT_BOLD);
+		print_otag(h, TAG_B, 0, NULL);
 	return(1);
 }
 
@@ -509,7 +514,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
@@ -527,16 +531,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. */
 
@@ -545,7 +545,7 @@ 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) {
@@ -562,26 +562,17 @@ man_IP_pre(MAN_ARGS)
 
 	print_otag(h, TAG_TD, 0, NULL);
 
-	/*
-	 * Without a length string, we can print all of our children.
-	 */
+	/* For IP, only print the first header element. */
 
-	if ( ! width)
-		return(1);
+	if (MAN_IP == n->tok && n->child)
+		print_man_node(m, n->child, mh, h);
 
-	/*
-	 * 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).
-	 */
+	/* For TP, only print next-line header elements. */
 
-	if (MAN_IP == n->tok)
-		for (nn = n->child; nn->next; nn = nn->next)
-			print_man_node(m, nn, mh, h);
 	if (MAN_TP == n->tok)
-		for (nn = n->child->next; nn; nn = nn->next)
-			print_man_node(m, nn, mh, h);
+		for (nn = n->child; nn; nn = nn->next)
+			if (nn->line > n->line)
+				print_man_node(m, nn, mh, h);
 
 	return(0);
 }
@@ -630,7 +621,7 @@ static int
 man_B_pre(MAN_ARGS)
 {
 
-	print_ofont(h, HTMLFONT_BOLD);
+	print_otag(h, TAG_B, 0, NULL);
 	return(1);
 }
 
@@ -640,7 +631,7 @@ static int
 man_I_pre(MAN_ARGS)
 {
 	
-	print_ofont(h, HTMLFONT_ITALIC);
+	print_otag(h, TAG_I, 0, NULL);
 	return(1);
 }