===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.120
retrieving revision 1.124
diff -u -p -r1.120 -r1.124
--- mandoc/man_validate.c	2015/10/12 00:08:15	1.120
+++ mandoc/man_validate.c	2017/05/04 17:48:28	1.124
@@ -1,7 +1,7 @@
-/*	$OpenBSD: man_validate.c,v 1.120 2015/10/12 00:08:15 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.124 2017/05/04 17:48:28 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -48,16 +48,13 @@ static	void	  check_text(CHKARGS);
 static	void	  post_AT(CHKARGS);
 static	void	  post_IP(CHKARGS);
 static	void	  post_vs(CHKARGS);
-static	void	  post_fi(CHKARGS);
 static	void	  post_ft(CHKARGS);
-static	void	  post_nf(CHKARGS);
 static	void	  post_OP(CHKARGS);
 static	void	  post_TH(CHKARGS);
 static	void	  post_UC(CHKARGS);
 static	void	  post_UR(CHKARGS);
 
-static	v_check man_valids[MAN_MAX] = {
-	post_vs,    /* br */
+static	const v_check __man_valids[MAN_MAX - MAN_TH] = {
 	post_TH,    /* TH */
 	NULL,       /* SH */
 	NULL,       /* SS */
@@ -79,8 +76,8 @@ static	v_check man_valids[MAN_MAX] = {
 	NULL,       /* IR */
 	NULL,       /* RI */
 	post_vs,    /* sp */
-	post_nf,    /* nf */
-	post_fi,    /* fi */
+	NULL,       /* nf */
+	NULL,       /* fi */
 	NULL,       /* RE */
 	check_part, /* RS */
 	NULL,       /* DT */
@@ -90,25 +87,33 @@ static	v_check man_valids[MAN_MAX] = {
 	NULL,       /* in */
 	post_ft,    /* ft */
 	post_OP,    /* OP */
-	post_nf,    /* EX */
-	post_fi,    /* EE */
+	NULL,       /* EX */
+	NULL,       /* EE */
 	post_UR,    /* UR */
 	NULL,       /* UE */
 	NULL,       /* ll */
 };
+static	const v_check *man_valids = __man_valids - MAN_TH;
 
 
 void
-man_valid_post(struct roff_man *man)
+man_node_validate(struct roff_man *man)
 {
 	struct roff_node *n;
-	v_check		*cp;
+	const v_check	 *cp;
 
 	n = man->last;
-	if (n->flags & MAN_VALID)
-		return;
-	n->flags |= MAN_VALID;
+	man->last = man->last->child;
+	while (man->last != NULL) {
+		man_node_validate(man);
+		if (man->last == n)
+			man->last = man->last->child;
+		else
+			man->last = man->last->next;
+	}
 
+	man->last = n;
+	man->next = ROFF_NEXT_SIBLING;
 	switch (n->type) {
 	case ROFFT_TEXT:
 		check_text(man, n);
@@ -120,9 +125,22 @@ man_valid_post(struct roff_man *man)
 	case ROFFT_TBL:
 		break;
 	default:
+		if (n->tok < ROFF_MAX) {
+			switch (n->tok) {
+			case ROFF_br:
+				post_vs(man, n);
+				break;
+			default:
+				abort();
+			}
+			break;
+		}
+		assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
 		cp = man_valids + n->tok;
 		if (*cp)
 			(*cp)(man, n);
+		if (man->last == n)
+			man_state(man, n);
 		break;
 	}
 }
@@ -173,10 +191,10 @@ static void
 post_OP(CHKARGS)
 {
 
-	if (n->nchild == 0)
+	if (n->child == NULL)
 		mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
 		    n->line, n->pos, "OP");
-	else if (n->nchild > 2) {
+	else if (n->child->next != NULL && n->child->next->next != NULL) {
 		n = n->child->next->next;
 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
 		    n->line, n->pos, "OP ... %s", n->string);
@@ -199,7 +217,7 @@ post_ft(CHKARGS)
 	char	*cp;
 	int	 ok;
 
-	if (0 == n->nchild)
+	if (n->child == NULL)
 		return;
 
 	ok = 0;
@@ -240,7 +258,7 @@ check_part(CHKARGS)
 
 	if (n->type == ROFFT_BODY && n->child == NULL)
 		mandoc_msg(MANDOCERR_BLK_EMPTY, man->parse,
-		    n->line, n->pos, man_macronames[n->tok]);
+		    n->line, n->pos, roff_name[n->tok]);
 }
 
 static void
@@ -249,22 +267,21 @@ check_par(CHKARGS)
 
 	switch (n->type) {
 	case ROFFT_BLOCK:
-		if (0 == n->body->nchild)
+		if (n->body->child == NULL)
 			roff_node_delete(man, n);
 		break;
 	case ROFFT_BODY:
-		if (0 == n->nchild)
+		if (n->child == NULL)
 			mandoc_vmsg(MANDOCERR_PAR_SKIP,
 			    man->parse, n->line, n->pos,
-			    "%s empty", man_macronames[n->tok]);
+			    "%s empty", roff_name[n->tok]);
 		break;
 	case ROFFT_HEAD:
-		if (n->nchild)
+		if (n->child != NULL)
 			mandoc_vmsg(MANDOCERR_ARG_SKIP,
-			    man->parse, n->line, n->pos,
-			    "%s %s%s", man_macronames[n->tok],
-			    n->child->string,
-			    n->nchild > 1 ? " ..." : "");
+			    man->parse, n->line, n->pos, "%s %s%s",
+			    roff_name[n->tok], n->child->string,
+			    n->child->next != NULL ? " ..." : "");
 		break;
 	default:
 		break;
@@ -277,14 +294,14 @@ post_IP(CHKARGS)
 
 	switch (n->type) {
 	case ROFFT_BLOCK:
-		if (0 == n->head->nchild && 0 == n->body->nchild)
+		if (n->head->child == NULL && n->body->child == NULL)
 			roff_node_delete(man, n);
 		break;
 	case ROFFT_BODY:
-		if (0 == n->parent->head->nchild && 0 == n->nchild)
+		if (n->parent->head->child == NULL && n->child == NULL)
 			mandoc_vmsg(MANDOCERR_PAR_SKIP,
 			    man->parse, n->line, n->pos,
-			    "%s empty", man_macronames[n->tok]);
+			    "%s empty", roff_name[n->tok]);
 		break;
 	default:
 		break;
@@ -386,28 +403,6 @@ post_TH(CHKARGS)
 }
 
 static void
-post_nf(CHKARGS)
-{
-
-	if (man->flags & MAN_LITERAL)
-		mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
-		    n->line, n->pos, "nf");
-
-	man->flags |= MAN_LITERAL;
-}
-
-static void
-post_fi(CHKARGS)
-{
-
-	if ( ! (MAN_LITERAL & man->flags))
-		mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
-		    n->line, n->pos, "fi");
-
-	man->flags &= ~MAN_LITERAL;
-}
-
-static void
 post_UC(CHKARGS)
 {
 	static const char * const bsd_versions[] = {
@@ -494,8 +489,8 @@ post_vs(CHKARGS)
 	case MAN_SH:
 	case MAN_SS:
 		mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
-		    "%s after %s", man_macronames[n->tok],
-		    man_macronames[n->parent->tok]);
+		    "%s after %s", roff_name[n->tok],
+		    roff_name[n->parent->tok]);
 		/* FALLTHROUGH */
 	case TOKEN_NONE:
 		/*