===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.149
retrieving revision 1.154
diff -u -p -r1.149 -r1.154
--- mandoc/mdoc_term.c	2010/06/12 11:58:22	1.149
+++ mandoc/mdoc_term.c	2010/06/13 21:41:58	1.154
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.149 2010/06/12 11:58:22 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.154 2010/06/13 21:41:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -52,7 +52,7 @@ struct	termact {
 	void	(*post)(DECL_ARGS);
 };
 
-static	size_t	  a2width(const struct mdoc_argv *, int);
+static	size_t	  a2width(const char *);
 static	size_t	  a2height(const struct mdoc_node *);
 static	size_t	  a2offs(const char *);
 
@@ -476,13 +476,13 @@ a2height(const struct mdoc_node *n)
 
 
 static size_t
-a2width(const struct mdoc_argv *arg, int pos)
+a2width(const char *v)
 {
 	struct roffsu	 su;
 
-	assert(arg->value[pos]);
-	if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
-		SCALE_HS_INIT(&su, strlen(arg->value[pos]));
+	assert(v);
+	if ( ! a2roffsu(v, &su, SCALE_MAX))
+		SCALE_HS_INIT(&su, strlen(v));
 
 	return(term_hspan(&su));
 }
@@ -570,10 +570,12 @@ print_bvspace(struct termp *p, 
 {
 	const struct mdoc_node	*nn;
 
-	/* FIXME: MDOC_Bd == bl->tok && bl->data.Bd.comp */
 	term_newln(p);
-	if (arg_hasattr(MDOC_Compact, bl))
+
+	if (MDOC_Bd == bl->tok && bl->data.Bd.comp)
 		return;
+	if (MDOC_Bl == bl->tok && bl->data.Bl.comp)
+		return;
 
 	/* Do not vspace directly after Ss/Sh. */
 
@@ -641,7 +643,7 @@ 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;
 
@@ -655,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;
 
@@ -672,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)
@@ -688,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;
 
@@ -701,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]].value[i]);
 
 
 		/*
@@ -717,10 +719,11 @@ 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]].value[i]) + dcol;
 		break;
 	default:
-		if (vals[0] < 0) 
+		if (NULL == bl->data.Bl.width)
 			break;
 
 		/* 
@@ -728,7 +731,8 @@ termp_it_pre(DECL_ARGS)
 		 * number for buffering single arguments.  See the above
 		 * handling for column for how this changes.
 		 */
-		width = a2width(&bl->args->argv[vals[0]], 0) + 2;
+		assert(bl->data.Bl.width);
+		width = a2width(bl->data.Bl.width) + 2;
 		break;
 	}