===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.163
retrieving revision 1.169
diff -u -p -r1.163 -r1.169
--- mandoc/man.c	2015/04/23 16:17:44	1.163
+++ mandoc/man.c	2017/04/24 23:06:18	1.169
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.163 2015/04/23 16:17:44 schwarze Exp $ */
+/*	$Id: man.c,v 1.169 2017/04/24 23:06:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -35,21 +35,6 @@
 #include "roff_int.h"
 #include "libman.h"
 
-const	char *const __man_macronames[MAN_MAX] = {
-	"br",		"TH",		"SH",		"SS",
-	"TP",		"LP",		"PP",		"P",
-	"IP",		"HP",		"SM",		"SB",
-	"BI",		"IB",		"BR",		"RB",
-	"R",		"B",		"I",		"IR",
-	"RI",		"sp",		"nf",
-	"fi",		"RE",		"RS",		"DT",
-	"UC",		"PD",		"AT",		"in",
-	"ft",		"OP",		"EX",		"EE",
-	"UR",		"UE",		"ll"
-	};
-
-const	char * const *man_macronames = __man_macronames;
-
 static	void		 man_descope(struct roff_man *, int, int);
 static	int		 man_ptext(struct roff_man *, int, char *, int);
 static	int		 man_pmacro(struct roff_man *, int, char *, int);
@@ -62,9 +47,9 @@ man_parseln(struct roff_man *man, int ln, char *buf, i
 	if (man->last->type != ROFFT_EQN || ln > man->last->line)
 		man->flags |= MAN_NEWLINE;
 
-	return (roff_getcontrol(man->roff, buf, &offs) ?
+	return roff_getcontrol(man->roff, buf, &offs) ?
 	    man_pmacro(man, ln, buf, offs) :
-	    man_ptext(man, ln, buf, offs));
+	    man_ptext(man, ln, buf, offs);
 }
 
 static void
@@ -97,7 +82,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 	if (man->flags & MAN_LITERAL) {
 		roff_word_alloc(man, line, offs, buf + offs);
 		man_descope(man, line, offs);
-		return(1);
+		return 1;
 	}
 
 	for (i = offs; buf[i] == ' '; i++)
@@ -115,7 +100,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 			roff_elem_alloc(man, line, offs, MAN_sp);
 			man->next = ROFF_NEXT_SIBLING;
 		}
-		return(1);
+		return 1;
 	}
 
 	/*
@@ -149,10 +134,10 @@ 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);
+	return 1;
 }
 
 static int
@@ -183,7 +168,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 	if (tok == TOKEN_NONE) {
 		mandoc_msg(MANDOCERR_MACRO, man->parse,
 		    ln, ppos, buf + ppos - 1);
-		return(1);
+		return 1;
 	}
 
 	/* Skip a leading escape sequence or tab. */
@@ -203,7 +188,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++;
 
 	/*
@@ -234,7 +219,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 		n = man->last;
 		if (n->type == ROFFT_BODY &&
 		    strcmp(n->prev->child->string, "NAME"))
-			return(2);
+			return 2;
 	}
 
 	/*
@@ -245,14 +230,14 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	if ( ! bline || man->flags & MAN_ELINE ||
 	    man_macros[tok].flags & MAN_NSCOPED)
-		return(1);
+		return 1;
 
 	assert(man->flags & MAN_BLINE);
 	man->flags &= ~MAN_BLINE;
 
 	man_unscope(man, man->last->parent);
 	roff_body_alloc(man, ln, ppos, man->last->tok);
-	return(1);
+	return 1;
 }
 
 void
@@ -275,14 +260,28 @@ man_breakscope(struct roff_man *man, int tok)
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
-		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
-		    man_macronames[n->tok]);
+		    tok == TOKEN_NONE ? "TS" : roff_name[tok],
+		    roff_name[n->tok]);
 
 		roff_node_delete(man, n);
 		man->flags &= ~MAN_ELINE;
 	}
 
 	/*
+	 * Weird special case:
+	 * Switching fill mode closes section headers.
+	 */
+
+	if (man->flags & MAN_BLINE &&
+	    (tok == MAN_nf || tok == MAN_fi) &&
+	    (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {
+		n = man->last;
+		man_unscope(man, n);
+		roff_body_alloc(man, n->line, n->pos, n->tok);
+		man->flags &= ~MAN_BLINE;
+	}
+
+	/*
 	 * A block header next line scope is open,
 	 * and the new macro is not allowed inside block headers.
 	 * Delete the block that is being broken.
@@ -303,8 +302,8 @@ man_breakscope(struct roff_man *man, int tok)
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
-		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
-		    man_macronames[n->tok]);
+		    tok == TOKEN_NONE ? "TS" : roff_name[tok],
+		    roff_name[n->tok]);
 
 		roff_node_delete(man, n);
 		man->flags &= ~MAN_BLINE;
@@ -316,5 +315,40 @@ man_mparse(const struct roff_man *man)
 {
 
 	assert(man && man->parse);
-	return(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;
 }