===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.165
retrieving revision 1.168
diff -u -p -r1.165 -r1.168
--- mandoc/man.c	2015/10/06 18:32:19	1.165
+++ mandoc/man.c	2017/03/03 13:55:31	1.168
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.165 2015/10/06 18:32:19 schwarze Exp $ */
+/*	$Id: man.c,v 1.168 2017/03/03 13:55:31 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -149,7 +149,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 
 	assert(i);
 	if (mandoc_eos(buf, (size_t)i))
-		man->last->flags |= MAN_EOS;
+		man->last->flags |= NODE_EOS;
 
 	man_descope(man, line, offs);
 	return 1;
@@ -203,7 +203,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	/* Jump to the next non-whitespace word. */
 
-	while (buf[offs] && buf[offs] == ' ')
+	while (buf[offs] == ' ')
 		offs++;
 
 	/*
@@ -331,4 +331,39 @@ man_mparse(const struct roff_man *man)
 
 	assert(man && man->parse);
 	return man->parse;
+}
+
+void
+man_state(struct roff_man *man, struct roff_node *n)
+{
+
+	switch(n->tok) {
+	case MAN_nf:
+	case MAN_EX:
+		if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID))
+			mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
+			    n->line, n->pos, "nf");
+		man->flags |= MAN_LITERAL;
+		break;
+	case MAN_fi:
+	case MAN_EE:
+		if ( ! (man->flags & MAN_LITERAL) &&
+		     ! (n->flags & NODE_VALID))
+			mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
+			    n->line, n->pos, "fi");
+		man->flags &= ~MAN_LITERAL;
+		break;
+	default:
+		break;
+	}
+	man->last->flags |= NODE_VALID;
+}
+
+void
+man_validate(struct roff_man *man)
+{
+
+	man->last = man->first;
+	man_node_validate(man);
+	man->flags &= ~MAN_LITERAL;
 }