===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- mandoc/man_html.c	2009/11/16 08:46:59	1.24
+++ mandoc/man_html.c	2010/03/22 14:03:03	1.28
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.24 2009/11/16 08:46:59 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.28 2010/03/22 14:03:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * 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>
 
 #include <assert.h>
@@ -66,11 +70,6 @@ static	int		  man_SH_pre(MAN_ARGS);
 static	int		  man_SM_pre(MAN_ARGS);
 static	int		  man_SS_pre(MAN_ARGS);
 
-#ifdef __linux__
-extern	size_t	  	  strlcpy(char *, const char *, size_t);
-extern	size_t	  	  strlcat(char *, const char *, size_t);
-#endif
-
 static	const struct htmlman mans[MAN_MAX] = {
 	{ man_br_pre, NULL }, /* br */
 	{ NULL, NULL }, /* TH */
@@ -115,7 +114,7 @@ html_man(void *arg, const struct man *m)
 
 	h = (struct html *)arg;
 
-	print_gen_doctype(h);
+	print_gen_decls(h);
 
 	t = print_otag(h, TAG_HTML, 0, NULL);
 	print_man(man_meta(m), man_node(m), h);
@@ -182,6 +181,12 @@ print_man_node(MAN_ARGS)
 
 	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);
@@ -568,6 +573,8 @@ man_IP_pre(MAN_ARGS)
 	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)
@@ -575,9 +582,16 @@ man_IP_pre(MAN_ARGS)
 			width = a2width(nn, &su);
 		}
 
-	if (MAN_TP == n->tok && NULL != nn)
-		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)
+			nn = nn->next;
+		if (nn)
+			width = a2width(nn, &su);
+	}
+
 	if (MAN_BLOCK == n->type) {
 		bufcat_su(h, "margin-left", &su);
 		SCALE_VS_INIT(&su, 1);
@@ -601,10 +615,19 @@ man_IP_pre(MAN_ARGS)
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);
 
-	/* With a length string, manually omit the last child. */
+	/*
+	 * 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)