===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.58
retrieving revision 1.65
diff -u -p -r1.58 -r1.65
--- mandoc/man_html.c	2011/01/01 12:59:17	1.58
+++ mandoc/man_html.c	2011/01/12 15:41:09	1.65
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.58 2011/01/01 12:59:17 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.65 2011/01/12 15:41:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,7 +67,7 @@ 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);
@@ -183,25 +183,40 @@ print_man_node(MAN_ARGS)
 
 	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, mh, 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 (MANH_LITERAL & mh->fl)
+
+		/*
+		 * 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_TBL):
+		print_tbl(h, n->span);
 		return;
 	default:
 		/* 
@@ -226,10 +241,15 @@ print_man_node(MAN_ARGS)
 
 	bufinit(h);
 
-	if (MAN_ROOT == n->type) 
+	switch (n->type) {
+	case (MAN_ROOT):
 		man_root_post(m, n, mh, h);
-	else if (mans[n->tok].post)
-		(*mans[n->tok].post)(m, n, mh, h);
+		break;
+	default:
+		if (mans[n->tok].post)
+			(*mans[n->tok].post)(m, n, mh, h);
+		break;
+	}
 }
 
 
@@ -247,7 +267,7 @@ a2width(const struct man_node *n, struct roffsu *su)
 
 
 /* ARGSUSED */
-static int
+static void
 man_root_pre(MAN_ARGS)
 {
 	struct htmlpair	 tag[3];
@@ -301,7 +321,6 @@ man_root_pre(MAN_ARGS)
 
 	print_text(h, title);
 	print_tagq(h, t);
-	return(1);
 }
 
 
@@ -497,7 +516,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
@@ -515,16 +533,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. */
 
@@ -533,7 +547,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) {
@@ -550,26 +564,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);
 }