===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.93
retrieving revision 1.97
diff -u -p -r1.93 -r1.97
--- mandoc/mdoc_validate.c	2010/06/12 10:09:19	1.93
+++ mandoc/mdoc_validate.c	2010/06/12 12:10:55	1.97
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.93 2010/06/12 10:09:19 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.97 2010/06/12 12:10:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -532,15 +532,16 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 i, width, offs, cmpt, dupl;
+	int		 i, width, offs, comp, dup;
 	enum mdoc_list	 lt;
 
 	if (MDOC_BLOCK != n->type) {
 		assert(n->parent);
 		assert(MDOC_BLOCK == n->parent->type);
 		assert(MDOC_Bl == n->parent->tok);
-		assert(LIST__NONE != n->parent->data.list);
-		n->data.list = n->parent->data.list;
+		assert(LIST__NONE != n->parent->data.Bl.type);
+		memcpy(&n->data.Bl, &n->parent->data.Bl,
+				sizeof(struct mdoc_bl));
 		return(1);
 	}
 
@@ -550,13 +551,13 @@ pre_bl(PRE_ARGS)
 	 * ones.  If we find no list type, we default to LIST_item.
 	 */
 
-	assert(LIST__NONE == n->data.list);
-	offs = width = cmpt = -1;
+	assert(LIST__NONE == n->data.Bl.type);
+	offs = width = -1;
 
 	/* LINTED */
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
 		lt = LIST__NONE;
-		dupl = 0;
+		dup = comp = 0;
 		switch (n->args->argv[i].arg) {
 		/* Set list types. */
 		case (MDOC_Bullet):
@@ -594,43 +595,44 @@ pre_bl(PRE_ARGS)
 			break;
 		/* Set list arguments. */
 		case (MDOC_Compact):
-			if (cmpt >= 0) 
-				dupl++;
-			cmpt = i;
+			dup = n->data.Bl.comp;
+			comp = 1;
 			break;
 		case (MDOC_Width):
 			if (width >= 0)
-				dupl++;
+				dup++;
 			width = i;
 			break;
 		case (MDOC_Offset):
 			if (offs >= 0)
-				dupl++;
+				dup++;
 			offs = i;
 			break;
 		}
 
 		/* Check: duplicate auxiliary arguments. */
 
-		if (dupl)
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
-				return(0);
+		if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
+			return(0);
 
+		if (comp && ! dup)
+			n->data.Bl.comp = comp;
+
 		/* Check: multiple list types. */
 
-		if (LIST__NONE != lt && n->data.list != LIST__NONE)
+		if (LIST__NONE != lt && n->data.Bl.type != LIST__NONE)
 			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))
 				return(0);
 
 		/* Assign list type. */
 
-		if (LIST__NONE != lt && n->data.list == LIST__NONE)
-			n->data.list = lt;
+		if (LIST__NONE != lt && n->data.Bl.type == LIST__NONE)
+			n->data.Bl.type = lt;
 
 		/* The list type should come first. */
 
-		if (n->data.list == LIST__NONE)
-			if (width >= 0 || offs >= 0 || cmpt >= 0)
+		if (n->data.Bl.type == LIST__NONE)
+			if (width >= 0 || offs >= 0 || n->data.Bl.comp)
 				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
 					return(0);
 
@@ -639,10 +641,10 @@ pre_bl(PRE_ARGS)
 
 	/* Allow lists to default to LIST_item. */
 
-	if (LIST__NONE == n->data.list) {
+	if (LIST__NONE == n->data.Bl.type) {
 		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE))
 			return(0);
-		n->data.list = LIST_item;
+		n->data.Bl.type = LIST_item;
 	}
 
 	/* 
@@ -651,7 +653,7 @@ pre_bl(PRE_ARGS)
 	 * and must also be warned.
 	 */
 
-	switch (n->data.list) {
+	switch (n->data.Bl.type) {
 	case (LIST_tag):
 		if (width >= 0)
 			break;
@@ -683,23 +685,28 @@ pre_bl(PRE_ARGS)
 static int
 pre_bd(PRE_ARGS)
 {
-	int		 i;
+	int		 i, dup, comp;
 	enum mdoc_disp 	 dt;
+	const char	*offs;
 
 	if (MDOC_BLOCK != n->type) {
 		assert(n->parent);
 		assert(MDOC_BLOCK == n->parent->type);
 		assert(MDOC_Bd == n->parent->tok);
-		assert(DISP__NONE != n->parent->data.disp);
-		n->data.disp = n->parent->data.disp;
+		assert(DISP__NONE != n->parent->data.Bd.type);
+		memcpy(&n->data.Bd, &n->parent->data.Bd, 
+				sizeof(struct mdoc_bd));
 		return(1);
 	}
 
-	assert(DISP__NONE == n->data.disp);
+	assert(DISP__NONE == n->data.Bd.type);
 
 	/* LINTED */
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
 		dt = DISP__NONE;
+		dup = comp = 0;
+		offs = NULL;
+
 		switch (n->args->argv[i].arg) {
 		case (MDOC_Centred):
 			dt = DISP_centred;
@@ -720,25 +727,52 @@ pre_bd(PRE_ARGS)
 			mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
 			return(0);
 		case (MDOC_Offset):
-			/* FALLTHROUGH */
+			/* NB: this can be empty! */
+			if (n->args->argv[i].sz) {
+				offs = n->args->argv[i].value[0];
+				dup = (NULL != n->data.Bd.offs);
+				break;
+			}
+			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
+				return(0);
+			break;
 		case (MDOC_Compact):
-			/* FALLTHROUGH */
-		default:
+			comp = 1;
+			dup = n->data.Bd.comp;
 			break;
+		default:
+			abort();
+			/* NOTREACHED */
 		}
 
-		if (DISP__NONE != dt && n->data.disp != DISP__NONE)
+		/* Check whether we have duplicates. */
+
+		if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
+			return(0);
+
+		/* Make our auxiliary assignments. */
+
+		if (offs && ! dup)
+			n->data.Bd.offs = offs;
+		if (comp && ! dup)
+			n->data.Bd.comp = comp;
+
+		/* Check whether a type has already been assigned. */
+
+		if (DISP__NONE != dt && n->data.Bd.type != DISP__NONE)
 			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP))
 				return(0);
 
-		if (DISP__NONE != dt && n->data.disp == DISP__NONE)
-			n->data.disp = dt;
+		/* Make our type assignment. */
+
+		if (DISP__NONE != dt && n->data.Bd.type == DISP__NONE)
+			n->data.Bd.type = dt;
 	}
 
-	if (DISP__NONE == n->data.disp) {
+	if (DISP__NONE == n->data.Bd.type) {
 		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE))
 			return(0);
-		n->data.disp = DISP_ragged;
+		n->data.Bd.type = DISP_ragged;
 	}
 
 	return(1);
@@ -999,7 +1033,7 @@ post_it(POST_ARGS)
 		return(1);
 
 	n = mdoc->last->parent->parent;
-	lt = n->data.list;
+	lt = n->data.Bl.type;
 
 	if (LIST__NONE == lt) {
 		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
@@ -1091,7 +1125,7 @@ post_bl_head(POST_ARGS) 
 	assert(mdoc->last->parent);
 	n = mdoc->last->parent;
 
-	if (LIST_column == n->data.list) {
+	if (LIST_column == n->data.Bl.type) {
 		for (i = 0; i < (int)n->args->argc; i++)
 			if (MDOC_Column == n->args->argv[i].arg)
 				break;