===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.115
retrieving revision 1.123
diff -u -p -r1.115 -r1.123
--- mandoc/mdoc_html.c	2010/12/15 14:52:16	1.115
+++ mandoc/mdoc_html.c	2010/12/17 00:18:29	1.123
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.115 2010/12/15 14:52:16 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.123 2010/12/17 00:18:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -103,6 +103,7 @@ static	int		  mdoc_nm_pre(MDOC_ARGS);
 static	int		  mdoc_ns_pre(MDOC_ARGS);
 static	int		  mdoc_pa_pre(MDOC_ARGS);
 static	void		  mdoc_pf_post(MDOC_ARGS);
+static	int		  mdoc_pp_pre(MDOC_ARGS);
 static	void		  mdoc_quote_post(MDOC_ARGS);
 static	int		  mdoc_quote_pre(MDOC_ARGS);
 static	int		  mdoc_rs_pre(MDOC_ARGS);
@@ -126,7 +127,7 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{NULL, NULL}, /* Os */
 	{mdoc_sh_pre, NULL }, /* Sh */
 	{mdoc_ss_pre, NULL }, /* Ss */ 
-	{mdoc_sp_pre, NULL}, /* Pp */ 
+	{mdoc_pp_pre, NULL}, /* Pp */ 
 	{mdoc_d1_pre, NULL}, /* D1 */
 	{mdoc_d1_pre, NULL}, /* Dl */
 	{mdoc_bd_pre, NULL}, /* Bd */
@@ -227,7 +228,7 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{NULL, NULL}, /* Fr */
 	{mdoc_ud_pre, NULL}, /* Ud */
 	{mdoc_lb_pre, NULL}, /* Lb */
-	{mdoc_sp_pre, NULL}, /* Lp */ 
+	{mdoc_pp_pre, NULL}, /* Lp */ 
 	{mdoc_lk_pre, NULL}, /* Lk */ 
 	{mdoc_mt_pre, NULL}, /* Mt */ 
 	{mdoc_quote_pre, mdoc_quote_post}, /* Brq */ 
@@ -246,13 +247,13 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 
 static	const char * const lists[LIST_MAX] = {
 	NULL,
-	"list-bullet",
-	"list-column",
+	"list-bul",
+	"list-col",
 	"list-dash",
 	"list-diag",
 	"list-enum",
 	"list-hang",
-	"list-hyphen",
+	"list-hyph",
 	"list-inset",
 	"list-item",
 	"list-ohang",
@@ -369,18 +370,12 @@ static void
 print_mdoc(MDOC_ARGS)
 {
 	struct tag	*t;
-	struct htmlpair	 tag;
 
 	t = print_otag(h, TAG_HEAD, 0, NULL);
 	print_mdoc_head(m, n, 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_mdoc_nodelist(m, n, h);
 	print_tagq(h, t);
 }
@@ -479,12 +474,6 @@ mdoc_root_post(MDOC_ARGS)
 
 	time2a(m->date, b, DATESIZ);
 
-	/*
-	 * XXX: this should use divs, but in Firefox, divs with nested
-	 * divs for some reason puke when trying to put a border line
-	 * below.  So I use tables, instead.
-	 */
-
 	PAIR_CLASS_INIT(&tag[0], "footer");
 	bufcat_style(h, "width", "100%");
 	PAIR_STYLE_INIT(&tag[1], h);
@@ -518,19 +507,16 @@ mdoc_root_pre(MDOC_ARGS)
 	struct tag	*t, *tt;
 	char		 b[BUFSIZ], title[BUFSIZ];
 
-	(void)strlcpy(b, m->vol, BUFSIZ);
+	strlcpy(b, m->vol, BUFSIZ);
 
 	if (m->arch) {
-		(void)strlcat(b, " (", BUFSIZ);
-		(void)strlcat(b, m->arch, BUFSIZ);
-		(void)strlcat(b, ")", BUFSIZ);
+		strlcat(b, " (", BUFSIZ);
+		strlcat(b, m->arch, BUFSIZ);
+		strlcat(b, ")", BUFSIZ);
 	}
 
-	(void)snprintf(title, BUFSIZ - 1, 
-			"%s(%s)", m->title, m->msec);
+	snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
-	/* XXX: see note in mdoc_root_post() about divs. */
-
 	PAIR_CLASS_INIT(&tag[0], "header");
 	bufcat_style(h, "width", "100%");
 	PAIR_STYLE_INIT(&tag[1], h);
@@ -571,46 +557,25 @@ mdoc_root_pre(MDOC_ARGS)
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-	struct htmlpair		 tag[2];
-	const struct mdoc_node	*nn;
-	char			 buf[BUFSIZ];
-	struct roffsu		 su;
+	struct htmlpair	 tag;
+	char		 buf[BUFSIZ];
 
-	if (MDOC_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 (MDOC_BLOCK == n->type) {
+		PAIR_CLASS_INIT(&tag, "section");
+		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
-	} else if (MDOC_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag[0], "sec-block");
-		if (n->prev && 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 (MDOC_BODY == n->type)
 		return(1);
-	}
 
 	buf[0] = '\0';
-	for (nn = n->child; nn; nn = nn->next) {
-		html_idcat(buf, nn->string, BUFSIZ);
-		if (nn->next)
+	for (n = n->child; n; n = n->next) {
+		html_idcat(buf, n->string, BUFSIZ);
+		if (n->next)
 			html_idcat(buf, " ", BUFSIZ);
 	}
 
-	PAIR_CLASS_INIT(&tag[0], "sec-head");
-	PAIR_ID_INIT(&tag[1], buf);
-
-	print_otag(h, TAG_DIV, 2, tag);
+	PAIR_ID_INIT(&tag, buf);
+	print_otag(h, TAG_H1, 1, &tag);
 	return(1);
 }
 
@@ -619,51 +584,25 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[3];
-	const struct mdoc_node	*nn;
-	char			 buf[BUFSIZ];
-	struct roffsu		 su;
+	struct htmlpair	 tag;
+	char		 buf[BUFSIZ];
 
-	SCALE_VS_INIT(&su, 1);
-
-	if (MDOC_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);
-		} else
-			print_otag(h, TAG_DIV, 1, tag);
+	if (MDOC_BLOCK == n->type) {
+		PAIR_CLASS_INIT(&tag, "subsection");
+		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
-	} else if (MDOC_BLOCK == n->type) {
-		PAIR_CLASS_INIT(&tag[0], "ssec-block");
-		if (n->prev) {
-			bufcat_su(h, "margin-top", &su);
-			PAIR_STYLE_INIT(&tag[1], h);
-			print_otag(h, TAG_DIV, 2, tag);
-		} else
-			print_otag(h, TAG_DIV, 1, tag);
+	} else if (MDOC_BODY == n->type)
 		return(1);
-	}
 
-	/* TODO: see note in mdoc_sh_pre() about duplicates. */
-
 	buf[0] = '\0';
-	for (nn = n->child; nn; nn = nn->next) {
-		html_idcat(buf, nn->string, BUFSIZ);
-		if (nn->next)
+	for (n = n->child; n; n = n->next) {
+		html_idcat(buf, n->string, BUFSIZ);
+		if (n->next)
 			html_idcat(buf, " ", BUFSIZ);
 	}
 
-	SCALE_HS_INIT(&su, INDENT - HALFINDENT);
-	su.scale = -su.scale;
-	bufcat_su(h, "margin-left", &su);
-
-	PAIR_CLASS_INIT(&tag[0], "ssec-head");
-	PAIR_STYLE_INIT(&tag[1], h);
-	PAIR_ID_INIT(&tag[2], buf);
-
-	print_otag(h, TAG_DIV, 3, tag);
+	PAIR_ID_INIT(&tag, buf);
+	print_otag(h, TAG_H2, 1, &tag);
 	return(1);
 }
 
@@ -903,7 +842,7 @@ mdoc_it_pre(MDOC_ARGS)
 {
 	struct roffsu	 su;
 	enum mdoc_list	 type;
-	struct htmlpair	 tag;
+	struct htmlpair	 tag[2];
 	const struct mdoc_node *bl;
 
 	bl = n->parent;
@@ -914,12 +853,9 @@ mdoc_it_pre(MDOC_ARGS)
 
 	type = bl->data.Bl->type;
 
-	/* Whether we're top-padded (not "compact"). */
+	assert(lists[type]);
+	PAIR_CLASS_INIT(&tag[0], lists[type]);
 
-	SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
-	bufcat_su(h, "margin-top", &su);
-	PAIR_STYLE_INIT(&tag, h);
-
 	if (MDOC_HEAD == n->type) {
 		switch (type) {
 		case(LIST_bullet):
@@ -941,7 +877,10 @@ mdoc_it_pre(MDOC_ARGS)
 		case(LIST_ohang):
 			/* FALLTHROUGH */
 		case(LIST_tag):
-			print_otag(h, TAG_DT, 1, &tag);
+			SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_DT, 2, tag);
 			break;
 		case(LIST_column):
 			break;
@@ -959,8 +898,10 @@ mdoc_it_pre(MDOC_ARGS)
 		case(LIST_enum):
 			/* FALLTHROUGH */
 		case(LIST_item):
-			/* FALLTHROUGH */
-			print_otag(h, TAG_LI, 1, &tag);
+			SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_LI, 2, tag);
 			break;
 		case(LIST_diag):
 			/* FALLTHROUGH */
@@ -971,10 +912,20 @@ mdoc_it_pre(MDOC_ARGS)
 		case(LIST_ohang):
 			/* FALLTHROUGH */
 		case(LIST_tag):
-			print_otag(h, TAG_DD, 0, NULL);
+			if (NULL == bl->data.Bl->width) {
+				print_otag(h, TAG_DD, 1, tag);
+				break;
+			}
+			a2width(bl->data.Bl->width, &su);
+			bufcat_su(h, "margin-left", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_DD, 2, tag);
 			break;
 		case(LIST_column):
-			print_otag(h, TAG_TD, 1, &tag);
+			SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
+			bufcat_su(h, "margin-top", &su);
+			PAIR_STYLE_INIT(&tag[1], h);
+			print_otag(h, TAG_TD, 2, tag);
 			break;
 		default:
 			break;
@@ -982,7 +933,7 @@ mdoc_it_pre(MDOC_ARGS)
 	} else {
 		switch (type) {
 		case (LIST_column):
-			print_otag(h, TAG_TR, 0, NULL);
+			print_otag(h, TAG_TR, 1, tag);
 			break;
 		default:
 			break;
@@ -997,7 +948,7 @@ static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 	size_t		 i;
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag[3];
 	struct roffsu	 su;
 
 	if (MDOC_BODY == n->type) {
@@ -1031,18 +982,22 @@ mdoc_bl_pre(MDOC_ARGS)
 		return(0);
 	}
 
+	SCALE_VS_INIT(&su, 0);
+	bufcat_su(h, "margin-top", &su);
+	bufcat_su(h, "margin-bottom", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
+
 	assert(lists[n->data.Bl->type]);
-	PAIR_CLASS_INIT(&tag[0], lists[n->data.Bl->type]);
-	i = 1;
+	PAIR_CLASS_INIT(&tag[1], lists[n->data.Bl->type]);
+	i = 2;
 
 	/* Set the block's left-hand margin. */
 
 	if (n->data.Bl->offs) {
 		a2offs(n->data.Bl->offs, &su);
 		bufcat_su(h, "margin-left", &su);
-		PAIR_STYLE_INIT(&tag[1], h);
-		i = 2;
-
+		PAIR_STYLE_INIT(&tag[2], h);
+		i = 3;
 	}
 
 	switch (n->data.Bl->type) {
@@ -1138,13 +1093,20 @@ mdoc_d1_pre(MDOC_ARGS)
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	/* FIXME: D1 shouldn't be literal. */
+	SCALE_VS_INIT(&su, 0);
+	bufcat_su(h, "margin-top", &su);
+	bufcat_su(h, "margin-bottom", &su);
+	PAIR_STYLE_INIT(&tag[0], h);
+	print_otag(h, TAG_BLOCKQUOTE, 1, tag);
 
-	SCALE_VS_INIT(&su, INDENT - 2);
-	bufcat_su(h, "margin-left", &su);
-	PAIR_CLASS_INIT(&tag[0], "lit");
-	PAIR_STYLE_INIT(&tag[1], h);
-	print_otag(h, TAG_DIV, 2, tag);
+	/* BLOCKQUOTE needs a block body. */
+
+	if (MDOC_Dl == n->tok) {
+		PAIR_CLASS_INIT(&tag[1], "lit");
+		print_otag(h, TAG_DIV, 1, tag);
+	} else
+		print_otag(h, TAG_DIV, 0, tag);
+
 	return(1);
 }
 
@@ -1539,37 +1501,35 @@ mdoc_sm_pre(MDOC_ARGS)
 	return(0);
 }
 
+/* ARGSUSED */
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
 
+	print_otag(h, TAG_P, 0, NULL);
+	return(0);
+
+}
+
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
-	int		 len;
-	struct htmlpair	 tag;
 	struct roffsu	 su;
+	struct htmlpair	 tag;
 
-	switch (n->tok) {
-	case (MDOC_sp):
-		/* FIXME: can this have a scaling indicator? */
-		len = n->child ? atoi(n->child->string) : 1;
-		break;
-	case (MDOC_br):
-		len = 0;
-		break;
-	default:
-		assert(n->parent);
-		if ((NULL == n->next || NULL == n->prev) &&
-				(MDOC_Ss == n->parent->tok ||
-				 MDOC_Sh == n->parent->tok))
-			return(0);
-		len = 1;
-		break;
-	}
+	SCALE_VS_INIT(&su, 1);
 
-	SCALE_VS_INIT(&su, len);
+	if (MDOC_sp == n->tok) {
+		if (n->child)
+			a2roffsu(n->child->string, &su, SCALE_VS);
+	} else
+		su.scale = 0;
+
 	bufcat_su(h, "height", &su);
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);
+
 	/* So the div isn't empty: */
 	print_text(h, "\\~");
 
@@ -1577,7 +1537,6 @@ mdoc_sp_pre(MDOC_ARGS)
 
 }
 
-
 /* ARGSUSED */
 static int
 mdoc_lk_pre(MDOC_ARGS)
@@ -1864,10 +1823,8 @@ mdoc_rs_pre(MDOC_ARGS)
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	if (n->prev && SEC_SEE_ALSO == n->sec) {
-		print_otag(h, TAG_BR, 0, NULL);
-		print_otag(h, TAG_BR, 0, NULL);
-	} 
+	if (n->prev && SEC_SEE_ALSO == n->sec)
+		print_otag(h, TAG_P, 0, NULL);
 
 	PAIR_CLASS_INIT(&tag, "ref");
 	print_otag(h, TAG_SPAN, 1, &tag);