From f1be851316db6766465ba5fa434d98d9d17394d4 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sat, 28 Feb 2009 13:47:36 +0000
Subject: Added support for dynamic -width detection for -tag lists.

---
 validate.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'validate.c')

diff --git a/validate.c b/validate.c
index 0a5fb8f3..197397dd 100644
--- a/validate.c
+++ b/validate.c
@@ -36,9 +36,7 @@
 typedef	int	(*v_pre)(PRE_ARGS);
 typedef	int	(*v_post)(POST_ARGS);
 
-/* FIXME: some sections should only occur in specific msecs. */
-/* FIXME: ignoring Pp. */
-/* FIXME: math symbols. */
+/* TODO: ignoring Pp (it's superfluous in some invocations). */
 
 struct	valids {
 	v_pre	*pre;
@@ -626,11 +624,11 @@ pre_bl(PRE_ARGS)
 				"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]));
+		if (-1 == width && ! mdoc_nwarn(mdoc, n, WARN_SYNTAX, 
+					"suggest -%s argument",
+					mdoc_argnames[MDOC_Width]))
+			return(0);
+		break;
 	default:
 		break;
 	}
@@ -706,8 +704,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-	/* TODO: children too big for -width? */
-
 	if (MDOC_BLOCK != n->type)
 		return(1);
 	return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
@@ -1056,19 +1052,25 @@ post_bl(POST_ARGS)
 
 	if (MDOC_BODY != mdoc->last->type)
 		return(1);
+	if (NULL == (mdoc->last->child))
+		return(1);
+
+	/*
+	 * Only allow `It' macros to be the immediate descendants of the
+	 * `Bl' list. 
+	 */
 
 	/* LINTED */
 	for (n = mdoc->last->child; n; n = n->next) {
 		if (MDOC_BLOCK == n->type) 
 			if (MDOC_It == n->tok)
 				continue;
-		break;
-	}
 
-	if (NULL == n)
-		return(1);
+		return(mdoc_nerr(mdoc, n, "bad child of parent %s",
+				mdoc_macronames[mdoc->last->tok]));
+	}
 
-	return(mdoc_nerr(mdoc, n, "bad child of parent list"));
+	return(1);
 }
 
 
-- 
cgit