===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.150
retrieving revision 1.153
diff -u -p -r1.150 -r1.153
--- mandoc/mdoc_term.c	2010/06/12 12:10:55	1.150
+++ mandoc/mdoc_term.c	2010/06/13 21:02:49	1.153
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.150 2010/06/12 12:10:55 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.153 2010/06/13 21:02:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -61,6 +61,7 @@ static	int	  arg_getattrs(const int *, int *, size_t,
 			const struct mdoc_node *);
 static	int	  arg_getattr(int, const struct mdoc_node *);
 static	void	  print_bvspace(struct termp *,
+			const struct mdoc_node *,
 			const struct mdoc_node *);
 static	void  	  print_mdoc_node(DECL_ARGS);
 static	void	  print_mdoc_nodelist(DECL_ARGS);
@@ -563,15 +564,17 @@ arg_getattrs(const int *keys, int *vals, 
  * too.
  */
 static void
-print_bvspace(struct termp *p, const struct mdoc_node *n)
+print_bvspace(struct termp *p, 
+		const struct mdoc_node *bl, 
+		const struct mdoc_node *n)
 {
 	const struct mdoc_node	*nn;
 
 	term_newln(p);
 
-	if (MDOC_Bl == n->tok && n->data.Bl.comp)
+	if (MDOC_Bd == bl->tok && bl->data.Bd.comp)
 		return;
-	if (MDOC_Bd == n->tok && n->data.Bd.comp)
+	if (MDOC_Bl == bl->tok && bl->data.Bl.comp)
 		return;
 
 	/* Do not vspace directly after Ss/Sh. */
@@ -590,13 +593,13 @@ print_bvspace(struct termp *p, const struct mdoc_node 
 
 	/* A `-column' does not assert vspace within the list. */
 
-	if (MDOC_Bl == n->tok && LIST_column == n->data.Bl.type)
+	if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)
 		if (n->prev && MDOC_It == n->prev->tok)
 			return;
 
 	/* A `-diag' without body does not vspace. */
 
-	if (MDOC_Bl == n->tok && LIST_diag == n->data.Bl.type)
+	if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)
 		if (n->prev && MDOC_It == n->prev->tok) {
 			assert(n->prev->body);
 			if (NULL == n->prev->body->child)
@@ -640,12 +643,12 @@ termp_it_pre(DECL_ARGS)
 {
 	const struct mdoc_node *bl, *nn;
 	char		        buf[7];
-	int		        i, keys[3], vals[3];
+	int		        i, keys[2], vals[2];
 	size_t		        width, offset, ncols, dcol;
 	enum mdoc_list		type;
 
 	if (MDOC_BLOCK == n->type) {
-		print_bvspace(p, n);
+		print_bvspace(p, n->parent->parent, n);
 		return(1);
 	}
 
@@ -654,12 +657,11 @@ termp_it_pre(DECL_ARGS)
 	/* Get list width, offset, and list type from argument list. */
 
 	keys[0] = MDOC_Width;
-	keys[1] = MDOC_Offset;
-	keys[2] = MDOC_Column;
+	keys[1] = MDOC_Column;
 
-	vals[0] = vals[1] = vals[2] = -1;
+	vals[0] = vals[1] = -1;
 
-	arg_getattrs(keys, vals, 3, bl);
+	arg_getattrs(keys, vals, 2, bl);
 
 	type = bl->data.Bl.type;
 
@@ -671,9 +673,10 @@ termp_it_pre(DECL_ARGS)
 
 	width = offset = 0;
 
-	if (vals[1] >= 0) 
-		offset = a2offs(bl->args->argv[vals[1]].value[0]);
+	if (bl->data.Bl.offs)
+		offset = a2offs(bl->data.Bl.offs);
 
+
 	switch (type) {
 	case (LIST_column):
 		if (MDOC_HEAD == n->type)
@@ -687,7 +690,7 @@ termp_it_pre(DECL_ARGS)
 		 *   column.
 		 * - For more than 5 columns, add only one column.
 		 */
-		ncols = bl->args->argv[vals[2]].sz;
+		ncols = bl->args->argv[vals[1]].sz;
 		/* LINTED */
 		dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
 
@@ -700,7 +703,7 @@ termp_it_pre(DECL_ARGS)
 				nn->prev && i < (int)ncols; 
 				nn = nn->prev, i++)
 			offset += dcol + a2width
-				(&bl->args->argv[vals[2]], i);
+				(&bl->args->argv[vals[1]], i);
 
 
 		/*
@@ -716,7 +719,7 @@ termp_it_pre(DECL_ARGS)
 		 * Use the declared column widths, extended as explained
 		 * in the preceding paragraph.
 		 */
-		width = a2width(&bl->args->argv[vals[2]], i) + dcol;
+		width = a2width(&bl->args->argv[vals[1]], i) + dcol;
 		break;
 	default:
 		if (vals[0] < 0) 
@@ -728,6 +731,7 @@ termp_it_pre(DECL_ARGS)
 		 * handling for column for how this changes.
 		 */
 		width = a2width(&bl->args->argv[vals[0]], 0) + 2;
+		assert(bl->data.Bl.width);
 		break;
 	}
 
@@ -1606,7 +1610,7 @@ termp_bd_pre(DECL_ARGS)
 	const struct mdoc_node	*nn;
 
 	if (MDOC_BLOCK == n->type) {
-		print_bvspace(p, n);
+		print_bvspace(p, n, n);
 		return(1);
 	} else if (MDOC_HEAD == n->type)
 		return(0);