===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.4
retrieving revision 1.32
diff -u -p -r1.4 -r1.32
--- mandoc/Attic/macro.c	2008/12/15 03:13:01	1.4
+++ mandoc/Attic/macro.c	2009/01/12 12:52:21	1.32
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.4 2008/12/15 03:13:01 kristaps Exp $ */
+/* $Id: macro.c,v 1.32 2009/01/12 12:52:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -20,264 +20,898 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#ifdef	__linux__
+#include <time.h>
+#endif
 
 #include "private.h"
 
-#define	_CC(p)	((const char **)p)
+/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 
-static	int	  append_text(struct mdoc *, int, 
-			int, int, char *[]);
-static	int	  append_scoped(struct mdoc *, int, 
-			int, int, char *[]);
-static	int 	  args_next(struct mdoc *, int, 
-			int *, char *, char **);
+static	int	  rewind_elem(struct mdoc *, int);
+static	int	  rewind_impblock(struct mdoc *, int);
+static	int	  rewind_expblock(struct mdoc *, int);
+static	int	  rewind_head(struct mdoc *, int);
+static	int	  rewind_body(struct mdoc *, int);
+static	int	  rewind_last(struct mdoc *, struct mdoc_node *);
+static	int	  append_delims(struct mdoc *, 
+			int, int, int *, char *);
+static	int	  lookup(struct mdoc *, int, int, int, const char *);
 
 
 static int
-args_next(struct mdoc *mdoc, int tok, 
-		int *pos, char *buf, char **v)
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
+	int		 res;
 
-	if (0 == buf[*pos])
-		return(0);
+	res = mdoc_find(mdoc, p);
+	if (MDOC_PARSED & mdoc_macros[from].flags)
+		return(res);
+	if (MDOC_MAX == res)
+		return(res);
 
-	assert( ! isspace(buf[*pos]));
-
-	if ('\"' == buf[*pos]) {
-		(void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_QUOTE);
+	if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX_MACLIKE))
 		return(-1);
+	return(MDOC_MAX);
+}
+
+
+static int
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
+{
+
+	assert(to);
+	mdoc->next = MDOC_NEXT_SIBLING;
+	if (mdoc->last == to) {
+		if ( ! mdoc_valid_post(mdoc))
+			return(0);
+		if ( ! mdoc_action_post(mdoc))
+			return(0);
+		return(1);
 	}
 
-	*v = &buf[*pos];
+	do {
+		mdoc->last = mdoc->last->parent;
+		assert(mdoc->last);
+		if ( ! mdoc_valid_post(mdoc))
+			return(0);
+		if ( ! mdoc_action_post(mdoc))
+			return(0);
+	} while (mdoc->last != to);
 
-	/* Scan ahead to end of token. */
+	return(1);
+}
 
-	while (buf[*pos] && ! isspace(buf[*pos]))
-		(*pos)++;
 
-	if (buf[*pos] && buf[*pos + 1] && '\\' == buf[*pos]) {
-		(void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_WS);
-		return(-1);
+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_body(struct mdoc *mdoc, int tok)
+{
+	struct mdoc_node *n;
+	int		  t;
+
+	assert(mdoc->last);
+
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		if (MDOC_BODY != n->type) 
+			continue;
+		if (tok == (t = n->tok))
+			break;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+			continue;
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
 	}
 
-	if (0 == buf[*pos])
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_head(struct mdoc *mdoc, int tok)
+{
+	struct mdoc_node *n;
+	int		  t;
+
+	assert(mdoc->last);
+
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		if (MDOC_HEAD != n->type) 
+			continue;
+		if (tok == (t = n->tok))
+			break;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+			continue;
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
+	}
+
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_expblock(struct mdoc *mdoc, int tok)
+{
+	struct mdoc_node *n;
+	int		  t;
+
+	n = mdoc->last ? mdoc->last->parent : NULL;
+
+	/* LINTED */
+	for ( ; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type)
+			continue;
+		if (tok == (t = n->tok))
+			break;
+		if (MDOC_NESTED & mdoc_macros[t].flags)
+			continue;
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
+	}
+
+	assert(n);
+	return(rewind_last(mdoc, n));
+}
+
+
+static int
+rewind_impblock(struct mdoc *mdoc, int tok)
+{
+	int		  t;
+	struct mdoc_node *n;
+
+	n = mdoc->last ? mdoc->last->parent : NULL;
+
+	/* LINTED */
+	for ( ; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type) 
+			continue;
+		if (tok == (t = n->tok))
+			break;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+			continue;
+		if (MDOC_NESTED & mdoc_macros[tok].flags)
+			return(1);
+		return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
+	}
+
+	if (NULL == n)
 		return(1);
+	return(rewind_last(mdoc, n));
+}
 
-	/* Scan ahead over trailing whitespace. */
 
-	buf[(*pos)++] = 0;
-	while (buf[*pos] && isspace(buf[*pos]))
-		(*pos)++;
+static int
+append_delims(struct mdoc *mdoc, int tok, 
+		int line, int *pos, char *buf)
+{
+	int		 c, lastarg;
+	char		*p;
 
-	if (0 == buf[*pos]) 
-		if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN))
-			return(-1);
+	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);
 }
 
 
-static int
-append_scoped(struct mdoc *mdoc, int tok, 
-		int pos, int sz, char *args[])
+/* ARGSUSED */
+int
+macro_close_explicit(MACRO_PROT_ARGS)
 {
+	int	 	 tt, j, c, lastarg, maxargs, flushed;
+	char		*p;
 
 	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
-	case (MDOC_Sh):
+	case (MDOC_Ac):
+		tt = MDOC_Ao;
 		break;
-	case (MDOC_Ss):
+	case (MDOC_Bc):
+		tt = MDOC_Bo;
 		break;
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
+	case (MDOC_Dc):
+		tt = MDOC_Do;
+		break;
+	case (MDOC_Ec):
+		tt = MDOC_Eo;
+		break;
+	case (MDOC_Ed):
+		tt = MDOC_Bd;
+		break;
+	case (MDOC_Ef):
+		tt = MDOC_Bf;
+		break;
+	case (MDOC_Ek):
+		tt = MDOC_Bk;
+		break;
+	case (MDOC_El):
+		tt = MDOC_Bl;
+		break;
+	case (MDOC_Fc):
+		tt = MDOC_Fo;
+		break;
+	case (MDOC_Oc):
+		tt = MDOC_Oo;
+		break;
+	case (MDOC_Pc):
+		tt = MDOC_Po;
+		break;
+	case (MDOC_Qc):
+		tt = MDOC_Qo;
+		break;
+	case (MDOC_Re):
+		tt = MDOC_Rs;
+		break;
+	case (MDOC_Sc):
+		tt = MDOC_So;
+		break;
+	case (MDOC_Xc):
+		tt = MDOC_Xo;
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	assert(sz >= 0);
-	args[sz] = NULL;
-	mdoc_block_alloc(mdoc, pos, tok, 0, NULL);
-	mdoc_head_alloc(mdoc, pos, tok, (size_t)sz, _CC(args));
-	mdoc_body_alloc(mdoc, pos, tok);
-	return(1);
+	switch (tok) {
+	case (MDOC_Ec):
+		maxargs = 1;
+		break;
+	default:
+		maxargs = 0;
+		break;
+	}
+
+	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
+		if (0 == buf[*pos])
+			return(rewind_expblock(mdoc, tt));
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0));
+	}
+
+	if ( ! rewind_body(mdoc, tt))
+		return(0);
+
+	lastarg = ppos;
+	flushed = 0;
+
+	if (maxargs > 0) {
+		if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+			return(0);
+		mdoc->next = MDOC_NEXT_CHILD;
+	}
+
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_expblock(mdoc, tt))
+				return(0);
+			flushed = 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, tt))
+					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;
+	}
+
+	if (MDOC_LINEARG_MAX == j)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	if ( ! flushed && ! rewind_expblock(mdoc, tt))
+		return(0);
+
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
-static int
-append_text(struct mdoc *mdoc, int tok, 
-		int pos, int sz, char *args[])
+/*
+ * A general text domain macro.  When invoked, this opens a scope that
+ * accepts words until either end-of-line, only-punctuation, or a
+ * callable macro.  If the word is punctuation (not only-punctuation),
+ * then the scope is closed out, the punctuation appended, then the
+ * scope opened again.  If any terminating conditions are met, the scope
+ * is closed out.  If this is the first macro in the line and
+ * only-punctuation remains, this punctuation is flushed.
+ */
+int
+macro_text(MACRO_PROT_ARGS)
 {
+	int		  la, lastpunct, c, sz, fl, argc;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
 
-	assert(sz >= 0);
-	args[sz] = NULL;
+	la = ppos;
+	lastpunct = 0;
 
-	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
-	case (MDOC_Ft):
-		/* FALLTHROUGH */
-	case (MDOC_Li):
-		/* FALLTHROUGH */
-	case (MDOC_Ms):
-		/* FALLTHROUGH */
-	case (MDOC_Pa):
-		/* FALLTHROUGH */
-	case (MDOC_Tn):
-		if (0 < sz)
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		la = *pos;
+
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c || ARGV_WORD == c)
 			break;
-		if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1))
+		else if (ARGV_ARG == c)
+			continue;
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc, argv);
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, la, 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;
+
+	for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+		la = *pos;
+
+		if (lastpunct) {
+			c = mdoc_elem_alloc(mdoc, line, 
+					la, tok, argc, argv);
+			if (0 == c) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
+			mdoc->next = MDOC_NEXT_CHILD;
+			lastpunct = 0;
+		}
+
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+		if (ARGS_ERROR == c) {
+			mdoc_argv_free(argc, argv);
 			return(0);
-		break;
-	case (MDOC_Ar):
-		/* FALLTHROUGH */
-	case (MDOC_Cm):
-		/* FALLTHROUGH */
-	case (MDOC_Fl):
-		break;
-	case (MDOC_Ad):
-		/* FALLTHROUGH */
-	case (MDOC_Em):
-		/* FALLTHROUGH */
-	case (MDOC_Er):
-		/* FALLTHROUGH */
-	case (MDOC_Ev):
-		/* FALLTHROUGH */
-	case (MDOC_Fa):
-		/* FALLTHROUGH */
-	case (MDOC_Dv):
-		/* FALLTHROUGH */
-	case (MDOC_Ic):
-		/* FALLTHROUGH */
-	case (MDOC_Va):
-		/* FALLTHROUGH */
-	case (MDOC_Vt):
-		if (0 < sz) 
+		}
+
+		if (ARGS_EOLN == c)
 			break;
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
-	default:
-		abort();
-		/* NOTREACHED */
+		if (ARGS_PUNCT == c)
+			break;
+
+		if (-1 == (c = lookup(mdoc, line, la, tok, p)))
+			return(0);
+		else if (MDOC_MAX != c) {
+			if ( ! 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, tok, line, pos, buf));
+		}
+
+		if (mdoc_isdelim(p)) {
+			if ( ! rewind_elem(mdoc, tok)) {
+				mdoc_argv_free(argc, argv);
+				return(0);
+			}
+			lastpunct = 1;
+		}
+		if ( ! mdoc_word_alloc(mdoc, line, la, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
-	mdoc_elem_alloc(mdoc, pos, tok, 0, 
-			NULL, (size_t)sz, _CC(args));
-	return(1);
+	mdoc_argv_free(argc, argv);
+
+	if (sz == MDOC_LINEARG_MAX)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	if ( ! rewind_elem(mdoc, tok))
+		return(0);
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
+/*
+ * Implicit- or explicit-end multi-line scoped macro.
+ */
 int
-macro_text(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf)
+macro_scoped(MACRO_PROT_ARGS)
 {
-	int		  lastarg, c, lasttok, lastpunct, j;
-	char		 *args[MDOC_LINEARG_MAX], *p;
+	int		  c, lastarg, argc, j;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
 
-	lasttok = ppos;
-	lastpunct = 0;
-	j = 0;
+	assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
-again:
+	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) 
+		if ( ! rewind_impblock(mdoc, tok))
+			return(0);
 
-	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[j]);
-	
-	if (-1 == c) 
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c || ARGV_WORD == c)
+			break;
+		else if (ARGV_ARG == c)
+			continue;
+		mdoc_argv_free(argc, argv);
 		return(0);
-	if (0 == c && ! lastpunct)
-		return(append_text(mdoc, tok, lasttok, j, args));
-	else if (0 == c)
+	}
+
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc, argv);
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+	}
+
+	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_head(mdoc, tok))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
+		mdoc->next = MDOC_NEXT_CHILD;
 		return(1);
+	}
 
-	/* Command found. */
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	if (MDOC_MAX != (c = mdoc_find(mdoc, args[j]))) {
-		if ( ! lastpunct)
-			if ( ! append_text(mdoc, tok, lasttok, j, args))
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+		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 ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 				return(0);
-		return(mdoc_macro(mdoc, c, lastarg, pos, buf));
+			mdoc->next = MDOC_NEXT_SIBLING;
+			continue;
+		} 
+
+		if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+			return(0);
+		break;
 	}
 
-	/* Word found. */
+	if (j == MDOC_LINEARG_MAX)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	if ( ! mdoc_isdelim(args[j])) {
-		j++;
-		goto again;
+	if ( ! rewind_head(mdoc, tok))
+		return(0);
+	if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf))
+		return(0);
+
+	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	return(1);
+}
+
+
+/*
+ * When scoped to a line, a macro encompasses all of the contents.  This
+ * differs from constants or text macros, where a new macro will
+ * terminate the existing context.
+ */
+int
+macro_scoped_line(MACRO_PROT_ARGS)
+{
+	int		  lastarg, c, j;
+	char		  *p;
+
+	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+		return(0);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	/* XXX - no known argument macros. */
+
+	for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+		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 ( ! 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;
 	}
 
-	/* Punctuation found.  */
+	if (j == MDOC_LINEARG_MAX)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	p = args[j]; /* Save argument (NULL-ified in append). */
+	if (1 == ppos) {
+		if ( ! rewind_head(mdoc, tok))
+			return(0);
+		if ( ! append_delims(mdoc, tok, line, pos, buf))
+			return(0);
+	}
+	return(rewind_impblock(mdoc, tok));
+}
 
-	if ( ! lastpunct)
-		if ( ! append_text(mdoc, tok, lasttok, j, args))
+
+/*
+ * Constant-scope macros accept a fixed number of arguments and behave
+ * like constant macros except that they're scoped across lines.
+ */
+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_head(mdoc, tok))
+			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);
 
-	args[j] = p;
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	mdoc_word_alloc(mdoc, lastarg, args[j]);
-	lastpunct = 1;
-	j = 0;
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
 
-	goto again;
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_head(mdoc, tok))
+				return(0);
+			flushed = 1;
+			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+				return(0);
+			mdoc->next = MDOC_NEXT_CHILD;
+		}
 
-	/* NOTREACHED */
+		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_head(mdoc, tok))
+					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;
+		}
+
+		if ( ! flushed && mdoc_isdelim(p)) {
+			if ( ! rewind_head(mdoc, tok))
+				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 (MDOC_LINEARG_MAX == j)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	if ( ! flushed) {
+		if ( ! rewind_head(mdoc, tok))
+			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, tok, line, pos, buf));
 }
 
 
+/*
+ * Delimited macros are like text macros except that, should punctuation
+ * be encountered, the macro isn't re-started with remaining tokens
+ * (it's only emitted once).  Delimited macros can have a maximum number
+ * of arguments.
+ */
 int
-macro_scoped_implicit(struct mdoc *mdoc, 
-		int tok, int ppos, int *pos, char *buf)
+macro_constant_delimited(MACRO_PROT_ARGS)
 {
-	int		  t, c, lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX];
-	struct mdoc_node *n;
+	int		  lastarg, flushed, j, c, maxargs, argc;
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	char		 *p;
 
-	/*
-	 * Look for an implicit parent.
-	 */
+	lastarg = ppos;
+	flushed = 0;
 
-	assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
+	switch (tok) {
+	case (MDOC_No):
+		/* FALLTHROUGH */
+	case (MDOC_Ns):
+		/* FALLTHROUGH */
+	case (MDOC_Ux):
+		/* FALLTHROUGH */
+	case (MDOC_St):
+		maxargs = 0;
+		break;
+	default:
+		maxargs = 1;
+		break;
+	}
 
-	/* LINTED */
-	for (n = mdoc->last; n; n = n->parent) {
-		if (MDOC_BLOCK != n->type) 
-			continue;
-		if (tok == (t = n->data.block.tok))
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c || ARGV_WORD == c)
 			break;
-		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+		else if (ARGV_ARG == c)
 			continue;
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+		mdoc_argv_free(argc, argv);
+		return(0);
 	}
 
-	if (n) {
-		mdoc->last = n;
-		mdoc_msg(mdoc, ppos, "scope: rewound `%s'",
-				mdoc_macronames[tok]);
-	} else
-		mdoc_msg(mdoc, ppos, "scope: new `%s'",
-				mdoc_macronames[tok]);
+	c = mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
 
-	j = 0;
+	if (0 == c)
+		return(0);
 
-again:
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[j]);
+	for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+		lastarg = *pos;
+
+		if (j == maxargs && ! flushed) {
+			if ( ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 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 && ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 1;
+			if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+				return(0);
+			break;
+		}
+
+		if ( ! flushed && mdoc_isdelim(p)) {
+			if ( ! rewind_elem(mdoc, tok))
+				return(0);
+			flushed = 1;
+		}
 	
-	if (-1 == c) 
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
+
+	if (MDOC_LINEARG_MAX == j)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	if ( ! flushed && rewind_elem(mdoc, tok))
 		return(0);
+
+	if (ppos > 1)
+		return(1);
+	return(append_delims(mdoc, tok, line, pos, buf));
+}
+
+
+/*
+ * Constant macros span an entire line:  they constitute a macro and all
+ * of its arguments and child data.
+ */
+int
+macro_constant(MACRO_PROT_ARGS)
+{
+	int		 c, lastarg, argc, sz, fl;
+	struct mdoc_arg	 argv[MDOC_LINEARG_MAX];
+	char		*p;
+
+	/* FIXME: parsing macros! */
+
+	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;
+		else if (ARGV_ARG == c)
+			continue;
+		else if (ARGV_WORD == c)
+			break;
+
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
+
+	c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+	mdoc_argv_free(argc, argv);
+
 	if (0 == c)
-		return(append_scoped(mdoc, tok, ppos, j, args));
+		return(0);
 
-	/* Command found. */
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	if (MDOC_MAX != (c = mdoc_find(mdoc, args[j])))
-		if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+	if (MDOC_LINEARG_MAX == argc)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+	for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+		if (ARGS_ERROR == c)
 			return(0);
+		if (ARGS_EOLN == c)
+			break;
 
-	/* Word found. */
+		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
 
-	j++;
-	goto again;
+	if (MDOC_LINEARG_MAX == sz + argc)
+		return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
 
-	/* NOTREACHED */
+	return(rewind_elem(mdoc, tok));
+}
+
+
+/* ARGSUSED */
+int
+macro_obsolete(MACRO_PROT_ARGS)
+{
+
+	return(mdoc_pwarn(mdoc, line, ppos, WARN_IGN_OBSOLETE));
+}
+
+
+int
+macro_end(struct mdoc *mdoc)
+{
+
+	assert(mdoc->first);
+	assert(mdoc->last);
+	return(rewind_last(mdoc, mdoc->first));
 }