Significant overhaul in libman. Macros are now block- and line-scoped (with

next-line scope extensions possible).  man.7 reflects block and line scoping,
and also includes a REFERENCE section that will be used as a template for the
big mdoc reference.  Many fixes in next-line behaviour for both inline and
block macros.  Added some macros for compatibility (from me.7).  Corrected
quoted-literal handling for libman.

1 files changed, 160 insertions, 59 deletions

diff --git a/man_validate.c b/man_validate.c
index afeadd13..9c8161ee 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.16 2009/07/24 20:22:24 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.17 2009/08/13 11:45:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,64 +26,89 @@
 #include "libman.h"
 #include "libmandoc.h"
 
-#define	POSTARGS  struct man *m, const struct man_node *n
+#define	CHKARGS	  struct man *m, const struct man_node *n
 
-typedef	int	(*v_post)(POSTARGS);
+typedef	int	(*v_check)(CHKARGS);
 
 struct	man_valid {
-	v_post	 *posts;
+	v_check	 *pres;
+	v_check	 *posts;
 };
 
-static	int	  check_eq0(POSTARGS);
-static	int	  check_eq1(POSTARGS);
-static	int	  check_ge1(POSTARGS);
-static	int	  check_ge2(POSTARGS);
-static	int	  check_le1(POSTARGS);
-static	int	  check_le2(POSTARGS);
-static	int	  check_le5(POSTARGS);
-static	int	  check_root(POSTARGS);
-static	int	  check_sp(POSTARGS);
-static	int	  check_text(POSTARGS);
-
-static	v_post	  posts_eq0[] = { check_eq0, NULL };
-static	v_post	  posts_ge1[] = { check_ge1, NULL };
-static	v_post	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
-static	v_post	  posts_le1[] = { check_le1, NULL };
-static	v_post	  posts_le2[] = { check_le2, NULL };
-static	v_post	  posts_sp[] = { check_sp, NULL };
+static	int	  check_bline(CHKARGS);
+static	int	  check_eline(CHKARGS);
+static	int	  check_eq0(CHKARGS);
+static	int	  check_eq1(CHKARGS);
+static	int	  check_ge2(CHKARGS);
+static	int	  check_le5(CHKARGS);
+static	int	  check_par(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_sec[] = { check_sec, NULL };
+static	v_check	  posts_sp[] = { check_sp, NULL };
+static	v_check	  pres_eline[] = { check_eline, NULL };
+static	v_check	  pres_bline[] = { check_bline, NULL };
 
 static	const struct man_valid man_valids[MAN_MAX] = {
-	{ posts_eq0 }, /* br */
-	{ posts_ge2_le5 }, /* TH */
-	{ posts_ge1 }, /* SH */
-	{ posts_ge1 }, /* SS */
-	{ NULL }, /* TP */
-	{ posts_eq0 }, /* LP */
-	{ posts_eq0 }, /* PP */
-	{ posts_eq0 }, /* P */
-	{ posts_le2 }, /* IP */
-	{ posts_le1 }, /* HP */
-	{ NULL }, /* SM */
-	{ NULL }, /* SB */
-	{ NULL }, /* BI */
-	{ NULL }, /* IB */
-	{ NULL }, /* BR */
-	{ NULL }, /* RB */
-	{ NULL }, /* R */
-	{ NULL }, /* B */
-	{ NULL }, /* I */
-	{ NULL }, /* IR */
-	{ NULL }, /* RI */
-	{ posts_eq0 }, /* na */
-	{ NULL }, /* i */
-	{ posts_sp }, /* sp */
+	{ pres_bline, posts_eq0 }, /* br */
+	{ pres_bline, posts_ge2_le5 }, /* TH */
+	{ pres_bline, posts_sec }, /* SH */
+	{ pres_bline, posts_sec }, /* SS */
+	{ pres_bline, posts_par }, /* TP */
+	{ pres_bline, posts_par }, /* LP */
+	{ pres_bline, posts_par }, /* PP */
+	{ 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 }, /* BI */
+	{ NULL, NULL }, /* IB */
+	{ NULL, NULL }, /* BR */
+	{ NULL, NULL }, /* RB */
+	{ pres_eline, NULL }, /* R */
+	{ pres_eline, NULL }, /* B */
+	{ pres_eline, NULL }, /* I */
+	{ NULL, NULL }, /* IR */
+	{ NULL, NULL }, /* RI */
+	{ pres_bline, posts_eq0 }, /* na */
+	{ NULL, NULL }, /* i */
+	{ pres_bline, posts_sp }, /* sp */
+	{ pres_bline, posts_eq0 }, /* nf */
+	{ pres_bline, posts_eq0 }, /* fi */
+	{ NULL, NULL }, /* r */
 };
 
 
 int
+man_valid_pre(struct man *m, const struct man_node *n)
+{
+	v_check		*cp;
+
+	if (MAN_TEXT == n->type)
+		return(1);
+	if (MAN_ROOT == n->type)
+		return(1);
+
+	if (NULL == (cp = man_valids[n->tok].pres))
+		return(1);
+	for ( ; *cp; cp++)
+		if ( ! (*cp)(m, n)) 
+			return(0);
+	return(1);
+}
+
+
+int
 man_valid_post(struct man *m)
 {
-	v_post		*cp;
+	v_check		*cp;
 
 	if (MAN_VALID & m->last->flags)
 		return(1);
@@ -109,9 +134,16 @@ man_valid_post(struct man *m)
 
 
 static int
-check_root(POSTARGS) 
+check_root(CHKARGS) 
 {
-	
+
+	/* XXX - make this into a warning? */
+	if (MAN_BLINE & m->flags)
+		return(man_nerr(m, n, WEXITSCOPE));
+	/* XXX - make this into a warning? */
+	if (MAN_ELINE & m->flags)
+		return(man_nerr(m, n, WEXITSCOPE));
+
 	if (NULL == m->first->child)
 		return(man_nerr(m, n, WNODATA));
 	if (NULL == m->meta.title)
@@ -122,7 +154,7 @@ check_root(POSTARGS)
 
 
 static int
-check_text(POSTARGS) 
+check_text(CHKARGS) 
 {
 	const char	*p;
 	int		 pos, c;
@@ -158,7 +190,7 @@ check_text(POSTARGS)
 
 #define	INEQ_DEFINE(x, ineq, name) \
 static int \
-check_##name(POSTARGS) \
+check_##name(CHKARGS) \
 { \
 	if (n->nchild ineq (x)) \
 		return(1); \
@@ -169,37 +201,106 @@ check_##name(POSTARGS) \
 
 INEQ_DEFINE(0, ==, eq0)
 INEQ_DEFINE(1, ==, eq1)
-INEQ_DEFINE(1, >=, ge1)
 INEQ_DEFINE(2, >=, ge2)
-INEQ_DEFINE(1, <=, le1)
-INEQ_DEFINE(2, <=, le2)
 INEQ_DEFINE(5, <=, le5)
 
 
 static int
-check_sp(POSTARGS)
+check_sp(CHKARGS)
 {
 	long		 lval;
 	char		*ep, *buf;
 
-	if (NULL == m->last->child)
+	if (NULL == n->child)
 		return(1);
 	else if ( ! check_eq1(m, n))
 		return(0);
 
-	assert(MAN_TEXT == m->last->child->type);
-	buf = m->last->child->string;
+	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, m->last->child, WNUMFMT));
+		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, m->last->child, WNUMFMT));
+		return(man_nerr(m, n->child, WNUMFMT));
+
+	return(1);
+}
+
+
+static int
+check_sec(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);
 }
+
+
+static int
+check_par(CHKARGS)
+{
+
+	if (MAN_BODY == n->type) 
+		switch (n->tok) {
+		case (MAN_IP):
+			/* FALLTHROUGH */
+		case (MAN_HP):
+			/* FALLTHROUGH */
+		case (MAN_TP):
+			/* Body-less lists are ok. */
+			break;
+		default:
+			if (n->nchild)
+				break;
+			return(man_nwarn(m, n, WBODYARGS));
+		}
+	if (MAN_HEAD == n->type)
+		switch (n->tok) {
+		case (MAN_PP):
+			/* FALLTHROUGH */
+		case (MAN_P):
+			/* FALLTHROUGH */
+		case (MAN_LP):
+			if (0 == n->nchild)
+				break;
+			return(man_nwarn(m, n, WNHEADARGS));
+		default:
+			if (n->nchild)
+				break;
+			return(man_nwarn(m, n, WHEADARGS));
+		}
+
+	return(1);
+}
+
+
+static int
+check_eline(CHKARGS)
+{
+
+	if ( ! (MAN_ELINE & m->flags))
+		return(1);
+	return(man_nerr(m, n, WLNSCOPE));
+}
+
+
+static int
+check_bline(CHKARGS)
+{
+
+	if ( ! (MAN_BLINE & m->flags))
+		return(1);
+	return(man_nerr(m, n, WLNSCOPE));
+}
+