===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.221
retrieving revision 1.250
diff -u -p -r1.221 -r1.250
--- mandoc/mdoc.c	2014/07/30 21:18:24	1.221
+++ mandoc/mdoc.c	2015/04/19 14:57:38	1.250
@@ -1,23 +1,21 @@
-/*	$Id: mdoc.c,v 1.221 2014/07/30 21:18:24 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.250 2015/04/19 14:57:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * 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>
 
@@ -29,13 +27,16 @@
 #include <string.h>
 #include <time.h>
 
-#include "mdoc.h"
-#include "mandoc.h"
 #include "mandoc_aux.h"
-#include "libmdoc.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
 #include "libmandoc.h"
+#include "roff_int.h"
+#include "libmdoc.h"
 
 const	char *const __mdoc_macronames[MDOC_MAX + 1] = {
+	"text",
 	"Ap",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
 	"Dl",		"Bd",		"Ed",		"Bl",
@@ -66,8 +67,8 @@ const	char *const __mdoc_macronames[MDOC_MAX + 1] = {
 	"Lk",		"Mt",		"Brq",		"Bro",
 	"Brc",		"%C",		"Es",		"En",
 	"Dx",		"%Q",		"br",		"sp",
-	"%U",		"Ta",		"ll",		"text",
-	};
+	"%U",		"Ta",		"ll",
+};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {
 	"split",		"nosplit",		"ragged",
@@ -81,174 +82,30 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {
 	"symbolic",		"nested",		"centered"
 	};
 
-const	char * const *mdoc_macronames = __mdoc_macronames;
+const	char * const *mdoc_macronames = __mdoc_macronames + 1;
 const	char * const *mdoc_argnames = __mdoc_argnames;
 
-static	void		  mdoc_node_free(struct mdoc_node *);
-static	void		  mdoc_node_unlink(struct mdoc *,
-				struct mdoc_node *);
-static	void		  mdoc_free1(struct mdoc *);
-static	void		  mdoc_alloc1(struct mdoc *);
-static	struct mdoc_node *node_alloc(struct mdoc *, int, int,
-				enum mdoct, enum mdoc_type);
-static	int		  node_append(struct mdoc *,
-				struct mdoc_node *);
-#if 0
-static	int		  mdoc_preptext(struct mdoc *, int, char *, int);
-#endif
-static	int		  mdoc_ptext(struct mdoc *, int, char *, int);
-static	int		  mdoc_pmacro(struct mdoc *, int, char *, int);
+static	int		  mdoc_ptext(struct roff_man *, int, char *, int);
+static	int		  mdoc_pmacro(struct roff_man *, int, char *, int);
 
 
-const struct mdoc_node *
-mdoc_node(const struct mdoc *mdoc)
-{
-
-	return(mdoc->first);
-}
-
-const struct mdoc_meta *
-mdoc_meta(const struct mdoc *mdoc)
-{
-
-	return(&mdoc->meta);
-}
-
-/*
- * Frees volatile resources (parse tree, meta-data, fields).
- */
-static void
-mdoc_free1(struct mdoc *mdoc)
-{
-
-	if (mdoc->first)
-		mdoc_node_delete(mdoc, mdoc->first);
-	if (mdoc->meta.title)
-		free(mdoc->meta.title);
-	if (mdoc->meta.os)
-		free(mdoc->meta.os);
-	if (mdoc->meta.name)
-		free(mdoc->meta.name);
-	if (mdoc->meta.arch)
-		free(mdoc->meta.arch);
-	if (mdoc->meta.vol)
-		free(mdoc->meta.vol);
-	if (mdoc->meta.msec)
-		free(mdoc->meta.msec);
-	if (mdoc->meta.date)
-		free(mdoc->meta.date);
-}
-
-/*
- * Allocate all volatile resources (parse tree, meta-data, fields).
- */
-static void
-mdoc_alloc1(struct mdoc *mdoc)
-{
-
-	memset(&mdoc->meta, 0, sizeof(struct mdoc_meta));
-	mdoc->flags = 0;
-	mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
-	mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
-	mdoc->first = mdoc->last;
-	mdoc->last->type = MDOC_ROOT;
-	mdoc->last->tok = MDOC_MAX;
-	mdoc->next = MDOC_NEXT_CHILD;
-}
-
-/*
- * Free up volatile resources (see mdoc_free1()) then re-initialises the
- * data with mdoc_alloc1().  After invocation, parse data has been reset
- * and the parser is ready for re-invocation on a new tree; however,
- * cross-parse non-volatile data is kept intact.
- */
 void
-mdoc_reset(struct mdoc *mdoc)
+mdoc_endparse(struct roff_man *mdoc)
 {
 
-	mdoc_free1(mdoc);
-	mdoc_alloc1(mdoc);
+	mdoc_macroend(mdoc);
 }
 
 /*
- * Completely free up all volatile and non-volatile parse resources.
- * After invocation, the pointer is no longer usable.
- */
-void
-mdoc_free(struct mdoc *mdoc)
-{
-
-	mdoc_free1(mdoc);
-	free(mdoc);
-}
-
-/*
- * Allocate volatile and non-volatile parse resources.
- */
-struct mdoc *
-mdoc_alloc(struct roff *roff, struct mparse *parse,
-	const char *defos, int quick)
-{
-	struct mdoc	*p;
-
-	p = mandoc_calloc(1, sizeof(struct mdoc));
-
-	p->parse = parse;
-	p->defos = defos;
-	p->quick = quick;
-	p->roff = roff;
-
-	mdoc_hash_init();
-	mdoc_alloc1(p);
-	return(p);
-}
-
-int
-mdoc_endparse(struct mdoc *mdoc)
-{
-
-	return(mdoc_macroend(mdoc));
-}
-
-int
-mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
-{
-	struct mdoc_node *n;
-
-	n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
-	n->eqn = ep;
-
-	if ( ! node_append(mdoc, n))
-		return(0);
-
-	mdoc->next = MDOC_NEXT_SIBLING;
-	return(1);
-}
-
-int
-mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
-{
-	struct mdoc_node *n;
-
-	n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
-	n->span = sp;
-
-	if ( ! node_append(mdoc, n))
-		return(0);
-
-	mdoc->next = MDOC_NEXT_SIBLING;
-	return(1);
-}
-
-/*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
  */
 int
-mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
+mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)
 {
 
-	mdoc->flags |= MDOC_NEWLINE;
+	if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line)
+		mdoc->flags |= MDOC_NEWLINE;
 
 	/*
 	 * Let the roff nS register switch SYNOPSIS mode early,
@@ -266,215 +123,66 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int
 	    mdoc_ptext(mdoc, ln, buf, offs));
 }
 
-int
+void
 mdoc_macro(MACRO_PROT_ARGS)
 {
-	assert(tok < MDOC_MAX);
+	assert(tok > TOKEN_NONE && tok < MDOC_MAX);
 
-	/* If we're in the body, deny prologue calls. */
-
-	if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
-	    MDOC_PBODY & mdoc->flags) {
-		mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse,
-		    line, ppos, "%s", mdoc_macronames[tok]);
-		return(1);
-	}
-
-	/* If we're in the prologue, deny "body" macros.  */
-
-	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
-	     ! (MDOC_PBODY & mdoc->flags)) {
-		mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse,
-		    line, ppos, "%s", mdoc_macronames[tok]);
-		if (NULL == mdoc->meta.msec)
-			mdoc->meta.msec = mandoc_strdup("1");
-		if (NULL == mdoc->meta.title)
-			mdoc->meta.title = mandoc_strdup("UNKNOWN");
+	if (mdoc->flags & MDOC_PBODY) {
+		if (tok == MDOC_Dt) {
+			mandoc_vmsg(MANDOCERR_DT_LATE,
+			    mdoc->parse, line, ppos,
+			    "Dt %s", buf + *pos);
+			return;
+		}
+	} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
+		if (mdoc->meta.title == NULL) {
+			mandoc_vmsg(MANDOCERR_DT_NOTITLE,
+			    mdoc->parse, line, ppos, "%s %s",
+			    mdoc_macronames[tok], buf + *pos);
+			mdoc->meta.title = mandoc_strdup("UNTITLED");
+		}
 		if (NULL == mdoc->meta.vol)
 			mdoc->meta.vol = mandoc_strdup("LOCAL");
-		if (NULL == mdoc->meta.os)
-			mdoc->meta.os = mandoc_strdup("LOCAL");
-		if (NULL == mdoc->meta.date)
-			mdoc->meta.date = mandoc_normdate
-				(mdoc->parse, NULL, line, ppos);
 		mdoc->flags |= MDOC_PBODY;
 	}
-
-	return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf));
+	(*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 
-
-static int
-node_append(struct mdoc *mdoc, struct mdoc_node *p)
+void
+mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok)
 {
+	struct roff_node *p;
 
-	assert(mdoc->last);
-	assert(mdoc->first);
-	assert(MDOC_ROOT != p->type);
-
-	switch (mdoc->next) {
-	case MDOC_NEXT_SIBLING:
-		mdoc->last->next = p;
-		p->prev = mdoc->last;
-		p->parent = mdoc->last->parent;
-		break;
-	case MDOC_NEXT_CHILD:
-		mdoc->last->child = p;
-		p->parent = mdoc->last;
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
-	}
-
-	p->parent->nchild++;
-
-	/*
-	 * Copy over the normalised-data pointer of our parent.  Not
-	 * everybody has one, but copying a null pointer is fine.
-	 */
-
-	switch (p->type) {
-	case MDOC_BODY:
-		if (ENDBODY_NOT != p->end)
-			break;
-		/* FALLTHROUGH */
-	case MDOC_TAIL:
-		/* FALLTHROUGH */
-	case MDOC_HEAD:
-		p->norm = p->parent->norm;
-		break;
-	default:
-		break;
-	}
-
-	if ( ! mdoc_valid_pre(mdoc, p))
-		return(0);
-
-	switch (p->type) {
-	case MDOC_HEAD:
-		assert(MDOC_BLOCK == p->parent->type);
-		p->parent->head = p;
-		break;
-	case MDOC_TAIL:
-		assert(MDOC_BLOCK == p->parent->type);
-		p->parent->tail = p;
-		break;
-	case MDOC_BODY:
-		if (p->end)
-			break;
-		assert(MDOC_BLOCK == p->parent->type);
-		p->parent->body = p;
-		break;
-	default:
-		break;
-	}
-
-	mdoc->last = p;
-
-	switch (p->type) {
-	case MDOC_TBL:
-		/* FALLTHROUGH */
-	case MDOC_TEXT:
-		if ( ! mdoc_valid_post(mdoc))
-			return(0);
-		break;
-	default:
-		break;
-	}
-
-	return(1);
+	p = roff_node_alloc(mdoc, line, pos, ROFFT_TAIL, tok);
+	roff_node_append(mdoc, p);
+	mdoc->next = ROFF_NEXT_CHILD;
 }
 
-static struct mdoc_node *
-node_alloc(struct mdoc *mdoc, int line, int pos,
-		enum mdoct tok, enum mdoc_type type)
+struct roff_node *
+mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok,
+		struct roff_node *body, enum mdoc_endbody end)
 {
-	struct mdoc_node *p;
+	struct roff_node *p;
 
-	p = mandoc_calloc(1, sizeof(struct mdoc_node));
-	p->sec = mdoc->lastsec;
-	p->line = line;
-	p->pos = pos;
-	p->lastline = line;
-	p->tok = tok;
-	p->type = type;
-
-	/* Flag analysis. */
-
-	if (MDOC_SYNOPSIS & mdoc->flags)
-		p->flags |= MDOC_SYNPRETTY;
-	else
-		p->flags &= ~MDOC_SYNPRETTY;
-	if (MDOC_NEWLINE & mdoc->flags)
-		p->flags |= MDOC_LINE;
-	mdoc->flags &= ~MDOC_NEWLINE;
-
-	return(p);
-}
-
-int
-mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
-{
-	struct mdoc_node *p;
-
-	p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL);
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_CHILD;
-	return(1);
-}
-
-int
-mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
-{
-	struct mdoc_node *p;
-
-	assert(mdoc->first);
-	assert(mdoc->last);
-
-	p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD);
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_CHILD;
-	return(1);
-}
-
-int
-mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
-{
-	struct mdoc_node *p;
-
-	p = node_alloc(mdoc, line, pos, tok, MDOC_BODY);
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_CHILD;
-	return(1);
-}
-
-int
-mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
-		struct mdoc_node *body, enum mdoc_endbody end)
-{
-	struct mdoc_node *p;
-
-	p = node_alloc(mdoc, line, pos, tok, MDOC_BODY);
-	p->pending = body;
+	body->flags |= MDOC_ENDED;
+	body->parent->flags |= MDOC_ENDED;
+	p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok);
+	p->body = body;
 	p->norm = body->norm;
 	p->end = end;
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_SIBLING;
-	return(1);
+	roff_node_append(mdoc, p);
+	mdoc->next = ROFF_NEXT_SIBLING;
+	return(p);
 }
 
-int
-mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
-		enum mdoct tok, struct mdoc_arg *args)
+struct roff_node *
+mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
+	int tok, struct mdoc_arg *args)
 {
-	struct mdoc_node *p;
+	struct roff_node *p;
 
-	p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK);
+	p = roff_node_alloc(mdoc, line, pos, ROFFT_BLOCK, tok);
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
@@ -494,20 +202,18 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
 	default:
 		break;
 	}
-
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_CHILD;
-	return(1);
+	roff_node_append(mdoc, p);
+	mdoc->next = ROFF_NEXT_CHILD;
+	return(p);
 }
 
-int
-mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
-		enum mdoct tok, struct mdoc_arg *args)
+void
+mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
+	int tok, struct mdoc_arg *args)
 {
-	struct mdoc_node *p;
+	struct roff_node *p;
 
-	p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM);
+	p = roff_node_alloc(mdoc, line, pos, ROFFT_ELEM, tok);
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
@@ -519,203 +225,54 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
 	default:
 		break;
 	}
-
-	if ( ! node_append(mdoc, p))
-		return(0);
-	mdoc->next = MDOC_NEXT_CHILD;
-	return(1);
+	roff_node_append(mdoc, p);
+	mdoc->next = ROFF_NEXT_CHILD;
 }
 
-int
-mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p)
-{
-	struct mdoc_node *n;
-
-	n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT);
-	n->string = roff_strdup(mdoc->roff, p);
-
-	if ( ! node_append(mdoc, n))
-		return(0);
-
-	mdoc->next = MDOC_NEXT_SIBLING;
-	return(1);
-}
-
 void
-mdoc_word_append(struct mdoc *mdoc, const char *p)
+mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
 {
-	struct mdoc_node	*n;
-	char			*addstr, *newstr;
 
-	n = mdoc->last;
-	addstr = roff_strdup(mdoc->roff, p);
-	mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
-	free(addstr);
-	free(n->string);
-	n->string = newstr;
-	mdoc->next = MDOC_NEXT_SIBLING;
+	roff_node_unlink(mdoc, p);
+	roff_node_append(mdoc, p);
 }
 
-static void
-mdoc_node_free(struct mdoc_node *p)
-{
-
-	if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)
-		free(p->norm);
-	if (p->string)
-		free(p->string);
-	if (p->args)
-		mdoc_argv_free(p->args);
-	free(p);
-}
-
-static void
-mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
-{
-
-	/* Adjust siblings. */
-
-	if (n->prev)
-		n->prev->next = n->next;
-	if (n->next)
-		n->next->prev = n->prev;
-
-	/* Adjust parent. */
-
-	if (n->parent) {
-		n->parent->nchild--;
-		if (n->parent->child == n)
-			n->parent->child = n->prev ? n->prev : n->next;
-		if (n->parent->last == n)
-			n->parent->last = n->prev ? n->prev : NULL;
-	}
-
-	/* Adjust parse point, if applicable. */
-
-	if (mdoc && mdoc->last == n) {
-		if (n->prev) {
-			mdoc->last = n->prev;
-			mdoc->next = MDOC_NEXT_SIBLING;
-		} else {
-			mdoc->last = n->parent;
-			mdoc->next = MDOC_NEXT_CHILD;
-		}
-	}
-
-	if (mdoc && mdoc->first == n)
-		mdoc->first = NULL;
-}
-
-void
-mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
-{
-
-	while (p->child) {
-		assert(p->nchild);
-		mdoc_node_delete(mdoc, p->child);
-	}
-	assert(0 == p->nchild);
-
-	mdoc_node_unlink(mdoc, p);
-	mdoc_node_free(p);
-}
-
-int
-mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p)
-{
-
-	mdoc_node_unlink(mdoc, p);
-	return(node_append(mdoc, p));
-}
-
-#if 0
 /*
- * Pre-treat a text line.
- * Text lines can consist of equations, which must be handled apart from
- * the regular text.
- * Thus, use this function to step through a line checking if it has any
- * equations embedded in it.
- * This must handle multiple equations AND equations that do not end at
- * the end-of-line, i.e., will re-enter in the next roff parse.
- */
-static int
-mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs)
-{
-	char		*start, *end;
-	char		 delim;
-
-	while ('\0' != buf[offs]) {
-		/* Mark starting position if eqn is set. */
-		start = NULL;
-		if ('\0' != (delim = roff_eqndelim(mdoc->roff)))
-			if (NULL != (start = strchr(buf + offs, delim)))
-				*start++ = '\0';
-
-		/* Parse text as normal. */
-		if ( ! mdoc_ptext(mdoc, line, buf, offs))
-			return(0);
-
-		/* Continue only if an equation exists. */
-		if (NULL == start)
-			break;
-
-		/* Read past the end of the equation. */
-		offs += start - (buf + offs);
-		assert(start == &buf[offs]);
-		if (NULL != (end = strchr(buf + offs, delim))) {
-			*end++ = '\0';
-			while (' ' == *end)
-				end++;
-		}
-
-		/* Parse the equation itself. */
-		roff_openeqn(mdoc->roff, NULL, line, offs, buf);
-
-		/* Process a finished equation? */
-		if (roff_closeeqn(mdoc->roff))
-			if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))
-				return(0);
-		offs += (end - (buf + offs));
-	}
-
-	return(1);
-}
-#endif
-
-/*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.
  */
 static int
-mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
+mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 {
+	struct roff_node *n;
 	char		 *c, *ws, *end;
-	struct mdoc_node *n;
 
 	assert(mdoc->last);
 	n = mdoc->last;
 
 	/*
 	 * Divert directly to list processing if we're encountering a
-	 * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry
-	 * (a MDOC_BODY means it's already open, in which case we should
+	 * columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry
+	 * (a ROFFT_BODY means it's already open, in which case we should
 	 * process within its context in the normal way).
 	 */
 
-	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-	    LIST_column == n->norm->Bl.type) {
+	if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+	    n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {
 		/* `Bl' is open without any children. */
 		mdoc->flags |= MDOC_FREECOL;
-		return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+		mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+		return(1);
 	}
 
-	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
+	if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
 	    NULL != n->parent &&
 	    MDOC_Bl == n->parent->tok &&
 	    LIST_column == n->parent->norm->Bl.type) {
 		/* `Bl' has block-level `It' children. */
 		mdoc->flags |= MDOC_FREECOL;
-		return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+		mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+		return(1);
 	}
 
 	/*
@@ -763,7 +320,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int
 		mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
 		    line, (int)(ws-buf), NULL);
 
-	if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) {
+	if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
 		mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
 		    line, (int)(c - buf), NULL);
 
@@ -772,18 +329,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int
 		 * blank lines aren't allowed, but enough manuals assume this
 		 * behaviour that we want to work around it.
 		 */
-		if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL))
-			return(0);
-
-		mdoc->next = MDOC_NEXT_SIBLING;
-
-		return(mdoc_valid_post(mdoc));
+		roff_elem_alloc(mdoc, line, offs, MDOC_sp);
+		mdoc->next = ROFF_NEXT_SIBLING;
+		mdoc_valid_post(mdoc);
+		return(1);
 	}
 
-	if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs))
-		return(0);
+	roff_word_alloc(mdoc, line, offs, buf+offs);
 
-	if (MDOC_LITERAL & mdoc->flags)
+	if (mdoc->flags & MDOC_LITERAL)
 		return(1);
 
 	/*
@@ -796,7 +350,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int
 
 	if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
 		mdoc->last->flags |= MDOC_EOS;
-
 	return(1);
 }
 
@@ -805,48 +358,49 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int
  * character.
  */
 static int
-mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
+mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 {
-	enum mdoct	  tok;
+	struct roff_node *n;
+	const char	 *cp;
+	int		  tok;
 	int		  i, sv;
 	char		  mac[5];
-	struct mdoc_node *n;
 
-	/* Empty post-control lines are ignored. */
-
-	if ('"' == buf[offs]) {
-		mandoc_msg(MANDOCERR_COMMENT_BAD, mdoc->parse,
-		    ln, offs, NULL);
-		return(1);
-	} else if ('\0' == buf[offs])
-		return(1);
-
 	sv = offs;
 
 	/*
 	 * Copy the first word into a nil-terminated buffer.
-	 * Stop copying when a tab, space, or eoln is encountered.
+	 * Stop when a space, tab, escape, or eoln is encountered.
 	 */
 
 	i = 0;
-	while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] &&
-	    '\t' != buf[offs])
+	while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)
 		mac[i++] = buf[offs++];
 
 	mac[i] = '\0';
 
-	tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+	tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE;
 
-	if (MDOC_MAX == tok) {
-		mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse,
-		    ln, sv, "%s", buf + sv - 1);
+	if (tok == TOKEN_NONE) {
+		mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
+		    ln, sv, buf + sv - 1);
 		return(1);
 	}
 
-	/* Disregard the first trailing tab, if applicable. */
+	/* Skip a leading escape sequence or tab. */
 
-	if ('\t' == buf[offs])
+	switch (buf[offs]) {
+	case '\\':
+		cp = buf + offs + 1;
+		mandoc_escape(&cp, NULL, NULL);
+		offs = cp - buf;
+		break;
+	case '\t':
 		offs++;
+		break;
+	default:
+		break;
+	}
 
 	/* Jump to the next non-whitespace word. */
 
@@ -867,8 +421,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int 
 	 * into macro processing.
 	 */
 
-	if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok)
-		return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf));
+	if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
+		mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+		return(1);
+	}
 
 	n = mdoc->last;
 	assert(mdoc->last);
@@ -878,10 +434,11 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int 
 	 * context around the parsed macro.
 	 */
 
-	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-	    LIST_column == n->norm->Bl.type) {
+	if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+	    n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {
 		mdoc->flags |= MDOC_FREECOL;
-		return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+		mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+		return(1);
 	}
 
 	/*
@@ -890,18 +447,18 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int 
 	 * then open an `It' block context around the parsed macro.
 	 */
 
-	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
+	if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
 	    NULL != n->parent &&
 	    MDOC_Bl == n->parent->tok &&
 	    LIST_column == n->parent->norm->Bl.type) {
 		mdoc->flags |= MDOC_FREECOL;
-		return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+		mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+		return(1);
 	}
 
 	/* Normal processing of a macro. */
 
-	if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
-		return(0);
+	mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
 
 	/* In quick mode (for mandocdb), abort after the NAME section. */
 
@@ -959,12 +516,12 @@ mdoc_isdelim(const char *p)
 }
 
 void
-mdoc_deroff(char **dest, const struct mdoc_node *n)
+mdoc_deroff(char **dest, const struct roff_node *n)
 {
 	char	*cp;
 	size_t	 sz;
 
-	if (MDOC_TEXT != n->type) {
+	if (n->type != ROFFT_TEXT) {
 		for (n = n->child; n; n = n->next)
 			mdoc_deroff(dest, n);
 		return;