===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.106
retrieving revision 1.114
diff -u -p -r1.106 -r1.114
--- mandoc/man_macro.c	2015/04/19 13:50:25	1.106
+++ mandoc/man_macro.c	2016/01/08 17:48:09	1.114
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.106 2015/04/19 13:50:25 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.114 2016/01/08 17:48:09 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,8 +63,8 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, 0 }, /* IR */
 	{ in_line_eoln, 0 }, /* RI */
 	{ in_line_eoln, MAN_NSCOPED }, /* sp */
-	{ in_line_eoln, MAN_BSCOPE }, /* nf */
-	{ in_line_eoln, MAN_BSCOPE }, /* fi */
+	{ in_line_eoln, MAN_NSCOPED }, /* nf */
+	{ in_line_eoln, MAN_NSCOPED }, /* fi */
 	{ blk_close, MAN_BSCOPE }, /* RE */
 	{ blk_exp, MAN_BSCOPE }, /* RS */
 	{ in_line_eoln, 0 }, /* DT */
@@ -130,7 +130,7 @@ man_unscope(struct roff_man *man, const struct roff_no
 
 		man->last = n;
 		n = n->parent;
-		man_valid_post(man);
+		man->last->flags |= MAN_VALID;
 	}
 
 	/*
@@ -157,7 +157,7 @@ rew_scope(struct roff_man *man, int tok)
 	/* Preserve empty paragraphs before RS. */
 
 	n = man->last;
-	if (tok == MAN_RS && n->nchild == 0 &&
+	if (tok == MAN_RS && n->child == NULL &&
 	    (n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP))
 		return;
 
@@ -225,7 +225,6 @@ blk_close(MACRO_PROT_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	for (nn = man->last->parent; nn; nn = nn->parent)
@@ -259,12 +258,12 @@ blk_exp(MACRO_PROT_ARGS)
 	int		 la;
 
 	rew_scope(man, tok);
-	man_block_alloc(man, line, ppos, tok);
+	roff_block_alloc(man, line, ppos, tok);
 	head = roff_head_alloc(man, line, ppos, tok);
 
 	la = *pos;
 	if (man_args(man, line, pos, buf, &p))
-		man_word_alloc(man, line, la, p);
+		roff_word_alloc(man, line, la, p);
 
 	if (buf[*pos] != '\0')
 		mandoc_vmsg(MANDOCERR_ARG_EXCESS,
@@ -289,8 +288,7 @@ blk_imp(MACRO_PROT_ARGS)
 	struct roff_node *n;
 
 	rew_scope(man, tok);
-	man_block_alloc(man, line, ppos, tok);
-	n = man->last;
+	n = roff_block_alloc(man, line, ppos, tok);
 	if (n->tok == MAN_SH || n->tok == MAN_SS)
 		man->flags &= ~MAN_LITERAL;
 	n = roff_head_alloc(man, line, ppos, tok);
@@ -301,7 +299,7 @@ blk_imp(MACRO_PROT_ARGS)
 		la = *pos;
 		if ( ! man_args(man, line, pos, buf, &p))
 			break;
-		man_word_alloc(man, line, la, p);
+		roff_word_alloc(man, line, la, p);
 	}
 
 	/*
@@ -329,7 +327,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 	char		*p;
 	struct roff_node *n;
 
-	man_elem_alloc(man, line, ppos, tok);
+	roff_elem_alloc(man, line, ppos, tok);
 	n = man->last;
 
 	for (;;) {
@@ -352,9 +350,9 @@ in_line_eoln(MACRO_PROT_ARGS)
 			break;
 		if (man_macros[tok].flags & MAN_JOIN &&
 		    man->last->type == ROFFT_TEXT)
-			man_word_append(man, p);
+			roff_word_append(man, p);
 		else
-			man_word_alloc(man, line, la, p);
+			roff_word_alloc(man, line, la, p);
 	}
 
 	/*
@@ -381,36 +379,21 @@ in_line_eoln(MACRO_PROT_ARGS)
 	assert(man->last->type != ROFFT_ROOT);
 	man->next = ROFF_NEXT_SIBLING;
 
-	/*
-	 * Rewind our element scope.  Note that when TH is pruned, we'll
-	 * be back at the root, so make sure that we don't clobber as
-	 * its sibling.
-	 */
+	/* Rewind our element scope. */
 
 	for ( ; man->last; man->last = man->last->parent) {
+		man_state(man, man->last);
 		if (man->last == n)
 			break;
-		if (man->last->type == ROFFT_ROOT)
-			break;
-		man_valid_post(man);
 	}
-
-	assert(man->last);
-
-	/*
-	 * Same here regarding whether we're back at the root.
-	 */
-
-	if (man->last->type != ROFFT_ROOT)
-		man_valid_post(man);
 }
 
-
 void
-man_macroend(struct roff_man *man)
+man_endparse(struct roff_man *man)
 {
 
 	man_unscope(man, man->first);
+	man->flags &= ~MAN_LITERAL;
 }
 
 static int
@@ -423,8 +406,8 @@ man_args(struct roff_man *man, int line, int *pos, cha
 	assert(' ' != *start);
 
 	if ('\0' == *start)
-		return(0);
+		return 0;
 
 	*v = mandoc_getarg(man->parse, v, line, pos);
-	return(1);
+	return 1;
 }