===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.91
retrieving revision 1.105
diff -u -p -r1.91 -r1.105
--- mandoc/mdoc_validate.c	2010/06/03 13:44:36	1.91
+++ mandoc/mdoc_validate.c	2010/07/02 12:54:33	1.105
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.91 2010/06/03 13:44:36 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.105 2010/07/02 12:54:33 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -47,12 +47,10 @@ struct	valids {
 
 static	int	 check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
 static	int	 check_stdarg(PRE_ARGS);
-static	int	 check_text(struct mdoc *, int, int, const char *);
+static	int	 check_text(struct mdoc *, int, int, char *);
 static	int	 check_argv(struct mdoc *, 
-			const struct mdoc_node *,
-			const struct mdoc_argv *);
-static	int	 check_args(struct mdoc *, 
-			const struct mdoc_node *);
+			struct mdoc_node *, struct mdoc_argv *);
+static	int	 check_args(struct mdoc *, struct mdoc_node *);
 static	int	 err_child_lt(struct mdoc *, const char *, int);
 static	int	 warn_child_lt(struct mdoc *, const char *, int);
 static	int	 err_child_gt(struct mdoc *, const char *, int);
@@ -109,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 };
@@ -156,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 */
@@ -247,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 */
@@ -277,7 +275,7 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 {
 	v_pre		*p;
 	int		 line, pos;
-	const char	*tp;
+	char		*tp;
 
 	if (MDOC_TEXT == n->type) {
 		tp = n->string;
@@ -419,7 +417,7 @@ check_stdarg(PRE_ARGS)
 
 
 static int
-check_args(struct mdoc *m, const struct mdoc_node *n)
+check_args(struct mdoc *m, struct mdoc_node *n)
 {
 	int		 i;
 
@@ -436,8 +434,7 @@ check_args(struct mdoc *m, const struct mdoc_node *n)
 
 
 static int
-check_argv(struct mdoc *m, const struct mdoc_node *n, 
-		const struct mdoc_argv *v)
+check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
 {
 	int		 i;
 
@@ -457,10 +454,15 @@ check_argv(struct mdoc *m, const struct mdoc_node *n, 
 
 
 static int
-check_text(struct mdoc *mdoc, int line, int pos, const char *p)
+check_text(struct mdoc *mdoc, int line, int pos, char *p)
 {
 	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))
@@ -535,15 +537,23 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 i, width, offs, cmpt, dupl;
-	enum mdoc_list	 lt;
+	int		  i, comp, dup;
+	const char	 *offs, *width;
+	enum mdoc_list	  lt;
+	struct mdoc_node *np;
 
 	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;
+		if (ENDBODY_NOT != n->end) {
+			assert(n->pending);
+			np = n->pending->parent;
+		} else
+			np = n->parent;
+
+		assert(np);
+		assert(MDOC_BLOCK == np->type);
+		assert(MDOC_Bl == np->tok);
+		assert(np->data.Bl);
+		n->data.Bl = np->data.Bl;
 		return(1);
 	}
 
@@ -553,13 +563,14 @@ 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(NULL == n->data.Bl);
+	n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));
 
 	/* 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):
@@ -597,43 +608,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);
 
@@ -642,10 +664,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;
 	}
 
 	/* 
@@ -654,9 +676,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;
@@ -670,7 +692,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;
@@ -686,43 +708,104 @@ pre_bl(PRE_ARGS)
 static int
 pre_bd(PRE_ARGS)
 {
-	int		 i, type, err;
+	int		  i, dup, comp;
+	enum mdoc_disp 	  dt;
+	const char	 *offs;
+	struct mdoc_node *np;
 
-	if (MDOC_BLOCK != n->type)
+	if (MDOC_BLOCK != n->type) {
+		if (ENDBODY_NOT != n->end) {
+			assert(n->pending);
+			np = n->pending->parent;
+		} else
+			np = n->parent;
+
+		assert(np);
+		assert(MDOC_BLOCK == np->type);
+		assert(MDOC_Bd == np->tok);
+		assert(np->data.Bd);
+		n->data.Bd = np->data.Bd;
 		return(1);
-	if (NULL == n->args) {
-		mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
-		return(0);
 	}
 
-	/* Make sure that only one type of display is specified.  */
+	assert(NULL == n->data.Bd);
+	n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
 
 	/* LINTED */
-	for (i = 0, err = type = 0; ! err && 
-			i < (int)n->args->argc; i++)
+	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):
-			/* FALLTHROUGH */
+			dt = DISP_centred;
+			break;
 		case (MDOC_Ragged):
-			/* FALLTHROUGH */
+			dt = DISP_ragged;
+			break;
 		case (MDOC_Unfilled):
-			/* FALLTHROUGH */
+			dt = DISP_unfilled;
+			break;
 		case (MDOC_Filled):
-			/* FALLTHROUGH */
+			dt = DISP_filled;
+			break;
 		case (MDOC_Literal):
-			if (0 == type++) 
+			dt = DISP_literal;
+			break;
+		case (MDOC_File):
+			mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
+			return(0);
+		case (MDOC_Offset):
+			/* 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_DISPREP))
+			}
+			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
 				return(0);
 			break;
-		default:
+		case (MDOC_Compact):
+			comp = 1;
+			dup = n->data.Bd->comp;
 			break;
+		default:
+			abort();
+			/* NOTREACHED */
 		}
 
-	if (type)
-		return(1);
-	mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
-	return(0);
+		/* 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);
+
+		/* Make our type assignment. */
+
+		if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)
+			n->data.Bd->type = dt;
+	}
+
+	if (DISP__NONE == n->data.Bd->type) {
+		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE))
+			return(0);
+		n->data.Bd->type = DISP_ragged;
+	}
+
+	return(1);
 }
 
 
@@ -742,6 +825,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));
 }
 
@@ -846,38 +931,72 @@ pre_dd(PRE_ARGS)
 static int
 post_bf(POST_ARGS)
 {
-	char		 *p;
-	struct mdoc_node *head;
+	struct mdoc_node *np;
+	int		  arg;
 
-	if (MDOC_BLOCK != mdoc->last->type)
-		return(1);
+	/*
+	 * Unlike other data pointers, these are "housed" by the HEAD
+	 * element, which contains the goods.
+	 */
 
-	head = mdoc->last->head;
+	if (MDOC_HEAD != mdoc->last->type) {
+		if (ENDBODY_NOT != mdoc->last->end) {
+			assert(mdoc->last->pending);
+			np = mdoc->last->pending->parent->head;
+		} else if (MDOC_BLOCK != mdoc->last->type) {
+			np = mdoc->last->parent->head;
+		} else 
+			np = mdoc->last->head;
 
-	if (mdoc->last->args && head->child) {
-		/* FIXME: this should provide a default. */
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT);
-		return(0);
-	} else if (mdoc->last->args)
+		assert(np);
+		assert(MDOC_HEAD == np->type);
+		assert(MDOC_Bf == np->tok);
+		assert(np->data.Bf);
+		mdoc->last->data.Bf = np->data.Bf;
 		return(1);
+	}
 
-	if (NULL == head->child || MDOC_TEXT != head->child->type) {
-		/* FIXME: this should provide a default. */
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT);
+	np = mdoc->last;
+	np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));
+
+	/* 
+	 * Cannot have both argument and parameter.
+	 * If neither is specified, let it through with a warning. 
+	 */
+
+	if (np->args && np->child) {
+		mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);
 		return(0);
+	} else if (NULL == np->args && NULL == np->child)
+		return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE));
+
+	/* Extract argument into data. */
+	
+	if (np->args) {
+		arg = np->args->argv[0].arg;
+		if (MDOC_Emphasis == arg)
+			np->data.Bf->font = FONT_Em;
+		else if (MDOC_Literal == arg)
+			np->data.Bf->font = FONT_Li;
+		else if (MDOC_Symbolic == arg)
+			np->data.Bf->font = FONT_Sy;
+		else
+			abort();
+		return(1);
 	}
 
-	p = head->child->string;
+	/* Extract parameter into data. */
 
-	if (0 == strcmp(p, "Em"))
-		return(1);
-	else if (0 == strcmp(p, "Li"))
-		return(1);
-	else if (0 == strcmp(p, "Sy"))
-		return(1);
+	if (0 == strcmp(np->child->string, "Em"))
+		np->data.Bf->font = FONT_Em;
+	else if (0 == strcmp(np->child->string, "Li"))
+		np->data.Bf->font = FONT_Li;
+	else if (0 == strcmp(np->child->string, "Sy"))
+		np->data.Bf->font = FONT_Sy;
+	else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE))
+		return(0);
 
-	mdoc_nmsg(mdoc, head, MANDOCERR_FONTTYPE);
-	return(0);
+	return(1);
 }
 
 
@@ -980,7 +1099,8 @@ post_it(POST_ARGS)
 		return(1);
 
 	n = mdoc->last->parent->parent;
-	lt = n->data.list;
+	assert(n->data.Bl);
+	lt = n->data.Bl->type;
 
 	if (LIST__NONE == lt) {
 		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
@@ -1072,7 +1192,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;