===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.83
retrieving revision 1.92
diff -u -p -r1.83 -r1.92
--- mandoc/mdoc_html.c	2010/06/12 12:38:01	1.83
+++ mandoc/mdoc_html.c	2010/07/02 12:54:33	1.92
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_html.c,v 1.83 2010/06/12 12:38:01 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.92 2010/07/02 12:54:33 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
@@ -30,6 +30,7 @@
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"
+#include "regs.h"
 #include "mdoc.h"
 #include "main.h"
 
@@ -303,7 +304,7 @@ synopsis_pre(struct html *h, const struct mdoc_node *n
 	struct roffsu	 su;
 	struct htmlpair	 tag;
 
-	if (NULL == n->prev || SEC_SYNOPSIS != n->sec)
+	if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
 		return;
 
 	SCALE_VS_INIT(&su, 1);
@@ -436,7 +437,7 @@ print_mdoc_node(MDOC_ARGS)
 		print_text(h, n->string);
 		return;
 	default:
-		if (mdocs[n->tok].pre)
+		if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
 			child = (*mdocs[n->tok].pre)(m, n, h);
 		break;
 	}
@@ -452,7 +453,7 @@ print_mdoc_node(MDOC_ARGS)
 		mdoc_root_post(m, n, h);
 		break;
 	default:
-		if (mdocs[n->tok].post)
+		if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
 			(*mdocs[n->tok].post)(m, n, h);
 		break;
 	}
@@ -735,17 +736,70 @@ mdoc_op_post(MDOC_ARGS)
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
-	struct htmlpair	tag;
+	struct htmlpair	 tag;
+	struct roffsu	 su;
+	const char	*cp;
 
-	if (NULL == n->child && NULL == m->name)
-		return(1);
+	/*
+	 * Accomodate for `Nm' being both an element (which may have
+	 * NULL children AND no m->name) and a block.
+	 */
 
-	synopsis_pre(h, n);
+	cp = NULL;
 
-	PAIR_CLASS_INIT(&tag, "name");
-	print_otag(h, TAG_SPAN, 1, &tag);
-	if (NULL == n->child)
-		print_text(h, m->name);
+	if (MDOC_ELEM == n->type) {
+		if (NULL == n->child && NULL == m->name)
+			return(1);
+		synopsis_pre(h, n);
+		PAIR_CLASS_INIT(&tag, "name");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		if (NULL == n->child)
+			print_text(h, m->name);
+	} else if (MDOC_BLOCK == n->type) {
+		synopsis_pre(h, n);
+
+		bufcat_style(h, "clear", "both");
+		if (n->head->child || m->name) {
+			if (n->head->child && MDOC_TEXT == 
+					n->head->child->type)
+				cp = n->head->child->string;
+			if (NULL == cp || '\0' == *cp)
+				cp = m->name;
+
+			SCALE_HS_INIT(&su, (double)strlen(cp));
+			bufcat_su(h, "padding-left", &su);
+		}
+
+		PAIR_STYLE_INIT(&tag, h);
+		print_otag(h, TAG_DIV, 1, &tag);
+	} else if (MDOC_HEAD == n->type) { 
+		if (NULL == n->child && NULL == m->name)
+			return(1);
+
+		if (n->child && MDOC_TEXT == n->child->type)
+			cp = n->child->string;
+		if (NULL == cp || '\0' == *cp)
+			cp = m->name;
+
+		SCALE_HS_INIT(&su, (double)strlen(cp));
+
+		bufcat_style(h, "float", "left");
+		bufcat_su(h, "min-width", &su);
+		SCALE_INVERT(&su);
+		bufcat_su(h, "margin-left", &su);
+
+		PAIR_STYLE_INIT(&tag, h);
+		print_otag(h, TAG_DIV, 1, &tag);
+
+		if (NULL == n->child)
+			print_text(h, m->name);
+	} else if (MDOC_BODY == n->type) {
+		SCALE_HS_INIT(&su, 2);
+		bufcat_su(h, "margin-left", &su);
+		PAIR_STYLE_INIT(&tag, h);
+		print_otag(h, TAG_DIV, 1, &tag);
+	}
+
 	return(1);
 }
 
@@ -1037,11 +1091,12 @@ mdoc_it_pre(MDOC_ARGS)
 
 	SCALE_HS_INIT(&offs, 0);
 
-	type = bl->data.Bl.type;
-	comp = bl->data.Bl.comp;
+	assert(bl->data.Bl);
+	type = bl->data.Bl->type;
+	comp = bl->data.Bl->comp;
 
-	if (bl->data.Bl.offs)
-		a2offs(bl->data.Bl.offs, &offs);
+	if (bl->data.Bl->offs)
+		a2offs(bl->data.Bl->offs, &offs);
 
 	switch (type) {
 	case (LIST_enum):
@@ -1058,15 +1113,15 @@ mdoc_it_pre(MDOC_ARGS)
 		break;
 	}
 
+	if (bl->data.Bl->width)
+		a2width(bl->data.Bl->width, &width);
+
 	wp = -1;
 	for (i = 0; bl->args && i < (int)bl->args->argc; i++) 
 		switch (bl->args->argv[i].arg) {
 		case (MDOC_Column):
 			wp = i; /* Save for later. */
 			break;
-		case (MDOC_Width):
-			a2width(bl->args->argv[i].value[0], &width);
-			break;
 		default:
 			break;
 		}
@@ -1117,7 +1172,8 @@ mdoc_bl_pre(MDOC_ARGS)
 		return(0);
 	if (MDOC_BLOCK != n->type)
 		return(1);
-	if (LIST_enum != n->data.Bl.type)
+	assert(n->data.Bl);
+	if (LIST_enum != n->data.Bl->type)
 		return(1);
 
 	ord = malloc(sizeof(struct ord));
@@ -1141,7 +1197,7 @@ mdoc_bl_post(MDOC_ARGS)
 
 	if (MDOC_BLOCK != n->type)
 		return;
-	if (LIST_enum != n->data.Bl.type)
+	if (LIST_enum != n->data.Bl->type)
 		return;
 
 	ord = h->ords.head;
@@ -1356,10 +1412,11 @@ mdoc_bd_pre(MDOC_ARGS)
 
 	SCALE_VS_INIT(&su, 0);
 
-	if (n->data.Bd.offs)
-		a2offs(n->data.Bd.offs, &su);
+	assert(n->data.Bd);
+	if (n->data.Bd->offs)
+		a2offs(n->data.Bd->offs, &su);
 
-	comp = n->data.Bd.comp;
+	comp = n->data.Bd->comp;
 
 	/* FIXME: -centered, etc. formatting. */
 	/* FIXME: does not respect -offset ??? */
@@ -1386,8 +1443,8 @@ mdoc_bd_pre(MDOC_ARGS)
 		return(1);
 	}
 
-	if (DISP_unfilled != n->data.Bd.type && 
-			DISP_literal != n->data.Bd.type)
+	if (DISP_unfilled != n->data.Bd->type && 
+			DISP_literal != n->data.Bd->type)
 		return(1);
 
 	PAIR_CLASS_INIT(&tag[0], "lit");
@@ -1613,7 +1670,7 @@ mdoc_fn_pre(MDOC_ARGS)
 	 */
 
 #if 0
-	if (SEC_SYNOPSIS == n->sec) {
+	if (MDOC_SYNPRETTY & n->flags) {
 		nbuf[0] = '\0';
 		html_idcat(nbuf, sp, BUFSIZ);
 		PAIR_ID_INIT(&tag[1], nbuf);
@@ -1643,7 +1700,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
 	for (nn = n->child->next; nn; nn = nn->next) {
 		i = 1;
-		if (SEC_SYNOPSIS == n->sec)
+		if (MDOC_SYNPRETTY & n->flags)
 			i = 2;
 		t = print_otag(h, TAG_SPAN, i, tag);
 		print_text(h, nn->string);
@@ -1653,7 +1710,7 @@ mdoc_fn_pre(MDOC_ARGS)
 	}
 
 	print_text(h, ")");
-	if (SEC_SYNOPSIS == n->sec)
+	if (MDOC_SYNPRETTY & n->flags)
 		print_text(h, ";");
 
 	return(0);
@@ -1823,7 +1880,7 @@ mdoc_in_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "includes");
 	print_otag(h, TAG_SPAN, 1, tag);
 
-	if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
+	if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
 		print_text(h, "#include");
 
 	print_text(h, "<");
@@ -1958,46 +2015,33 @@ mdoc_ap_pre(MDOC_ARGS)
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
-	int		 i;
 	struct htmlpair	 tag[2];
 	struct roffsu	 su;
 
 	if (MDOC_HEAD == n->type)
 		return(0);
-	else if (MDOC_BLOCK != n->type)
+	else if (MDOC_BODY != n->type)
 		return(1);
 
-	PAIR_CLASS_INIT(&tag[0], "lit");
+	assert(n->data.Bf);
 
-	if (n->head->child) {
-		if ( ! strcmp("Em", n->head->child->string))
-			PAIR_CLASS_INIT(&tag[0], "emph");
-		else if ( ! strcmp("Sy", n->head->child->string))
-			PAIR_CLASS_INIT(&tag[0], "symb");
-		else if ( ! strcmp("Li", n->head->child->string))
-			PAIR_CLASS_INIT(&tag[0], "lit");
-	} else {
-		for (i = 0; n->args && i < (int)n->args->argc; i++) 
-			switch (n->args->argv[i].arg) {
-			case (MDOC_Symbolic):
-				PAIR_CLASS_INIT(&tag[0], "symb");
-				break;
-			case (MDOC_Literal):
-				PAIR_CLASS_INIT(&tag[0], "lit");
-				break;
-			case (MDOC_Emphasis):
-				PAIR_CLASS_INIT(&tag[0], "emph");
-				break;
-			default:
-				break;
-			}
-	}
+	if (FONT_Em == n->data.Bf->font) 
+		PAIR_CLASS_INIT(&tag[0], "emph");
+	else if (FONT_Sy == n->data.Bf->font) 
+		PAIR_CLASS_INIT(&tag[0], "symb");
+	else if (FONT_Li == n->data.Bf->font) 
+		PAIR_CLASS_INIT(&tag[0], "lit");
+	else
+		PAIR_CLASS_INIT(&tag[0], "none");
 
-	/* FIXME: div's have spaces stripped--we want them. */
-
+	/* 
+	 * We want this to be inline-formatted, but needs to be div to
+	 * accept block children. 
+	 */
 	bufcat_style(h, "display", "inline");
 	SCALE_HS_INIT(&su, 1);
-	bufcat_su(h, "margin-right", &su);
+	/* Needs a left-margin for spacing. */
+	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag[1], h);
 	print_otag(h, TAG_DIV, 2, tag);
 	return(1);