===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.1
retrieving revision 1.43
diff -u -p -r1.1 -r1.43
--- mandoc/Attic/macro.c	2008/12/12 10:11:10	1.1
+++ mandoc/Attic/macro.c	2009/01/19 17:51:32	1.43
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.1 2008/12/12 10:11:10 kristaps Exp $ */
+/* $Id: macro.c,v 1.43 2009/01/19 17:51:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,90 +16,1068 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <assert.h>
+#include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef	__linux__
+#include <time.h>
+#endif
 
-#include "roff.h"
+#include "private.h"
 
+/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
+
+static	int	  rewind_alt(int);
+static	int	  rewind_dohalt(int, enum mdoc_type, 
+			const struct mdoc_node *);
+#define	REWIND_REWIND	(1 << 0)
+#define	REWIND_NOHALT	(1 << 1)
+#define	REWIND_HALT	(1 << 2)
+static	int	  rewind_dobreak(int, const struct mdoc_node *);
+
+
+static	int	  rewind_elem(struct mdoc *, int);
+static	int	  rewind_impblock(struct mdoc *, int, int, int);
+static	int	  rewind_expblock(struct mdoc *, int, int, int);
+static	int	  rewind_subblock(enum mdoc_type, 
+			struct mdoc *, int, int, int);
+static	int	  rewind_last(struct mdoc *, struct mdoc_node *);
+static	int	  append_delims(struct mdoc *, int, int *, char *);
+static	int	  lookup(struct mdoc *, int, int, int, const char *);
+
+
 static int
-macro_args_next(struct rofftree *tree, int *pos, char *buf, char **v)
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
-	int		 i;
+	int		 res;
 
+	res = mdoc_find(mdoc, p);
+	if (MDOC_PARSED & mdoc_macros[from].flags)
+		return(res);
+	if (MDOC_MAX == res)
+		return(res);
+	if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter"))
+		return(-1);
+	return(MDOC_MAX);
+}
+
+
+static int
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
+{
+
+	assert(to);
+	mdoc->next = MDOC_NEXT_SIBLING;
+
+	while (mdoc->last != to) {
+		if ( ! mdoc_valid_post(mdoc))
+			return(0);
+		if ( ! mdoc_action_post(mdoc))
+			return(0);
+		mdoc->last = mdoc->last->parent;
+		assert(mdoc->last);
+	}
+
+	if ( ! mdoc_valid_post(mdoc))
+		return(0);
+	return(mdoc_action_post(mdoc));
+}
+
+
+static int
+rewind_alt(int tok)
+{
+	switch (tok) {
+	case (MDOC_Ac):
+		return(MDOC_Ao);
+	case (MDOC_Bc):
+		return(MDOC_Bo);
+	case (MDOC_Dc):
+		return(MDOC_Do);
+	case (MDOC_Ec):
+		return(MDOC_Eo);
+	case (MDOC_Ed):
+		return(MDOC_Bd);
+	case (MDOC_Ef):
+		return(MDOC_Bf);
+	case (MDOC_Ek):
+		return(MDOC_Bk);
+	case (MDOC_El):
+		return(MDOC_Bl);
+	case (MDOC_Fc):
+		return(MDOC_Fo);
+	case (MDOC_Oc):
+		return(MDOC_Oo);
+	case (MDOC_Pc):
+		return(MDOC_Po);
+	case (MDOC_Qc):
+		return(MDOC_Qo);
+	case (MDOC_Re):
+		return(MDOC_Rs);
+	case (MDOC_Sc):
+		return(MDOC_So);
+	case (MDOC_Xc):
+		return(MDOC_Xo);
+	default:
+		break;
+	}
+	abort();
+	/* NOTREACHED */
+}
+
+
+static int
+rewind_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p)
+{
+
+	if (MDOC_ROOT == p->type)
+		return(REWIND_HALT);
+	if (MDOC_VALID & p->flags)
+		return(REWIND_NOHALT);
+
+	switch (tok) {
+	/* One-liner implicit-scope. */
+	case (MDOC_Aq):
+		/* FALLTHROUGH */
+	case (MDOC_Bq):
+		/* FALLTHROUGH */
+	case (MDOC_D1):
+		/* FALLTHROUGH */
+	case (MDOC_Dl):
+		/* FALLTHROUGH */
+	case (MDOC_Dq):
+		/* FALLTHROUGH */
+	case (MDOC_Op):
+		/* FALLTHROUGH */
+	case (MDOC_Pq):
+		/* FALLTHROUGH */
+	case (MDOC_Ql):
+		/* FALLTHROUGH */
+	case (MDOC_Qq):
+		/* FALLTHROUGH */
+	case (MDOC_Sq):
+		assert(MDOC_BODY != type);
+		assert(MDOC_TAIL != type);
+		if (type == p->type && tok == p->tok)
+			return(REWIND_REWIND);
+		break;
+
+	/* Multi-line implicit-scope. */
+	case (MDOC_It):
+		assert(MDOC_TAIL != type);
+		if (type == p->type && tok == p->tok)
+			return(REWIND_REWIND);
+		if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
+			return(REWIND_HALT);
+		break;
+	case (MDOC_Sh):
+		if (type == p->type && tok == p->tok)
+			return(REWIND_REWIND);
+		break;
+	case (MDOC_Ss):
+		assert(MDOC_TAIL != type);
+		if (type == p->type && tok == p->tok)
+			return(REWIND_REWIND);
+		if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
+			return(REWIND_HALT);
+		break;
+	
+	/* Multi-line explicit scope start. */
+	case (MDOC_Ao):
+		/* FALLTHROUGH */
+	case (MDOC_Bd):
+		/* FALLTHROUGH */
+	case (MDOC_Bf):
+		/* FALLTHROUGH */
+	case (MDOC_Bk):
+		/* FALLTHROUGH */
+	case (MDOC_Bl):
+		/* FALLTHROUGH */
+	case (MDOC_Bo):
+		/* FALLTHROUGH */
+	case (MDOC_Do):
+		/* FALLTHROUGH */
+	case (MDOC_Eo):
+		/* FALLTHROUGH */
+	case (MDOC_Fo):
+		/* FALLTHROUGH */
+	case (MDOC_Oo):
+		/* FALLTHROUGH */
+	case (MDOC_Po):
+		/* FALLTHROUGH */
+	case (MDOC_Qo):
+		/* FALLTHROUGH */
+	case (MDOC_Rs):
+		/* FALLTHROUGH */
+	case (MDOC_So):
+		/* FALLTHROUGH */
+	case (MDOC_Xo):
+		if (type == p->type && tok == p->tok)
+			return(REWIND_REWIND);
+		break;
+
+	/* Multi-line explicit scope close. */
+	case (MDOC_Ac):
+		/* FALLTHROUGH */
+	case (MDOC_Bc):
+		/* FALLTHROUGH */
+	case (MDOC_Dc):
+		/* FALLTHROUGH */
+	case (MDOC_Ec):
+		/* FALLTHROUGH */
+	case (MDOC_Ed):
+		/* FALLTHROUGH */
+	case (MDOC_Ek):
+		/* FALLTHROUGH */
+	case (MDOC_El):
+		/* FALLTHROUGH */
+	case (MDOC_Fc):
+		/* FALLTHROUGH */
+	case (MDOC_Ef):
+		/* FALLTHROUGH */
+	case (MDOC_Oc):
+		/* FALLTHROUGH */
+	case (MDOC_Pc):
+		/* FALLTHROUGH */
+	case (MDOC_Qc):
+		/* FALLTHROUGH */
+	case (MDOC_Re):
+		/* FALLTHROUGH */
+	case (MDOC_Sc):
+		/* FALLTHROUGH */
+	case (MDOC_Xc):
+		if (type == p->type && rewind_alt(tok) == p->tok)
+			return(REWIND_REWIND);
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	return(REWIND_NOHALT);
+}
+
+
+static int
+rewind_dobreak(int tok, const struct mdoc_node *p)
+{
+
+	assert(MDOC_ROOT != p->type);
+	if (MDOC_ELEM == p->type)
+		return(1);
+	if (MDOC_TEXT == p->type)
+		return(1);
+	if (MDOC_VALID & p->flags)
+		return(1);
+
+	switch (tok) {
+	/* Implicit rules. */
+	case (MDOC_It):
+		return(MDOC_It == p->tok);
+	case (MDOC_Ss):
+		return(MDOC_Ss == p->tok);
+	case (MDOC_Sh):
+		if (MDOC_Ss == p->tok)
+			return(1);
+		return(MDOC_Sh == p->tok);
+
+	/* Extra scope rules. */
+	case (MDOC_El):
+		if (MDOC_It == p->tok)
+			return(1);
+		break;
+	default:
+		break;
+	}
+
+	if (MDOC_EXPLICIT & mdoc_macros[tok].flags) 
+		return(p->tok == rewind_alt(tok));
+	else if (MDOC_BLOCK == p->type)
+		return(1);
+
+	return(tok == p->tok);
+}
+
+
+static int
+rewind_elem(struct mdoc *mdoc, int tok)
+{
+	struct mdoc_node *n;
+
+	n = mdoc->last;
+	if (MDOC_ELEM != n->type)
+		n = n->parent;
+	assert(MDOC_ELEM == n->type);
+	assert(tok == n->tok);
+
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, 
+		int tok, int line, int ppos)
+{
+	struct mdoc_node *n;
+	int		  c;
+
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		c = rewind_dohalt(tok, type, n);
+		if (REWIND_HALT == c)
+			return(1);
+		if (REWIND_REWIND == c)
+			break;
+		else if (rewind_dobreak(tok, n))
+			continue;
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
+	}
+
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_expblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+	struct mdoc_node *n;
+	int		  c;
+
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		c = rewind_dohalt(tok, MDOC_BLOCK, n);
+		if (REWIND_HALT == c)
+			return(mdoc_perr(mdoc, line, ppos, "closing macro has no context"));
+		if (REWIND_REWIND == c)
+			break;
+		else if (rewind_dobreak(tok, n))
+			continue;
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
+	}
+
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+	struct mdoc_node *n;
+	int		  c;
+
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		c = rewind_dohalt(tok, MDOC_BLOCK, n);
+		if (REWIND_HALT == c)
+			return(1);
+		else if (REWIND_REWIND == c)
+			break;
+		else if (rewind_dobreak(tok, n))
+			continue;
+		return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
+	}
+
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
+{
+	int		 c, lastarg;
+	char		*p;
+
 	if (0 == buf[*pos])
+		return(1);
+
+	for (;;) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, 0, &p);
+		if (ARGS_ERROR == c)
+			return(0);
+		else if (ARGS_EOLN == c)
+			break;
+		assert(mdoc_isdelim(p));
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
+
+	return(1);
+}
+
+
+int
+macro_scoped_close(MACRO_PROT_ARGS)
+{
+	int	 	 tt, j, c, lastarg, maxargs, flushed;
+	char		*p;
+
+	switch (tok) {
+	case (MDOC_Ec):
+		maxargs = 1;
+		break;
+	default:
+		maxargs = 0;
+		break;
+	}
+
+	tt = rewind_alt(tok);
+
+	mdoc_msg(mdoc, "parse: %s closing %s",
+			mdoc_macronames[tok], mdoc_macronames[tt]);
+
+	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
+		if (0 == buf[*pos]) {
+			if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+				return(0);
+			return(rewind_expblock(mdoc, tok, line, ppos));
+		}
+		return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters"));
+	}
+
+	if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
 		return(0);
 
-	if ('\"' == buf[*pos]) {
-		/* Syntax error: quotation marks not allowed. */
-		return(-1);
+	lastarg = ppos;
+	flushed = 0;
+
+	if (maxargs > 0) {
+		if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+			return(0);
+		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
-	*v = &buf[*pos];
+	for (j = 0; /* No sentinel. */; j++) {
+		lastarg = *pos;
 
-	while (buf[*pos] && ! isspace(buf[*pos]))
-		(*pos)++;
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_expblock(mdoc, tok, line, ppos))
+				return(0);
+			flushed = 1;
+		}
 
-	if (buf[*pos + 1] && '\\' == buf[*pos]) {
-		/* Syntax error: escaped whitespace not allowed. */
-		return(-1);
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		if (ARGS_ERROR == c)
+			return(0);
+		if (ARGS_PUNCT == c)
+			break;
+		if (ARGS_EOLN == c)
+			break;
+
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! flushed) {
+				if ( ! rewind_expblock(mdoc, tok, line, ppos))
+					return(0);
+				flushed = 1;
+			}
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+				return(0);
+			break;
+		} 
+
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	buf[i] = 0;
+	if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos))
+		return(0);
+
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, line, pos, buf));
+}
+
+
+int
+macro_text(MACRO_PROT_ARGS)
+{
+	int		  la, lastpunct, c, fl, argc;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
+
+	la = ppos;
+	lastpunct = 0;
+
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		la = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c)
+			break;
+		if (ARGV_WORD == c) {
+			*pos = la;
+			break;
+		} else if (ARGV_ARG == c)
+			continue;
+
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+
+	if (0 == c) {
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	fl = ARGS_DELIM;
+	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+		fl |= ARGS_QUOTED;
+
+	lastpunct = 0;
+	for (;;) {
+		la = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+		if (ARGS_ERROR == c) {
+			mdoc_argv_free(argc, argv);
+			return(0);
+		}
+
+		if (ARGS_EOLN == c)
+			break;
+		if (ARGS_PUNCT == c)
+			break;
+
+		if (-1 == (c = lookup(mdoc, line, la, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
+			mdoc_argv_free(argc, argv);
+
+			c = mdoc_macro(mdoc, c, line, la, pos, buf);
+			if (0 == c)
+				return(0);
+			if (ppos > 1)
+				return(1);
+			return(append_delims(mdoc, line, pos, buf));
+		}
+
+		if (mdoc_isdelim(p)) {
+			if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
+			lastpunct = 1;
+		} else if (lastpunct) {
+			c = mdoc_elem_alloc(mdoc, line, 
+					ppos, tok, argc, argv);
+			if (0 == c) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
+			mdoc->next = MDOC_NEXT_CHILD;
+			lastpunct = 0;
+		}
+
+		if ( ! mdoc_word_alloc(mdoc, line, la, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
+
+	mdoc_argv_free(argc, argv);
+
+	if (0 == lastpunct && ! rewind_elem(mdoc, tok))
+		return(0);
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, line, pos, buf));
+}
+
+
+int
+macro_scoped(MACRO_PROT_ARGS)
+{
+	int		  c, lastarg, argc, fl;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
+
+	assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
+
+	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
+		if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! rewind_impblock(mdoc, tok, line, ppos))
+			return(0);
+	}
+
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c)
+			break;
+		if (ARGV_WORD == c) {
+			*pos = lastarg;
+			break;
+		} else if (ARGV_ARG == c)
+			continue;
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
+	c = mdoc_block_alloc(mdoc, line, ppos, 
+			tok, (size_t)argc, argv);
+	mdoc_argv_free(argc, argv);
+
+	if (0 == c)
+		return(0);
+
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	if (0 == buf[*pos]) {
+		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+			return(0);
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
+		mdoc->next = MDOC_NEXT_CHILD;
+		return(1);
+	}
+
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	fl = ARGS_DELIM;
+	if (MDOC_TABSEP & mdoc_macros[tok].flags)
+		fl |= ARGS_TABSEP;
+
+	for (;;) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+	
+		if (ARGS_ERROR == c)
+			return(0);
+		if (ARGS_PUNCT == c)
+			break;
+		if (ARGS_EOLN == c)
+			break;
+	
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX == c) {
+			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+				return(0);
+			mdoc->next = MDOC_NEXT_SIBLING;
+			continue;
+		} 
+
+		if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+			return(0);
+		break;
+	}
+
+	if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+		return(0);
+	if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
+		return(0);
+
+	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
 	return(1);
 }
 
-/*
- * Parses the following:
- *
- *     .Xx foo bar baz ; foo "bar baz" ; ;
- *         ^----------   ^----------
- */
-static int
-macro_fl(struct rofftree *tree, int tok, int *pos, char *buf)
+
+int
+macro_scoped_line(MACRO_PROT_ARGS)
 {
-	int		  i, j, c, first; 
-	char		 *args[ROFF_MAXLINEARG];
+	int		  lastarg, c;
+	char		  *p;
 
-	first = *pos == 0;
+	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	for (j = 0; ; ) {
-		i = *pos;
-		c = macro_args_next(tree, *i, buf, args[j]);
-		if (-1 == c) 
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	/* XXX - no known argument macros. */
+
+	lastarg = ppos;
+	for (;;) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+
+		if (ARGS_ERROR == c)
 			return(0);
-		if (0 == c) 
+		if (ARGS_PUNCT == c)
 			break;
+		if (ARGS_EOLN == c)
+			break;
 
-		/* Break at the next command.  */
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX == c) {
+			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+				return(0);
+			mdoc->next = MDOC_NEXT_SIBLING;
+			continue;
+		} 
 
-		if (ROFF_MAX != (c = rofffindcallable(args[pos]))) {
-			if ( ! macro(tree, tok, argc, argv, i, p))
+		if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+			return(0);
+		break;
+	}
+
+	if (1 == ppos) {
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! append_delims(mdoc, line, pos, buf))
+			return(0);
+	} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+		return(0);
+	return(rewind_impblock(mdoc, tok, line, ppos));
+}
+
+
+int
+macro_constant_scoped(MACRO_PROT_ARGS)
+{
+	int		  lastarg, flushed, j, c, maxargs;
+	char		 *p;
+
+	lastarg = ppos;
+	flushed = 0;
+
+	switch (tok) {
+	case (MDOC_Eo):
+		maxargs = 1;
+		break;
+	default:
+		maxargs = 0;
+		break;
+	}
+
+	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+		return(0); 
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	if (0 == maxargs) {
+		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+			return(0);
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
+		flushed = 1;
+	} else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	for (j = 0; /* No sentinel. */; j++) {
+		lastarg = *pos;
+
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 				return(0);
-			if ( ! parse(tree, c, pos, args))
+			flushed = 1;
+			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 				return(0);
+			mdoc->next = MDOC_NEXT_CHILD;
+		}
+
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		if (ARGS_ERROR == c)
+			return(0);
+		if (ARGS_PUNCT == c)
 			break;
+		if (ARGS_EOLN == c)
+			break;
+
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! flushed) {
+				if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+					return(0);
+				flushed = 1;
+				if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+					return(0);
+				mdoc->next = MDOC_NEXT_CHILD;
+			}
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+				return(0);
+			break;
 		}
 
-		/* Continue if we're just words. */
+		if ( ! flushed && mdoc_isdelim(p)) {
+			if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+				return(0);
+			flushed = 1;
+			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+				return(0);
+			mdoc->next = MDOC_NEXT_CHILD;
+		}
+	
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
 
-		if ( ! roffispunct(args[pos])) {
-			i++;
+	if ( ! flushed) {
+		if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
+		mdoc->next = MDOC_NEXT_CHILD;
+	}
+
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, line, pos, buf));
+}
+
+
+int
+macro_constant_delimited(MACRO_PROT_ARGS)
+{
+	int		  lastarg, flushed, j, c, maxargs, argc;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
+
+	lastarg = ppos;
+	flushed = 0;
+
+	switch (tok) {
+	case (MDOC_No):
+		/* FALLTHROUGH */
+	case (MDOC_Ns):
+		/* FALLTHROUGH */
+	case (MDOC_Pf):
+		/* FALLTHROUGH */
+	case (MDOC_Ux):
+		/* FALLTHROUGH */
+	case (MDOC_St):
+		maxargs = 0;
+		break;
+	default:
+		maxargs = 1;
+		break;
+	}
+
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c)
+			break;
+		if (ARGV_WORD == c) {
+			*pos = lastarg;
+			break;
+		} else if (ARGV_ARG == c)
 			continue;
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
+
+	if (0 == c)
+		return(0);
+
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	for (j = 0; /* No sentinel. */; j++) {
+		lastarg = *pos;
+
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 1;
 		}
 
-		/* Break if there's only remaining punctuation. */
+		c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+		if (ARGS_ERROR == c)
+			return(0);
+		if (ARGS_PUNCT == c)
+			break;
+		if (ARGS_EOLN == c)
+			break;
 
-		if (args[pos + 1] && roffispunct(args[pos + 1]))
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! flushed && ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 1;
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+				return(0);
 			break;
+		}
 
-		/* If there are remaining words, start anew. */
+		if ( ! flushed && mdoc_isdelim(p)) {
+			if ( ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 1;
+		}
+	
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
 
-		if ( ! macro(tree, tok, argc, argv, i, p))
+	if ( ! flushed && ! rewind_elem(mdoc, tok))
+		return(0);
+
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, line, pos, buf));
+}
+
+
+int
+macro_constant(MACRO_PROT_ARGS)
+{
+	int		  c, lastarg, argc, fl;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
+	struct mdoc_node *n;
+
+	fl = 0;
+	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+		fl = ARGS_QUOTED;
+
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c) 
+			break;
+		if (ARGV_WORD == c) {
+			*pos = lastarg;
+			break;
+		} else if (ARGV_ARG == c)
+			continue;
+
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc - 1, argv);
+		return(mdoc_perr(mdoc, line, ppos, "parameter hard-limit exceeded"));
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
+
+	if (0 == c)
+		return(0);
+
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	for (;;) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+		if (ARGS_ERROR == c)
 			return(0);
+		if (ARGS_EOLN == c)
+			break;
 
-		/* Spit out the punctuation. */
+		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! rewind_elem(mdoc, tok))
+				return(0);
+			return(mdoc_macro(mdoc, c, line, 
+						lastarg, pos, buf));
+		}
 
-		if ( ! word(tree, tok, *args++))
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 			return(0);
-		i++;
+		mdoc->next = MDOC_NEXT_SIBLING;
 	}
+
+	if ( ! rewind_elem(mdoc, tok))
+		return(0);
+	if ( ! (MDOC_NOKEEP & mdoc_macros[tok].flags))
+		return(1);
+
+	assert(mdoc->last->tok == tok);
+	if (mdoc->last->parent->child == mdoc->last)
+		mdoc->last->parent->child = mdoc->last->prev;
+	if (mdoc->last->prev)
+		mdoc->last->prev->next = NULL;
+
+	n = mdoc->last;
+	assert(NULL == mdoc->last->next);
+
+	if (mdoc->last->prev) {
+		mdoc->last = mdoc->last->prev;
+		mdoc->next = MDOC_NEXT_SIBLING;
+	} else {
+		mdoc->last = mdoc->last->parent;
+		mdoc->next = MDOC_NEXT_CHILD;
+	}
+
+	mdoc_node_freelist(n);
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+int
+macro_obsolete(MACRO_PROT_ARGS)
+{
+
+	return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete"));
+}
+
+
+int
+macro_end(struct mdoc *mdoc)
+{
+	struct mdoc_node *n;
+
+	assert(mdoc->first);
+	assert(mdoc->last);
+
+	/* Scan for open explicit scopes. */
+
+	n = MDOC_VALID & mdoc->last->flags ?
+		mdoc->last->parent : mdoc->last;
+
+	for ( ; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type)
+			continue;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
+			continue;
+		mdoc_nerr(mdoc, n, "macro scope still open on exit");
+		return(0);
+	}
+
+	return(rewind_last(mdoc, mdoc->first));
 }