===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.133
retrieving revision 1.138
diff -u -p -r1.133 -r1.138
--- mandoc/man.c	2014/07/07 21:36:20	1.133
+++ mandoc/man.c	2014/08/10 23:54:41	1.138
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.133 2014/07/07 21:36:20 schwarze Exp $ */
+/*	$Id: man.c,v 1.138 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,9 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -68,7 +66,6 @@ const struct man_node *
 man_node(const struct man *man)
 {
 
-	assert( ! (MAN_HALT & man->flags));
 	return(man->first);
 }
 
@@ -76,7 +73,6 @@ const struct man_meta *
 man_meta(const struct man *man)
 {
 
-	assert( ! (MAN_HALT & man->flags));
 	return(&man->meta);
 }
 
@@ -116,11 +112,7 @@ int
 man_endparse(struct man *man)
 {
 
-	assert( ! (MAN_HALT & man->flags));
-	if (man_macroend(man))
-		return(1);
-	man->flags |= MAN_HALT;
-	return(0);
+	return(man_macroend(man));
 }
 
 int
@@ -129,8 +121,6 @@ man_parseln(struct man *man, int ln, char *buf, int of
 
 	man->flags |= MAN_NEWLINE;
 
-	assert( ! (MAN_HALT & man->flags));
-
 	return (roff_getcontrol(man->roff, buf, &offs) ?
 	    man_pmacro(man, ln, buf, offs) :
 	    man_ptext(man, ln, buf, offs));
@@ -194,10 +184,11 @@ man_node_append(struct man *man, struct man_node *p)
 	assert(p->parent);
 	p->parent->nchild++;
 
-	if ( ! man_valid_pre(man, p))
-		return(0);
-
 	switch (p->type) {
+	case MAN_BLOCK:
+		if (p->tok == MAN_SH || p->tok == MAN_SS)
+			man->flags &= ~MAN_LITERAL;
+		break;
 	case MAN_HEAD:
 		assert(MAN_BLOCK == p->parent->type);
 		p->parent->head = p;
@@ -352,8 +343,6 @@ man_addeqn(struct man *man, const struct eqn *ep)
 {
 	struct man_node	*n;
 
-	assert( ! (MAN_HALT & man->flags));
-
 	n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
 	n->eqn = ep;
 
@@ -369,8 +358,6 @@ man_addspan(struct man *man, const struct tbl_span *sp
 {
 	struct man_node	*n;
 
-	assert( ! (MAN_HALT & man->flags));
-
 	n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
 	n->span = sp;
 
@@ -478,10 +465,11 @@ man_ptext(struct man *man, int line, char *buf, int of
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {
-	int		 i, ppos;
-	enum mant	 tok;
 	char		 mac[5];
 	struct man_node	*n;
+	enum mant	 tok;
+	int		 i, ppos;
+	int		 bline;
 
 	if ('"' == buf[offs]) {
 		mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
@@ -507,8 +495,8 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 	tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
 
 	if (MAN_MAX == tok) {
-		mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln, ppos,
-		    "%s", buf + ppos - 1);
+		mandoc_msg(MANDOCERR_MACRO, man->parse,
+		    ln, ppos, buf + ppos - 1);
 		return(1);
 	}
 
@@ -581,20 +569,15 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 		man->flags &= ~MAN_BLINE;
 	}
 
-	/*
-	 * Save the fact that we're in the next-line for a block.  In
-	 * this way, embedded roff instructions can "remember" state
-	 * when they exit.
-	 */
+	/* Remember whether we are in next-line scope for a block head. */
 
-	if (MAN_BLINE & man->flags)
-		man->flags |= MAN_BPLINE;
+	bline = man->flags & MAN_BLINE;
 
 	/* Call to handler... */
 
 	assert(man_macros[tok].fp);
 	if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
-		goto err;
+		return(0);
 
 	/* In quick mode (for mandocdb), abort after the NAME section. */
 
@@ -606,47 +589,21 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 	}
 
 	/*
-	 * We weren't in a block-line scope when entering the
-	 * above-parsed macro, so return.
+	 * If we are in a next-line scope for a block head,
+	 * close it out now and switch to the body,
+	 * unless the next-line scope is allowed to continue.
 	 */
 
-	if ( ! (MAN_BPLINE & man->flags)) {
-		man->flags &= ~MAN_ILINE;
+	if ( ! bline || man->flags & MAN_ELINE ||
+	    man_macros[tok].flags & MAN_NSCOPED)
 		return(1);
-	}
-	man->flags &= ~MAN_BPLINE;
 
-	/*
-	 * If we're in a block scope, then allow this macro to slip by
-	 * without closing scope around it.
-	 */
-
-	if (MAN_ILINE & man->flags) {
-		man->flags &= ~MAN_ILINE;
-		return(1);
-	}
-
-	/*
-	 * If we've opened a new next-line element scope, then return
-	 * now, as the next line will close out the block scope.
-	 */
-
-	if (MAN_ELINE & man->flags)
-		return(1);
-
-	/* Close out the block scope opened in the prior line.  */
-
 	assert(MAN_BLINE & man->flags);
 	man->flags &= ~MAN_BLINE;
 
 	if ( ! man_unscope(man, man->last->parent))
 		return(0);
 	return(man_body_alloc(man, ln, ppos, man->last->tok));
-
-err:	/* Error out. */
-
-	man->flags |= MAN_HALT;
-	return(0);
 }
 
 /*