===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.57
retrieving revision 1.140
diff -u -p -r1.57 -r1.140
--- mandoc/man.c	2010/03/27 10:26:39	1.57
+++ mandoc/man.c	2014/10/20 02:33:06	1.140
@@ -1,6 +1,8 @@
-/*	$Id: man.c,v 1.57 2010/03/27 10:26:39 kristaps Exp $ */
+/*	$Id: man.c,v 1.140 2014/10/20 02:33:06 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,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>
 
@@ -27,82 +27,55 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "man.h"
+#include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libman.h"
 #include "libmandoc.h"
 
-const	char *const __man_merrnames[WERRMAX] = {		 
-	"invalid character", /* WNPRINT */
-	"invalid manual section", /* WMSEC */
-	"invalid date format", /* WDATE */
-	"scope of prior line violated", /* WLNSCOPE */
-	"over-zealous prior line scope violation", /* WLNSCOPE2 */
-	"trailing whitespace", /* WTSPACE */
-	"unterminated quoted parameter", /* WTQUOTE */
-	"document has no body", /* WNODATA */
-	"document has no title/section", /* WNOTITLE */
-	"invalid escape sequence", /* WESCAPE */
-	"invalid number format", /* WNUMFMT */
-	"expected block head arguments", /* WHEADARGS */
-	"expected block body arguments", /* WBODYARGS */
-	"expected empty block head", /* WNHEADARGS */
-	"ill-formed macro", /* WMACROFORM */
-	"scope open on exit", /* WEXITSCOPE */
-	"no scope context", /* WNOSCOPE */
-	"literal context already open", /* WOLITERAL */
-	"no literal context open", /* WNLITERAL */
-	"invalid nesting of roff declarations", /* WROFFNEST */
-	"scope in roff instructions broken", /* WROFFSCOPE */
-	"document title should be uppercase", /* WTITLECASE */
-};
-
-const	char *const __man_macronames[MAN_MAX] = {		 
+const	char *const __man_macronames[MAN_MAX] = {
 	"br",		"TH",		"SH",		"SS",
-	"TP", 		"LP",		"PP",		"P",
+	"TP",		"LP",		"PP",		"P",
 	"IP",		"HP",		"SM",		"SB",
 	"BI",		"IB",		"BR",		"RB",
 	"R",		"B",		"I",		"IR",
-	"RI",		"na",		"i",		"sp",
-	"nf",		"fi",		"r",		"RE",
-	"RS",		"DT",		"UC",		"PD",
-	"Sp",		"Vb",		"Ve",		"de",
-	"dei",		"am",		"ami",		"ig",
-	".",
+	"RI",		"na",		"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	struct man_node	*man_node_alloc(int, int, 
+static	struct man_node	*man_node_alloc(struct man *, int, int,
 				enum man_type, enum mant);
-static	int		 man_node_append(struct man *, 
+static	int		 man_node_append(struct man *,
 				struct man_node *);
 static	void		 man_node_free(struct man_node *);
-static	void		 man_node_unlink(struct man *, 
+static	void		 man_node_unlink(struct man *,
 				struct man_node *);
-static	int		 man_ptext(struct man *, int, char *);
-static	int		 man_pmacro(struct man *, int, char *);
+static	int		 man_ptext(struct man *, int, char *, int);
+static	int		 man_pmacro(struct man *, int, char *, int);
 static	void		 man_free1(struct man *);
 static	void		 man_alloc1(struct man *);
-static	int		 pstring(struct man *, int, int, 
-				const char *, size_t);
-static	int		 macrowarn(struct man *, int, const char *);
+static	int		 man_descope(struct man *, int, int);
 
 
 const struct man_node *
-man_node(const struct man *m)
+man_node(const struct man *man)
 {
 
-	return(MAN_HALT & m->flags ? NULL : m->first);
+	return(man->first);
 }
 
-
 const struct man_meta *
-man_meta(const struct man *m)
+man_meta(const struct man *man)
 {
 
-	return(MAN_HALT & m->flags ? NULL : &m->meta);
+	return(&man->meta);
 }
 
-
 void
 man_reset(struct man *man)
 {
@@ -111,7 +84,6 @@ man_reset(struct man *man)
 	man_alloc1(man);
 }
 
-
 void
 man_free(struct man *man)
 {
@@ -120,49 +92,40 @@ man_free(struct man *man)
 	free(man);
 }
 
-
 struct man *
-man_alloc(void *data, int pflags, const struct man_cb *cb)
+man_alloc(struct roff *roff, struct mparse *parse, int quick)
 {
 	struct man	*p;
 
 	p = mandoc_calloc(1, sizeof(struct man));
 
-	if (cb)
-		memcpy(&p->cb, cb, sizeof(struct man_cb));
-
 	man_hash_init();
-	p->data = data;
-	p->pflags = pflags;
+	p->parse = parse;
+	p->quick = quick;
+	p->roff = roff;
 
 	man_alloc1(p);
 	return(p);
 }
 
-
 int
-man_endparse(struct man *m)
+man_endparse(struct man *man)
 {
 
-	if (MAN_HALT & m->flags)
-		return(0);
-	else if (man_macroend(m))
-		return(1);
-	m->flags |= MAN_HALT;
-	return(0);
+	return(man_macroend(man));
 }
 
-
 int
-man_parseln(struct man *m, int ln, char *buf)
+man_parseln(struct man *man, int ln, char *buf, int offs)
 {
 
-	return('.' == *buf || '\'' == *buf ? 
-			man_pmacro(m, ln, buf) : 
-			man_ptext(m, ln, buf));
+	man->flags |= MAN_NEWLINE;
+
+	return (roff_getcontrol(man->roff, buf, &offs) ?
+	    man_pmacro(man, ln, buf, offs) :
+	    man_ptext(man, ln, buf, offs));
 }
 
-
 static void
 man_free1(struct man *man)
 {
@@ -173,22 +136,25 @@ man_free1(struct man *man)
 		free(man->meta.title);
 	if (man->meta.source)
 		free(man->meta.source);
+	if (man->meta.date)
+		free(man->meta.date);
 	if (man->meta.vol)
 		free(man->meta.vol);
+	if (man->meta.msec)
+		free(man->meta.msec);
 }
 
-
 static void
-man_alloc1(struct man *m)
+man_alloc1(struct man *man)
 {
 
-	memset(&m->meta, 0, sizeof(struct man_meta));
-	m->flags = 0;
-	m->last = mandoc_calloc(1, sizeof(struct man_node));
-	m->first = m->last;
-	m->last->type = MAN_ROOT;
-	m->last->tok = MAN_MAX;
-	m->next = MAN_NEXT_CHILD;
+	memset(&man->meta, 0, sizeof(struct man_meta));
+	man->flags = 0;
+	man->last = mandoc_calloc(1, sizeof(struct man_node));
+	man->first = man->last;
+	man->last->type = MAN_ROOT;
+	man->last->tok = MAN_MAX;
+	man->next = MAN_NEXT_CHILD;
 }
 
 
@@ -201,12 +167,12 @@ man_node_append(struct man *man, struct man_node *p)
 	assert(MAN_ROOT != p->type);
 
 	switch (man->next) {
-	case (MAN_NEXT_SIBLING):
+	case MAN_NEXT_SIBLING:
 		man->last->next = p;
 		p->prev = man->last;
 		p->parent = man->last->parent;
 		break;
-	case (MAN_NEXT_CHILD):
+	case MAN_NEXT_CHILD:
 		man->last->child = p;
 		p->parent = man->last;
 		break;
@@ -214,20 +180,25 @@ man_node_append(struct man *man, struct man_node *p)
 		abort();
 		/* NOTREACHED */
 	}
-	
+
 	assert(p->parent);
 	p->parent->nchild++;
 
-	if ( ! man_valid_pre(man, p))
-		return(0);
-
 	switch (p->type) {
-	case (MAN_HEAD):
+	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;
 		break;
-	case (MAN_BODY):
+	case MAN_TAIL:
 		assert(MAN_BLOCK == p->parent->type);
+		p->parent->tail = p;
+		break;
+	case MAN_BODY:
+		assert(MAN_BLOCK == p->parent->type);
 		p->parent->body = p;
 		break;
 	default:
@@ -237,11 +208,11 @@ man_node_append(struct man *man, struct man_node *p)
 	man->last = p;
 
 	switch (p->type) {
-	case (MAN_TEXT):
+	case MAN_TBL:
+		/* FALLTHROUGH */
+	case MAN_TEXT:
 		if ( ! man_valid_post(man))
 			return(0);
-		if ( ! man_action_post(man))
-			return(0);
 		break;
 	default:
 		break;
@@ -250,9 +221,9 @@ man_node_append(struct man *man, struct man_node *p)
 	return(1);
 }
 
-
 static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
+man_node_alloc(struct man *man, int line, int pos,
+		enum man_type type, enum mant tok)
 {
 	struct man_node *p;
 
@@ -261,91 +232,88 @@ man_node_alloc(int line, int pos, enum man_type type, 
 	p->pos = pos;
 	p->type = type;
 	p->tok = tok;
+
+	if (MAN_NEWLINE & man->flags)
+		p->flags |= MAN_LINE;
+	man->flags &= ~MAN_NEWLINE;
 	return(p);
 }
 
-
 int
-man_elem_alloc(struct man *m, int line, int pos, enum mant tok)
+man_elem_alloc(struct man *man, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_ELEM, tok);
-	if ( ! man_node_append(m, p))
+	p = man_node_alloc(man, line, pos, MAN_ELEM, tok);
+	if ( ! man_node_append(man, p))
 		return(0);
-	m->next = MAN_NEXT_CHILD;
+	man->next = MAN_NEXT_CHILD;
 	return(1);
 }
 
-
 int
-man_head_alloc(struct man *m, int line, int pos, enum mant tok)
+man_tail_alloc(struct man *man, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_HEAD, tok);
-	if ( ! man_node_append(m, p))
+	p = man_node_alloc(man, line, pos, MAN_TAIL, tok);
+	if ( ! man_node_append(man, p))
 		return(0);
-	m->next = MAN_NEXT_CHILD;
+	man->next = MAN_NEXT_CHILD;
 	return(1);
 }
 
-
 int
-man_body_alloc(struct man *m, int line, int pos, enum mant tok)
+man_head_alloc(struct man *man, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_BODY, tok);
-	if ( ! man_node_append(m, p))
+	p = man_node_alloc(man, line, pos, MAN_HEAD, tok);
+	if ( ! man_node_append(man, p))
 		return(0);
-	m->next = MAN_NEXT_CHILD;
+	man->next = MAN_NEXT_CHILD;
 	return(1);
 }
 
-
 int
-man_block_alloc(struct man *m, int line, int pos, enum mant tok)
+man_body_alloc(struct man *man, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_BLOCK, tok);
-	if ( ! man_node_append(m, p))
+	p = man_node_alloc(man, line, pos, MAN_BODY, tok);
+	if ( ! man_node_append(man, p))
 		return(0);
-	m->next = MAN_NEXT_CHILD;
+	man->next = MAN_NEXT_CHILD;
 	return(1);
 }
 
-
-static int
-pstring(struct man *m, int line, int pos, 
-		const char *p, size_t len)
+int
+man_block_alloc(struct man *man, int line, int pos, enum mant tok)
 {
-	struct man_node	*n;
-	size_t		 sv;
+	struct man_node *p;
 
-	n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX);
-	n->string = mandoc_malloc(len + 1);
-	sv = strlcpy(n->string, p, len + 1);
-
-	/* Prohibit truncation. */
-	assert(sv < len + 1);
-
-	if ( ! man_node_append(m, n))
+	p = man_node_alloc(man, line, pos, MAN_BLOCK, tok);
+	if ( ! man_node_append(man, p))
 		return(0);
-	m->next = MAN_NEXT_SIBLING;
+	man->next = MAN_NEXT_CHILD;
 	return(1);
 }
 
-
 int
-man_word_alloc(struct man *m, int line, int pos, const char *word)
+man_word_alloc(struct man *man, int line, int pos, const char *word)
 {
+	struct man_node	*n;
 
-	return(pstring(m, line, pos, word, strlen(word)));
-}
+	n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX);
+	n->string = roff_strdup(man->roff, word);
 
+	if ( ! man_node_append(man, n))
+		return(0);
 
+	man->next = MAN_NEXT_SIBLING;
+	return(1);
+}
+
 /*
  * Free all of the resources held by a node.  This does NOT unlink a
  * node from its context; for that, see man_node_unlink().
@@ -359,340 +327,286 @@ man_node_free(struct man_node *p)
 	free(p);
 }
 
-
 void
-man_node_delete(struct man *m, struct man_node *p)
+man_node_delete(struct man *man, struct man_node *p)
 {
 
 	while (p->child)
-		man_node_delete(m, p->child);
+		man_node_delete(man, p->child);
 
-	man_node_unlink(m, p);
+	man_node_unlink(man, p);
 	man_node_free(p);
 }
 
-
-static int
-man_ptext(struct man *m, int line, char *buf)
+int
+man_addeqn(struct man *man, const struct eqn *ep)
 {
-	int		 i, j;
-	char		 sv;
+	struct man_node	*n;
 
-	/* Literal free-form text whitespace is preserved. */
+	n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
+	n->eqn = ep;
+	if (ep->ln > man->last->line)
+		n->flags |= MAN_LINE;
 
-	if (MAN_LITERAL & m->flags) {
-		if ( ! man_word_alloc(m, line, 0, buf))
-			return(0);
-		goto descope;
-	}
+	if ( ! man_node_append(man, n))
+		return(0);
 
-	/* First de-chunk and allocate words. */
+	man->next = MAN_NEXT_SIBLING;
+	return(man_descope(man, ep->ln, ep->pos));
+}
 
-	for (i = 0; ' ' == buf[i]; i++)
-		/* Skip leading whitespace. */ ;
+int
+man_addspan(struct man *man, const struct tbl_span *sp)
+{
+	struct man_node	*n;
 
-	if ('\0' == buf[i]) {
-		/* Trailing whitespace? */
-		if (i && ' ' == buf[i - 1])
-			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
-				return(0);
-		if ( ! pstring(m, line, 0, &buf[i], 0))
-			return(0);
-		goto descope;
-	}
+	n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
+	n->span = sp;
 
-	for (j = i; buf[i]; i++) {
-		if (' ' != buf[i])
-			continue;
-
-		/* Escaped whitespace. */
-		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
-			continue;
-
-		sv = buf[i];
-		buf[i++] = '\0';
-
-		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
-			return(0);
-
-		/* Trailing whitespace?  Check at overwritten byte. */
-
-		if (' ' == sv && '\0' == buf[i])
-			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
-				return(0);
-
-		for ( ; ' ' == buf[i]; i++)
-			/* Skip trailing whitespace. */ ;
-
-		j = i;
-
-		/* Trailing whitespace? */
-
-		if (' ' == buf[i - 1] && '\0' == buf[i])
-			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
-				return(0);
-
-		if ('\0' == buf[i])
-			break;
-	}
-
-	if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+	if ( ! man_node_append(man, n))
 		return(0);
 
-descope:
+	man->next = MAN_NEXT_SIBLING;
+	return(man_descope(man, sp->line, 0));
+}
 
+static int
+man_descope(struct man *man, int line, int offs)
+{
 	/*
 	 * Co-ordinate what happens with having a next-line scope open:
 	 * first close out the element scope (if applicable), then close
 	 * out the block scope (also if applicable).
 	 */
 
-	if (MAN_ELINE & m->flags) {
-		m->flags &= ~MAN_ELINE;
-		if ( ! man_unscope(m, m->last->parent, WERRMAX))
+	if (MAN_ELINE & man->flags) {
+		man->flags &= ~MAN_ELINE;
+		if ( ! man_unscope(man, man->last->parent))
 			return(0);
 	}
 
-	if ( ! (MAN_BLINE & m->flags))
+	if ( ! (MAN_BLINE & man->flags))
 		return(1);
-	m->flags &= ~MAN_BLINE;
+	man->flags &= ~MAN_BLINE;
 
-	if ( ! man_unscope(m, m->last->parent, WERRMAX))
+	if ( ! man_unscope(man, man->last->parent))
 		return(0);
-	return(man_body_alloc(m, line, 0, m->last->tok));
+	return(man_body_alloc(man, line, offs, man->last->tok));
 }
 
-
 static int
-macrowarn(struct man *m, int ln, const char *buf)
+man_ptext(struct man *man, int line, char *buf, int offs)
 {
-	if ( ! (MAN_IGN_MACRO & m->pflags))
-		return(man_verr(m, ln, 0, 
-				"unknown macro: %s%s", 
-				buf, strlen(buf) > 3 ? "..." : ""));
-	return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
-				buf, strlen(buf) > 3 ? "..." : ""));
-}
+	int		 i;
 
+	/* Literal free-form text whitespace is preserved. */
 
-int
-man_pmacro(struct man *m, int ln, char *buf)
-{
-	int		 i, j, ppos, fl;
-	enum mant	 tok;
-	char		 mac[5];
-	struct man_node	*n;
+	if (MAN_LITERAL & man->flags) {
+		if ( ! man_word_alloc(man, line, offs, buf + offs))
+			return(0);
+		return(man_descope(man, line, offs));
+	}
 
-	/* Comments and empties are quickly ignored. */
+	for (i = offs; ' ' == buf[i]; i++)
+		/* Skip leading whitespace. */ ;
 
-	fl = m->flags;
+	/*
+	 * Blank lines are ignored right after headings
+	 * but add a single vertical space elsewhere.
+	 */
 
-	if ('\0' == buf[1])
+	if ('\0' == buf[i]) {
+		/* Allocate a blank entry. */
+		if (MAN_SH != man->last->tok &&
+		    MAN_SS != man->last->tok) {
+			if ( ! man_elem_alloc(man, line, offs, MAN_sp))
+				return(0);
+			man->next = MAN_NEXT_SIBLING;
+		}
 		return(1);
+	}
 
-	i = 1;
-
 	/*
-	 * Skip whitespace between the control character and initial
-	 * text.  "Whitespace" is both spaces and tabs.
+	 * Warn if the last un-escaped character is whitespace. Then
+	 * strip away the remaining spaces (tabs stay!).
 	 */
-	if (' ' == buf[i] || '\t' == buf[i]) {
-		i++;
-		while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
-			i++;
-		if ('\0' == buf[i])
-			goto out;
-	}
 
-	ppos = i;
+	i = (int)strlen(buf);
+	assert(i);
 
-	/* Copy the first word into a nil-terminated buffer. */
+	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+		if (i > 1 && '\\' != buf[i - 2])
+			mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+			    line, i - 1, NULL);
 
-	for (j = 0; j < 4; j++, i++) {
-		if ('\0' == (mac[j] = buf[i]))
-			break;
-		else if (' ' == buf[i])
-			break;
+		for (--i; i && ' ' == buf[i]; i--)
+			/* Spin back to non-space. */ ;
 
-		/* Check for invalid characters. */
+		/* Jump ahead of escaped whitespace. */
+		i += '\\' == buf[i] ? 2 : 1;
 
-		if (isgraph((u_char)buf[i]))
-			continue;
-		return(man_perr(m, ln, i, WNPRINT));
+		buf[i] = '\0';
 	}
 
-	mac[j] = '\0';
+	if ( ! man_word_alloc(man, line, offs, buf + offs))
+		return(0);
 
-	if (j == 4 || j < 1) {
-		if ( ! (MAN_IGN_MACRO & m->pflags)) {
-			(void)man_perr(m, ln, ppos, WMACROFORM);
-			goto err;
-		} 
-		if ( ! man_pwarn(m, ln, ppos, WMACROFORM))
-			goto err;
-		return(1);
-	}
-	
-	if (MAN_MAX == (tok = man_hash_find(mac))) {
-		if ( ! macrowarn(m, ln, mac))
-			goto err;
-		return(1);
-	}
+	/*
+	 * End-of-sentence check.  If the last character is an unescaped
+	 * EOS character, then flag the node as being the end of a
+	 * sentence.  The front-end will know how to interpret this.
+	 */
 
-	/* The macro is sane.  Jump to the next word. */
+	assert(i);
+	if (mandoc_eos(buf, (size_t)i))
+		man->last->flags |= MAN_EOS;
 
-	while (buf[i] && ' ' == buf[i])
-		i++;
+	return(man_descope(man, line, offs));
+}
 
-	/* Trailing whitespace? */
+static int
+man_pmacro(struct man *man, int ln, char *buf, int offs)
+{
+	char		 mac[5];
+	struct man_node	*n;
+	enum mant	 tok;
+	int		 i, ppos;
+	int		 bline;
 
-	if ('\0' == buf[i] && ' ' == buf[i - 1])
-		if ( ! man_pwarn(m, ln, i - 1, WTSPACE))
-			goto err;
+	ppos = offs;
 
-	/* 
-	 * Remove prior ELINE macro, as it's being clobbering by a new
-	 * macro.  Note that NSCOPED macros do not close out ELINE
-	 * macros---they don't print text---so we let those slip by.
+	/*
+	 * Copy the first word into a nil-terminated buffer.
+	 * Stop copying when a tab, space, or eoln is encountered.
 	 */
 
-	if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
-			m->flags & MAN_ELINE) {
-		assert(MAN_TEXT != m->last->type);
+	i = 0;
+	while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] &&
+	    '\t' != buf[offs])
+		mac[i++] = buf[offs++];
 
-		/*
-		 * This occurs in the following construction:
-		 *   .B
-		 *   .br
-		 *   .B
-		 *   .br
-		 *   I hate man macros.
-		 * Flat-out disallow this madness.
-		 */
-		if (MAN_NSCOPED & man_macros[m->last->tok].flags)
-			return(man_perr(m, ln, ppos, WLNSCOPE));
+	mac[i] = '\0';
 
-		n = m->last;
+	tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
 
-		assert(n);
-		assert(NULL == n->child);
-		assert(0 == n->nchild);
-
-		if ( ! man_nwarn(m, n, WLNSCOPE))
-			return(0);
-
-		man_node_delete(m, n);
-		m->flags &= ~MAN_ELINE;
+	if (MAN_MAX == tok) {
+		mandoc_msg(MANDOCERR_MACRO, man->parse,
+		    ln, ppos, buf + ppos - 1);
+		return(1);
 	}
 
-	/* Begin recursive parse sequence. */
+	/* The macro is sane.  Jump to the next word. */
 
-	assert(man_macros[tok].fp);
+	while (buf[offs] && ' ' == buf[offs])
+		offs++;
 
-	if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
-		goto err;
-
-out:
-	/* 
-	 * We weren't in a block-line scope when entering the
-	 * above-parsed macro, so return.
-	 *
-	 * FIXME: this prohibits the nesting of blocks (e.g., `de' and
-	 * family) within BLINE or ELINE systems.  This is annoying.
+	/*
+	 * Trailing whitespace.  Note that tabs are allowed to be passed
+	 * into the parser as "text", so we only warn about spaces here.
 	 */
 
-	if ( ! (MAN_BLINE & fl)) {
-		m->flags &= ~MAN_ILINE; 
-		return(1);
-	}
+	if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+		mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+		    ln, offs - 1, NULL);
 
 	/*
-	 * If we're in a block scope, then allow this macro to slip by
-	 * without closing scope around it.
+	 * Remove prior ELINE macro, as it's being clobbered by a new
+	 * macro.  Note that NSCOPED macros do not close out ELINE
+	 * macros---they don't print text---so we let those slip by.
 	 */
 
-	if (MAN_ILINE & m->flags) {
-		m->flags &= ~MAN_ILINE;
-		return(1);
-	}
+	if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
+			man->flags & MAN_ELINE) {
+		n = man->last;
+		assert(MAN_TEXT != n->type);
 
-	/* 
-	 * If we've opened a new next-line element scope, then return
-	 * now, as the next line will close out the block scope.
-	 */
+		/* Remove repeated NSCOPED macros causing ELINE. */
 
-	if (MAN_ELINE & m->flags)
-		return(1);
+		if (MAN_NSCOPED & man_macros[n->tok].flags)
+			n = n->parent;
 
-	/* Close out the block scope opened in the prior line.  */
+		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
+		    n->pos, "%s breaks %s", man_macronames[tok],
+		    man_macronames[n->tok]);
 
-	assert(MAN_BLINE & m->flags);
-	m->flags &= ~MAN_BLINE;
+		man_node_delete(man, n);
+		man->flags &= ~MAN_ELINE;
+	}
 
-	if ( ! man_unscope(m, m->last->parent, WERRMAX))
-		return(0);
-	return(man_body_alloc(m, ln, 0, m->last->tok));
+	/*
+	 * Remove prior BLINE macro that is being clobbered.
+	 */
+	if ((man->flags & MAN_BLINE) &&
+	    (MAN_BSCOPE & man_macros[tok].flags)) {
+		n = man->last;
 
-err:	/* Error out. */
+		/* Might be a text node like 8 in
+		 * .TP 8
+		 * .SH foo
+		 */
+		if (MAN_TEXT == n->type)
+			n = n->parent;
 
-	m->flags |= MAN_HALT;
-	return(0);
-}
+		/* Remove element that didn't end BLINE, if any. */
+		if ( ! (MAN_BSCOPE & man_macros[n->tok].flags))
+			n = n->parent;
 
+		assert(MAN_HEAD == n->type);
+		n = n->parent;
+		assert(MAN_BLOCK == n->type);
+		assert(MAN_SCOPED & man_macros[n->tok].flags);
 
-int
-man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-	char		 buf[256];
-	va_list		 ap;
+		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
+		    n->pos, "%s breaks %s", man_macronames[tok],
+		    man_macronames[n->tok]);
 
-	if (NULL == man->cb.man_err)
-		return(0);
+		man_node_delete(man, n);
+		man->flags &= ~MAN_BLINE;
+	}
 
-	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-	va_end(ap);
-	return((*man->cb.man_err)(man->data, ln, pos, buf));
-}
+	/* Remember whether we are in next-line scope for a block head. */
 
+	bline = man->flags & MAN_BLINE;
 
-int
-man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-	char		 buf[256];
-	va_list		 ap;
+	/* Call to handler... */
 
-	if (NULL == man->cb.man_warn)
+	assert(man_macros[tok].fp);
+	if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
 		return(0);
 
-	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-	va_end(ap);
-	return((*man->cb.man_warn)(man->data, ln, pos, buf));
-}
+	/* In quick mode (for mandocdb), abort after the NAME section. */
 
+	if (man->quick && MAN_SH == tok) {
+		n = man->last;
+		if (MAN_BODY == n->type &&
+		    strcmp(n->prev->child->string, "NAME"))
+			return(2);
+	}
 
-int
-man_err(struct man *m, int line, int pos, int iserr, enum merr type)
-{
-	const char	 *p;
-	
-	p = __man_merrnames[(int)type];
-	assert(p);
+	/*
+	 * 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 (iserr)
-		return(man_verr(m, line, pos, p));
+	if ( ! bline || man->flags & MAN_ELINE ||
+	    man_macros[tok].flags & MAN_NSCOPED)
+		return(1);
 
-	return(man_vwarn(m, line, pos, p));
+	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));
 }
 
-
 /*
- * Unlink a node from its context.  If "m" is provided, the last parse
+ * Unlink a node from its context.  If "man" is provided, the last parse
  * point will also be adjusted accordingly.
  */
 static void
-man_node_unlink(struct man *m, struct man_node *n)
+man_node_unlink(struct man *man, struct man_node *n)
 {
 
 	/* Adjust siblings. */
@@ -712,18 +626,72 @@ man_node_unlink(struct man *m, struct man_node *n)
 
 	/* Adjust parse point, if applicable. */
 
-	if (m && m->last == n) {
+	if (man && man->last == n) {
 		/*XXX: this can occur when bailing from validation. */
 		/*assert(NULL == n->next);*/
 		if (n->prev) {
-			m->last = n->prev;
-			m->next = MAN_NEXT_SIBLING;
+			man->last = n->prev;
+			man->next = MAN_NEXT_SIBLING;
 		} else {
-			m->last = n->parent;
-			m->next = MAN_NEXT_CHILD;
+			man->last = n->parent;
+			man->next = MAN_NEXT_CHILD;
 		}
 	}
 
-	if (m && m->first == n)
-		m->first = NULL;
+	if (man && man->first == n)
+		man->first = NULL;
+}
+
+const struct mparse *
+man_mparse(const struct man *man)
+{
+
+	assert(man && man->parse);
+	return(man->parse);
+}
+
+void
+man_deroff(char **dest, const struct man_node *n)
+{
+	char	*cp;
+	size_t	 sz;
+
+	if (MAN_TEXT != n->type) {
+		for (n = n->child; n; n = n->next)
+			man_deroff(dest, n);
+		return;
+	}
+
+	/* Skip leading whitespace and escape sequences. */
+
+	cp = n->string;
+	while ('\0' != *cp) {
+		if ('\\' == *cp) {
+			cp++;
+			mandoc_escape((const char **)&cp, NULL, NULL);
+		} else if (isspace((unsigned char)*cp))
+			cp++;
+		else
+			break;
+	}
+
+	/* Skip trailing whitespace. */
+
+	for (sz = strlen(cp); sz; sz--)
+		if (0 == isspace((unsigned char)cp[sz-1]))
+			break;
+
+	/* Skip empty strings. */
+
+	if (0 == sz)
+		return;
+
+	if (NULL == *dest) {
+		*dest = mandoc_strndup(cp, sz);
+		return;
+	}
+
+	mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+	free(*dest);
+	*dest = cp;
 }