===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.58
retrieving revision 1.62
diff -u -p -r1.58 -r1.62
--- mandoc/Attic/validate.c	2009/02/24 16:16:45	1.58
+++ mandoc/Attic/validate.c	2009/02/27 09:14:02	1.62
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.58 2009/02/24 16:16:45 kristaps Exp $ */
+/* $Id: validate.c,v 1.62 2009/02/27 09:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -55,6 +55,7 @@ static	int	check_text(struct mdoc *, 
 			size_t, size_t, const char *);
 
 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);
 static	int	warn_child_gt(struct mdoc *, const char *, int);
 static	int	err_child_eq(struct mdoc *, const char *, int);
@@ -89,7 +90,7 @@ static	int	pre_prologue(PRE_ARGS);
 /* Specific post-child-parse routines. */
 
 static	int	herr_ge1(POST_ARGS);
-static	int	herr_le1(POST_ARGS);
+static	int	hwarn_le1(POST_ARGS);
 static	int	herr_eq0(POST_ARGS);
 static	int	eerr_eq0(POST_ARGS);
 static	int	eerr_le1(POST_ARGS);
@@ -153,7 +154,7 @@ static	v_post	posts_an[] = { post_an, NULL };
 static	v_post	posts_at[] = { post_at, NULL };
 static	v_post	posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL };
 static	v_post	posts_nm[] = { post_nm, NULL };
-static	v_post	posts_bf[] = { herr_le1, post_bf, NULL };
+static	v_post	posts_bf[] = { hwarn_le1, post_bf, NULL };
 static	v_post	posts_rs[] = { herr_eq0, bwarn_ge1, NULL };
 static	v_post	posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 static	v_post	posts_bk[] = { herr_eq0, bwarn_ge1, NULL };
@@ -432,6 +433,7 @@ CHECK_CHILD_DEFN(err, gt, >)			/* err_child_gt() */
 CHECK_CHILD_DEFN(warn, eq, ==)			/* warn_child_eq() */
 CHECK_CHILD_DEFN(err, eq, ==)			/* err_child_eq() */
 CHECK_CHILD_DEFN(err, lt, <)			/* err_child_lt() */
+CHECK_CHILD_DEFN(warn, lt, <)			/* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)	/* bwarn_ge1() */
 CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)	/* ewarn_eq1() */
 CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)	/* ewarn_eq0() */
@@ -442,7 +444,7 @@ CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)	/* eerr_le1
 CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0)	/* eerr_eq0() */
 CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)	/* eerr_ge1() */
 CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)	/* herr_eq0() */
-CHECK_HEAD_DEFN(le1, err, err_child_lt, 2)	/* herr_le1() */
+CHECK_HEAD_DEFN(le1, warn, warn_child_lt, 2)	/* hwarn_le1() */
 CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)	/* herr_ge1() */
 CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1)	/* hwarn_eq1() */
 
@@ -478,8 +480,10 @@ check_text(struct mdoc *mdoc, size_t line, size_t pos,
 {
 	size_t		 c;
 
+	/* XXX - indicate deprecated escapes \*(xx and \*x. */
+
 	for ( ; *p; p++) {
-		if ( ! isprint(*p) && '\t' != *p)
+		if ( ! isprint((int)*p) && '\t' != *p)
 			return(mdoc_perr(mdoc, line, pos,
 					"invalid characters"));
 		if ('\\' != *p)
@@ -538,7 +542,7 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 type, err, i;
+	int		 type, i, width, offset;
 	struct mdoc_arg	*argv;
 	size_t		 argc;
 
@@ -549,8 +553,10 @@ pre_bl(PRE_ARGS)
 
 	/* Make sure that only one type of list is specified.  */
 
+	type = offset = width = -1;
+
 	/* LINTED */
-	for (i = 0, type = err = 0; i < (int)argc; i++) {
+	for (i = 0; i < (int)argc; i++) {
 		argv = &n->data.block.argv[i];
 
 		switch (argv->arg) {
@@ -575,18 +581,60 @@ pre_bl(PRE_ARGS)
 		case (MDOC_Inset):
 			/* FALLTHROUGH */
 		case (MDOC_Column):
-			if (0 == type++)
+			if (-1 == type) {
+				type = argv->arg;
 				break;
+			}
 			return(mdoc_perr(mdoc, argv->line, argv->pos, 
 					"multiple types specified"));
+		case (MDOC_Width):
+			if (-1 == width) {
+				width = argv->arg;
+				break;
+			}
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple -%s arguments",
+					mdoc_argnames[MDOC_Width]));
+		case (MDOC_Offset):
+			if (-1 == offset) {
+				offset = argv->arg;
+				break;
+			}
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple -%s arguments",
+					mdoc_argnames[MDOC_Offset]));
 		default:
 			break;
 		}
 	}
 
-	if (type)
-		return(1);
-	return(mdoc_err(mdoc, "no type specified"));
+	if (-1 == type)
+		return(mdoc_err(mdoc, "no type specified"));
+
+	switch (type) {
+	case (MDOC_Column):
+		/* FALLTHROUGH */
+	case (MDOC_Diag):
+		/* FALLTHROUGH */
+	case (MDOC_Inset):
+		/* FALLTHROUGH */
+	case (MDOC_Item):
+		if (-1 == width)
+			break;
+		return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+				"superfluous -%s argument",
+				mdoc_argnames[MDOC_Width]));
+	case (MDOC_Tag):
+		if (-1 != width)
+			break;
+		return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+				"suggest -%s argument",
+				mdoc_argnames[MDOC_Width]));
+	default:
+		break;
+	}
+
+	return(1);
 }
 
 
@@ -657,7 +705,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-	/* TODO: -width attribute must be specified for -tag. */
 	/* TODO: children too big for -width? */
 
 	if (MDOC_BLOCK != n->type)