===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.19
retrieving revision 1.30
diff -u -p -r1.19 -r1.30
--- mandoc/man_validate.c	2009/08/19 09:14:50	1.19
+++ mandoc/man_validate.c	2010/03/23 11:30:48	1.30
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.19 2009/08/19 09:14:50 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.30 2010/03/23 11:30:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -36,28 +40,27 @@ struct	man_valid {
 };
 
 static	int	  check_bline(CHKARGS);
-static	int	  check_eline(CHKARGS);
 static	int	  check_eq0(CHKARGS);
-static	int	  check_eq1(CHKARGS);
+static	int	  check_le1(CHKARGS);
 static	int	  check_ge2(CHKARGS);
 static	int	  check_le5(CHKARGS);
 static	int	  check_par(CHKARGS);
+static	int	  check_part(CHKARGS);
 static	int	  check_root(CHKARGS);
 static	int	  check_sec(CHKARGS);
-static	int	  check_sp(CHKARGS);
 static	int	  check_text(CHKARGS);
 
 static	v_check	  posts_eq0[] = { check_eq0, NULL };
 static	v_check	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
 static	v_check	  posts_par[] = { check_par, NULL };
+static	v_check	  posts_part[] = { check_part, NULL };
 static	v_check	  posts_sec[] = { check_sec, NULL };
-static	v_check	  posts_sp[] = { check_sp, NULL };
-static	v_check	  pres_eline[] = { check_eline, NULL };
+static	v_check	  posts_le1[] = { check_le1, NULL };
 static	v_check	  pres_bline[] = { check_bline, NULL };
 
 static	const struct man_valid man_valids[MAN_MAX] = {
-	{ pres_bline, posts_eq0 }, /* br */
-	{ pres_bline, posts_ge2_le5 }, /* TH */
+	{ NULL, posts_eq0 }, /* br */
+	{ pres_bline, posts_ge2_le5 }, /* TH */ /* FIXME: make sure capitalised. */
 	{ pres_bline, posts_sec }, /* SH */
 	{ pres_bline, posts_sec }, /* SS */
 	{ pres_bline, posts_par }, /* TP */
@@ -66,25 +69,31 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ pres_bline, posts_par }, /* P */
 	{ pres_bline, posts_par }, /* IP */
 	{ pres_bline, posts_par }, /* HP */
-	{ pres_eline, NULL }, /* SM */
-	{ pres_eline, NULL }, /* SB */
+	{ NULL, NULL }, /* SM */
+	{ NULL, NULL }, /* SB */
 	{ NULL, NULL }, /* BI */
 	{ NULL, NULL }, /* IB */
 	{ NULL, NULL }, /* BR */
 	{ NULL, NULL }, /* RB */
-	{ pres_eline, NULL }, /* R */
-	{ pres_eline, NULL }, /* B */
-	{ pres_eline, NULL }, /* I */
+	{ NULL, NULL }, /* R */
+	{ NULL, NULL }, /* B */
+	{ NULL, NULL }, /* I */
 	{ NULL, NULL }, /* IR */
 	{ NULL, NULL }, /* RI */
-	{ pres_bline, posts_eq0 }, /* na */
+	{ NULL, posts_eq0 }, /* na */
 	{ NULL, NULL }, /* i */
-	{ pres_bline, posts_sp }, /* sp */
+	{ NULL, posts_le1 }, /* sp */
 	{ pres_bline, posts_eq0 }, /* nf */
 	{ pres_bline, posts_eq0 }, /* fi */
 	{ NULL, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
-	{ NULL, NULL }, /* RS */
+	{ NULL, posts_part }, /* RS */
+	{ NULL, NULL }, /* DT */
+	{ NULL, NULL }, /* UC */
+	{ NULL, NULL }, /* PD */
+	{ NULL, posts_eq0 }, /* Sp */
+	{ pres_bline, posts_le1 }, /* Vb */
+	{ pres_bline, posts_eq0 }, /* Ve */
 };
 
 
@@ -139,15 +148,14 @@ static int
 check_root(CHKARGS) 
 {
 
-	/* FIXME: closing out explicit scope! */
-
-	/* XXX - make this into a warning? */
 	if (MAN_BLINE & m->flags)
-		return(man_nerr(m, n, WEXITSCOPE));
-	/* XXX - make this into a warning? */
+		return(man_nwarn(m, n, WEXITSCOPE));
 	if (MAN_ELINE & m->flags)
-		return(man_nerr(m, n, WEXITSCOPE));
+		return(man_nwarn(m, n, WEXITSCOPE));
 
+	m->flags &= ~MAN_BLINE;
+	m->flags &= ~MAN_ELINE;
+
 	if (NULL == m->first->child)
 		return(man_nerr(m, n, WNODATA));
 	if (NULL == m->meta.title)
@@ -204,49 +212,29 @@ check_##name(CHKARGS) \
 }
 
 INEQ_DEFINE(0, ==, eq0)
-INEQ_DEFINE(1, ==, eq1)
+INEQ_DEFINE(1, <=, le1)
 INEQ_DEFINE(2, >=, ge2)
 INEQ_DEFINE(5, <=, le5)
 
 
 static int
-check_sp(CHKARGS)
+check_sec(CHKARGS)
 {
-	long		 lval;
-	char		*ep, *buf;
 
-	if (NULL == n->child)
-		return(1);
-	else if ( ! check_eq1(m, n))
-		return(0);
-
-	assert(MAN_TEXT == n->child->type);
-	buf = n->child->string;
-	assert(buf);
-	
-	/* From OpenBSD's strtol(3). */
-
-	errno = 0;
-	lval = strtol(buf, &ep, 10);
-	if (buf[0] == '\0' || *ep != '\0')
-		return(man_nerr(m, n->child, WNUMFMT));
-
-	if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
-			(lval > INT_MAX || lval < 0))
-		return(man_nerr(m, n->child, WNUMFMT));
-
+	if (MAN_BODY == n->type && 0 == n->nchild)
+		return(man_nwarn(m, n, WBODYARGS));
+	if (MAN_HEAD == n->type && 0 == n->nchild)
+		return(man_nerr(m, n, WHEADARGS));
 	return(1);
 }
 
 
 static int
-check_sec(CHKARGS)
+check_part(CHKARGS)
 {
 
 	if (MAN_BODY == n->type && 0 == n->nchild)
 		return(man_nwarn(m, n, WBODYARGS));
-	if (MAN_HEAD == n->type && 0 == n->nchild)
-		return(man_nerr(m, n, WHEADARGS));
 	return(1);
 }
 
@@ -290,22 +278,11 @@ check_par(CHKARGS)
 
 
 static int
-check_eline(CHKARGS)
-{
-
-	if (MAN_ELINE & m->flags)
-		return(man_nerr(m, n, WLNSCOPE));
-	return(1);
-}
-
-
-static int
 check_bline(CHKARGS)
 {
 
+	assert( ! (MAN_ELINE & m->flags));
 	if (MAN_BLINE & m->flags)
-		return(man_nerr(m, n, WLNSCOPE));
-	if (MAN_ELINE & m->flags)
 		return(man_nerr(m, n, WLNSCOPE));
 	return(1);
 }