===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.97
retrieving revision 1.100
diff -u -p -r1.97 -r1.100
--- mandoc/mdoc_validate.c	2010/06/12 12:10:55	1.97
+++ mandoc/mdoc_validate.c	2010/06/27 16:36:22	1.100
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.97 2010/06/12 12:10:55 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.100 2010/06/27 16:36:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -532,7 +532,8 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 i, width, offs, comp, dup;
+	int		 i, comp, dup;
+	const char	*offs, *width;
 	enum mdoc_list	 lt;
 
 	if (MDOC_BLOCK != n->type) {
@@ -552,12 +553,12 @@ pre_bl(PRE_ARGS)
 	 */
 
 	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;
 		dup = comp = 0;
+		width = offs = NULL;
 		switch (n->args->argv[i].arg) {
 		/* Set list types. */
 		case (MDOC_Bullet):
@@ -599,14 +600,18 @@ pre_bl(PRE_ARGS)
 			comp = 1;
 			break;
 		case (MDOC_Width):
-			if (width >= 0)
-				dup++;
-			width = i;
+			dup = (NULL != n->data.Bl.width);
+			width = n->args->argv[i].value[0];
 			break;
 		case (MDOC_Offset):
-			if (offs >= 0)
-				dup++;
-			offs = i;
+			/* NB: this can be empty! */
+			if (n->args->argv[i].sz) {
+				offs = n->args->argv[i].value[0];
+				dup = (NULL != n->data.Bl.offs);
+				break;
+			}
+			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
+				return(0);
 			break;
 		}
 
@@ -617,6 +622,10 @@ pre_bl(PRE_ARGS)
 
 		if (comp && ! dup)
 			n->data.Bl.comp = comp;
+		if (offs && ! dup)
+			n->data.Bl.offs = offs;
+		if (width && ! dup)
+			n->data.Bl.width = width;
 
 		/* Check: multiple list types. */
 
@@ -632,7 +641,9 @@ pre_bl(PRE_ARGS)
 		/* The list type should come first. */
 
 		if (n->data.Bl.type == LIST__NONE)
-			if (width >= 0 || offs >= 0 || n->data.Bl.comp)
+			if (n->data.Bl.width || 
+					n->data.Bl.offs || 
+					n->data.Bl.comp)
 				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
 					return(0);
 
@@ -655,7 +666,7 @@ pre_bl(PRE_ARGS)
 
 	switch (n->data.Bl.type) {
 	case (LIST_tag):
-		if (width >= 0)
+		if (n->data.Bl.width)
 			break;
 		if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))
 			break;
@@ -669,7 +680,7 @@ pre_bl(PRE_ARGS)
 	case (LIST_inset):
 		/* FALLTHROUGH */
 	case (LIST_item):
-		if (width < 0)
+		if (NULL == n->data.Bl.width)
 			break;
 		if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))
 			break;
@@ -795,6 +806,8 @@ pre_sh(PRE_ARGS)
 
 	if (MDOC_BLOCK != n->type)
 		return(1);
+
+	mdoc->regs->regs[(int)REG_nS].set = 0;
 	return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }