===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.147
retrieving revision 1.150
diff -u -p -r1.147 -r1.150
--- mandoc/mdoc_term.c	2010/06/12 10:09:19	1.147
+++ mandoc/mdoc_term.c	2010/06/12 12:10:55	1.150
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.147 2010/06/12 10:09:19 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.150 2010/06/12 12:10:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -54,14 +54,13 @@ struct	termact {
 
 static	size_t	  a2width(const struct mdoc_argv *, int);
 static	size_t	  a2height(const struct mdoc_node *);
-static	size_t	  a2offs(const struct mdoc_argv *);
+static	size_t	  a2offs(const char *);
 
 static	int	  arg_hasattr(int, const struct mdoc_node *);
 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);
@@ -489,20 +488,20 @@ a2width(const struct mdoc_argv *arg, int pos)
 
 
 static size_t
-a2offs(const struct mdoc_argv *arg)
+a2offs(const char *v)
 {
 	struct roffsu	 su;
 
-	if ('\0' == arg->value[0][0])
+	if ('\0' == *v)
 		return(0);
-	else if (0 == strcmp(arg->value[0], "left"))
+	else if (0 == strcmp(v, "left"))
 		return(0);
-	else if (0 == strcmp(arg->value[0], "indent"))
+	else if (0 == strcmp(v, "indent"))
 		return(INDENT + 1);
-	else if (0 == strcmp(arg->value[0], "indent-two"))
+	else if (0 == strcmp(v, "indent-two"))
 		return((INDENT + 1) * 2);
-	else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX))
-		SCALE_HS_INIT(&su, strlen(arg->value[0]));
+	else if ( ! a2roffsu(v, &su, SCALE_MAX))
+		SCALE_HS_INIT(&su, strlen(v));
 
 	return(term_hspan(&su));
 }
@@ -564,15 +563,16 @@ arg_getattrs(const int *keys, int *vals, 
  * too.
  */
 static void
-print_bvspace(struct termp *p, 
-		const struct mdoc_node *bl, 
-		const struct mdoc_node *n)
+print_bvspace(struct termp *p, const struct mdoc_node *n)
 {
 	const struct mdoc_node	*nn;
 
 	term_newln(p);
-	if (arg_hasattr(MDOC_Compact, bl))
+
+	if (MDOC_Bl == n->tok && n->data.Bl.comp)
 		return;
+	if (MDOC_Bd == n->tok && n->data.Bd.comp)
+		return;
 
 	/* Do not vspace directly after Ss/Sh. */
 
@@ -590,13 +590,13 @@ print_bvspace(struct termp *p, 
 
 	/* A `-column' does not assert vspace within the list. */
 
-	if (MDOC_Bl == bl->tok && LIST_column == bl->data.list)
+	if (MDOC_Bl == n->tok && LIST_column == n->data.Bl.type)
 		if (n->prev && MDOC_It == n->prev->tok)
 			return;
 
 	/* A `-diag' without body does not vspace. */
 
-	if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list)
+	if (MDOC_Bl == n->tok && LIST_diag == n->data.Bl.type)
 		if (n->prev && MDOC_It == n->prev->tok) {
 			assert(n->prev->body);
 			if (NULL == n->prev->body->child)
@@ -645,7 +645,7 @@ termp_it_pre(DECL_ARGS)
 	enum mdoc_list		type;
 
 	if (MDOC_BLOCK == n->type) {
-		print_bvspace(p, n->parent->parent, n);
+		print_bvspace(p, n);
 		return(1);
 	}
 
@@ -661,7 +661,7 @@ termp_it_pre(DECL_ARGS)
 
 	arg_getattrs(keys, vals, 3, bl);
 
-	type = bl->data.list;
+	type = bl->data.Bl.type;
 
 	/* 
 	 * First calculate width and offset.  This is pretty easy unless
@@ -672,7 +672,7 @@ termp_it_pre(DECL_ARGS)
 	width = offset = 0;
 
 	if (vals[1] >= 0) 
-		offset = a2offs(&bl->args->argv[vals[1]]);
+		offset = a2offs(bl->args->argv[vals[1]].value[0]);
 
 	switch (type) {
 	case (LIST_column):
@@ -989,7 +989,7 @@ termp_it_post(DECL_ARGS)
 	if (MDOC_BLOCK == n->type)
 		return;
 
-	type = n->parent->parent->parent->data.list;
+	type = n->parent->parent->parent->data.Bl.type;
 
 	switch (type) {
 	case (LIST_item):
@@ -1602,21 +1602,18 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
 	size_t			 tabwidth;
-	int	         	 i;
 	size_t			 rm, rmax;
 	const struct mdoc_node	*nn;
 
 	if (MDOC_BLOCK == n->type) {
-		print_bvspace(p, n, n);
+		print_bvspace(p, n);
 		return(1);
 	} else if (MDOC_HEAD == n->type)
 		return(0);
 
-	nn = n->parent;
+	if (n->data.Bd.offs)
+		p->offset += a2offs(n->data.Bd.offs);
 
-	if (-1 != (i = arg_getattr(MDOC_Offset, nn)))
-		p->offset += a2offs(&nn->args->argv[i]);
-
 	/*
 	 * If -ragged or -filled are specified, the block does nothing
 	 * but change the indentation.  If -unfilled or -literal are
@@ -1625,8 +1622,8 @@ termp_bd_pre(DECL_ARGS)
 	 * lines are allowed.
 	 */
 	
-	if (DISP_literal != n->data.disp && 
-			DISP_unfilled != n->data.disp)
+	if (DISP_literal != n->data.Bd.type && 
+			DISP_unfilled != n->data.Bd.type)
 		return(1);
 
 	tabwidth = p->tabwidth;
@@ -1663,8 +1660,8 @@ termp_bd_post(DECL_ARGS)
 	rm = p->rmargin;
 	rmax = p->maxrmargin;
 
-	if (DISP_literal == n->data.disp || 
-			DISP_unfilled == n->data.disp)
+	if (DISP_literal == n->data.Bd.type || 
+			DISP_unfilled == n->data.Bd.type)
 		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
 	p->flags |= TERMP_NOSPACE;