===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.95
retrieving revision 1.102
diff -u -p -r1.95 -r1.102
--- mandoc/mdoc_validate.c	2010/06/12 11:41:50	1.95
+++ mandoc/mdoc_validate.c	2010/06/28 14:39:17	1.102
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.95 2010/06/12 11:41:50 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.102 2010/06/28 14:39:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -107,7 +107,7 @@ static	int	 pre_ss(PRE_ARGS);
 
 static	v_post	 posts_an[] = { post_an, NULL };
 static	v_post	 posts_at[] = { post_at, NULL };
-static	v_post	 posts_bd[] = { hwarn_eq0, bwarn_ge1, NULL };
+static	v_post	 posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL };
 static	v_post	 posts_bf[] = { hwarn_le1, post_bf, NULL };
 static	v_post	 posts_bl[] = { bwarn_ge1, post_bl, NULL };
 static	v_post	 posts_bool[] = { eerr_eq1, ebool, NULL };
@@ -154,7 +154,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_notext },			/* Pp */ 
 	{ pres_d1, posts_wline },		/* D1 */
 	{ pres_d1, posts_wline },		/* Dl */
-	{ pres_bd, posts_bd },			/* Bd */
+	{ pres_bd, posts_bd_bk },			/* Bd */
 	{ NULL, NULL },				/* Ed */
 	{ pres_bl, posts_bl },			/* Bl */ 
 	{ NULL, NULL },				/* El */
@@ -245,7 +245,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Fc */ 
 	{ NULL, NULL },				/* Oo */
 	{ NULL, NULL },				/* Oc */
-	{ NULL, posts_wline },			/* Bk */
+	{ NULL, posts_bd_bk },			/* Bk */
 	{ NULL, NULL },				/* Ek */
 	{ NULL, posts_eoln },			/* Bt */
 	{ NULL, NULL },				/* Hf */
@@ -458,6 +458,11 @@ check_text(struct mdoc *mdoc, int line, int pos, char 
 {
 	int		 c;
 
+	/* 
+	 * FIXME: we absolutely cannot let \b get through or it will
+	 * destroy some assumptions in terms of format.
+	 */
+
 	for ( ; *p; p++, pos++) {
 		if ('\t' == *p) {
 			if ( ! (MDOC_LITERAL & mdoc->flags))
@@ -532,15 +537,17 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 i, width, offs, cmpt, dupl;
+	int		 i, comp, dup;
+	const char	*offs, *width;
 	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 +557,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);
 
 	/* LINTED */
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
 		lt = LIST__NONE;
-		dupl = 0;
+		dup = comp = 0;
+		width = offs = NULL;
 		switch (n->args->argv[i].arg) {
 		/* Set list types. */
 		case (MDOC_Bullet):
@@ -594,43 +601,54 @@ 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++;
-			width = i;
+			dup = (NULL != n->data.Bl.width);
+			width = n->args->argv[i].value[0];
 			break;
 		case (MDOC_Offset):
-			if (offs >= 0)
-				dupl++;
-			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;
 		}
 
 		/* 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;
+		if (offs && ! dup)
+			n->data.Bl.offs = offs;
+		if (width && ! dup)
+			n->data.Bl.width = width;
+
 		/* 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 (n->data.Bl.width || 
+					n->data.Bl.offs || 
+					n->data.Bl.comp)
 				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
 					return(0);
 
@@ -639,10 +657,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,9 +669,9 @@ pre_bl(PRE_ARGS)
 	 * and must also be warned.
 	 */
 
-	switch (n->data.list) {
+	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;
@@ -667,7 +685,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;
@@ -793,6 +811,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));
 }
 
@@ -1031,7 +1051,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);
@@ -1123,7 +1143,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;