===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.96
retrieving revision 1.100
diff -u -p -r1.96 -r1.100
--- mandoc/man_macro.c	2015/02/06 08:28:35	1.96
+++ mandoc/man_macro.c	2015/03/20 14:47:52	1.100
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.96 2015/02/06 08:28:35 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.100 2015/03/20 14:47:52 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -55,7 +55,7 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_BSCOPE }, /* TH */
 	{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */
 	{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */
-	{ blk_imp, MAN_BSCOPE | MAN_SCOPED | MAN_FSCOPED }, /* TP */
+	{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TP */
 	{ blk_imp, MAN_BSCOPE }, /* LP */
 	{ blk_imp, MAN_BSCOPE }, /* PP */
 	{ blk_imp, MAN_BSCOPE }, /* P */
@@ -76,17 +76,17 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_BSCOPE }, /* nf */
 	{ in_line_eoln, MAN_BSCOPE }, /* fi */
 	{ blk_close, MAN_BSCOPE }, /* RE */
-	{ blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* RS */
+	{ blk_exp, MAN_BSCOPE }, /* RS */
 	{ in_line_eoln, 0 }, /* DT */
 	{ in_line_eoln, 0 }, /* UC */
-	{ in_line_eoln, 0 }, /* PD */
+	{ in_line_eoln, MAN_NSCOPED }, /* PD */
 	{ in_line_eoln, 0 }, /* AT */
 	{ in_line_eoln, 0 }, /* in */
 	{ in_line_eoln, 0 }, /* ft */
 	{ in_line_eoln, 0 }, /* OP */
 	{ in_line_eoln, MAN_BSCOPE }, /* EX */
 	{ in_line_eoln, MAN_BSCOPE }, /* EE */
-	{ blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* UR */
+	{ blk_exp, MAN_BSCOPE }, /* UR */
 	{ blk_close, MAN_BSCOPE }, /* UE */
 	{ in_line_eoln, 0 }, /* ll */
 };
@@ -125,7 +125,7 @@ man_unscope(struct man *man, const struct man_node *to
 				continue;
 			}
 			if (n->type == MAN_BLOCK &&
-			    man_macros[n->tok].flags & MAN_EXPLICIT)
+			    man_macros[n->tok].fp == blk_exp)
 				mandoc_msg(MANDOCERR_BLK_NOEND,
 				    man->parse, n->line, n->pos,
 				    man_macronames[n->tok]);
@@ -190,7 +190,7 @@ rew_dohalt(enum mant tok, enum man_type type, const st
 
 	/* First: rewind to ourselves. */
 	if (type == n->type && tok == n->tok) {
-		if (MAN_EXPLICIT & man_macros[n->tok].flags)
+		if (man_macros[n->tok].fp == blk_exp)
 			return(REW_HALT);
 		else
 			return(REW_REWIND);
@@ -337,31 +337,25 @@ blk_close(MACRO_PROT_ARGS)
 void
 blk_exp(MACRO_PROT_ARGS)
 {
-	struct man_node	*n;
-	int		 la;
+	struct man_node	*head;
 	char		*p;
+	int		 la;
 
 	rew_scope(MAN_BLOCK, man, tok);
 	man_block_alloc(man, line, ppos, tok);
 	man_head_alloc(man, line, ppos, tok);
+	head = man->last;
 
-	for (;;) {
-		la = *pos;
-		if ( ! man_args(man, line, pos, buf, &p))
-			break;
+	la = *pos;
+	if (man_args(man, line, pos, buf, &p))
 		man_word_alloc(man, line, la, p);
-	}
 
-	assert(man);
-	assert(tok != MAN_MAX);
+	if (buf[*pos] != '\0')
+		mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+		    man->parse, line, *pos, "%s ... %s",
+		    man_macronames[tok], buf + *pos);
 
-	for (n = man->last; n; n = n->parent)
-		if (n->tok == tok) {
-			assert(n->type == MAN_HEAD);
-			man_unscope(man, n);
-			break;
-		}
-
+	man_unscope(man, head);
 	man_body_alloc(man, line, ppos, tok);
 }
 
@@ -393,18 +387,20 @@ blk_imp(MACRO_PROT_ARGS)
 		man_word_alloc(man, line, la, p);
 	}
 
-	/* Close out head and open body (unless MAN_SCOPE). */
+	/*
+	 * For macros having optional next-line scope,
+	 * keep the head open if there were no arguments.
+	 * For `TP', always keep the head open.
+	 */
 
-	if (man_macros[tok].flags & MAN_SCOPED) {
-		/* If we're forcing scope (`TP'), keep it open. */
-		if (man_macros[tok].flags & MAN_FSCOPED) {
-			man->flags |= MAN_BLINE;
-			return;
-		} else if (n == man->last) {
-			man->flags |= MAN_BLINE;
-			return;
-		}
+	if (man_macros[tok].flags & MAN_SCOPED &&
+	    (tok == MAN_TP || n == man->last)) {
+		man->flags |= MAN_BLINE;
+		return;
 	}
+
+	/* Close out the head and open the body. */
+
 	rew_scope(MAN_HEAD, man, tok);
 	man_body_alloc(man, line, ppos, tok);
 }
@@ -424,6 +420,13 @@ in_line_eoln(MACRO_PROT_ARGS)
 		    tok == MAN_fi || tok == MAN_nf)) {
 			mandoc_vmsg(MANDOCERR_ARG_SKIP,
 			    man->parse, line, *pos, "%s %s",
+			    man_macronames[tok], buf + *pos);
+			break;
+		}
+		if (buf[*pos] != '\0' && man->last != n &&
+		    (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) {
+			mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+			    man->parse, line, *pos, "%s ... %s",
 			    man_macronames[tok], buf + *pos);
 			break;
 		}