===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.91
retrieving revision 1.95
diff -u -p -r1.91 -r1.95
--- mandoc/mdoc_html.c	2010/07/02 10:42:46	1.91
+++ mandoc/mdoc_html.c	2010/07/07 15:04:54	1.95
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.91 2010/07/02 10:42:46 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.95 2010/07/07 15:04:54 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,7 +30,6 @@
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"
-#include "regs.h"
 #include "mdoc.h"
 #include "main.h"
 
@@ -73,6 +72,8 @@ static	int		  mdoc_aq_pre(MDOC_ARGS);
 static	int		  mdoc_ar_pre(MDOC_ARGS);
 static	int		  mdoc_bd_pre(MDOC_ARGS);
 static	int		  mdoc_bf_pre(MDOC_ARGS);
+static	void		  mdoc_bk_post(MDOC_ARGS);
+static	int		  mdoc_bk_pre(MDOC_ARGS);
 static	void		  mdoc_bl_post(MDOC_ARGS);
 static	int		  mdoc_bl_pre(MDOC_ARGS);
 static	void		  mdoc_bq_post(MDOC_ARGS);
@@ -237,7 +238,7 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{NULL, NULL}, /* Fc */ 
 	{mdoc_op_pre, mdoc_op_post}, /* Oo */
 	{NULL, NULL}, /* Oc */
-	{NULL, NULL}, /* Bk */
+	{mdoc_bk_pre, mdoc_bk_post}, /* Bk */
 	{NULL, NULL}, /* Ek */
 	{mdoc_bt_pre, NULL}, /* Bt */
 	{NULL, NULL}, /* Hf */
@@ -442,6 +443,18 @@ print_mdoc_node(MDOC_ARGS)
 		break;
 	}
 
+	if (HTML_KEEP & h->flags) {
+		if (n->prev && n->prev->line != n->line) {
+			h->flags &= ~HTML_KEEP;
+			h->flags |= HTML_PREKEEP;
+		} else if (NULL == n->prev) {
+			if (n->parent && n->parent->line != n->line) {
+				h->flags &= ~HTML_KEEP;
+				h->flags |= HTML_PREKEEP;
+			}
+		}
+	}
+
 	if (child && n->child)
 		print_mdoc_nodelist(m, n->child, h);
 
@@ -1074,7 +1087,7 @@ mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struc
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
-	int			 i, wp, comp;
+	int			 i, comp;
 	const struct mdoc_node	*bl, *nn;
 	struct roffsu		 width, offs;
 	enum mdoc_list		 type;
@@ -1116,16 +1129,6 @@ mdoc_it_pre(MDOC_ARGS)
 	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;
-		default:
-			break;
-		}
-
 	/* Override width in some cases. */
 
 	switch (type) {
@@ -1149,8 +1152,8 @@ mdoc_it_pre(MDOC_ARGS)
 		for (i = 0; nn && nn != n; nn = nn->next)
 			if (MDOC_BODY == nn->type)
 				i++;
-		if (i < (int)bl->args->argv[wp].sz)
-			a2width(bl->args->argv[wp].value[i], &width);
+		if (i < (int)bl->data.Bl->ncols)
+			a2width(bl->data.Bl->cols[i], &width);
 	}
 
 	if (MDOC_HEAD == n->type)
@@ -2015,46 +2018,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);
@@ -2249,4 +2239,36 @@ mdoc__x_post(MDOC_ARGS)
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, n->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+	switch (n->type) {
+	case (MDOC_BLOCK):
+		break;
+	case (MDOC_HEAD):
+		return(0);
+	case (MDOC_BODY):
+		h->flags |= HTML_PREKEEP;
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+	if (MDOC_BODY == n->type)
+		h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }