===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.5
retrieving revision 1.17
diff -u -p -r1.5 -r1.17
--- mandoc/Attic/macro.c	2008/12/17 17:18:38	1.5
+++ mandoc/Attic/macro.c	2009/01/02 14:06:16	1.17
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.5 2008/12/17 17:18:38 kristaps Exp $ */
+/* $Id: macro.c,v 1.17 2009/01/02 14:06:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,103 +21,143 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef	__linux__
+#include <time.h>
+#endif
 
 #include "private.h"
 
+/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
+
 #define	_CC(p)	((const char **)p)
 
-static	int	  xstrlcat(char *, const char *, size_t);
-static	int	  xstrlcpy(char *, const char *, size_t);
-static	int	  xstrcmp(const char *, const char *);
+static	int	  scope_rewind_imp(struct mdoc *, int, int);
+static	int	  scope_rewind_exp(struct mdoc *, int, int, int);
+static	int	  scope_rewind_line(struct mdoc *, int, int);
 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	  append_text_argv(struct mdoc *, int, int, 
+			int, char *[], int, const struct mdoc_arg *);
+static	int	  append_delims(struct mdoc *, int, int *, char *);
 
 
 static int
-args_next(struct mdoc *mdoc, int tok, 
-		int *pos, char *buf, char **v)
+scope_rewind_line(struct mdoc *mdoc, int ppos, int tok)
 {
+	struct mdoc_node *n;
+	int		  t;
 
-	if (0 == buf[*pos])
-		return(0);
+	/* LINTED */
+	for (n = mdoc->last; n; n = n->parent) {
+		if (MDOC_HEAD != n->type) 
+			continue;
+		if (tok == (t = n->data.head.tok))
+			break;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+			continue;
+		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+	}
 
-	assert( ! isspace(buf[*pos]));
+	mdoc->last = n ? n : mdoc->last;
+	mdoc->next = MDOC_NEXT_SIBLING;
+	return(1);
+}
 
-	if ('\"' == buf[*pos]) {
-		(void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_QUOTE);
-		return(-1);
+
+static int
+scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int tt)
+{
+	struct mdoc_node *n;
+
+	assert(mdoc->last);
+
+	/* LINTED */
+	for (n = mdoc->last->parent; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type) 
+			continue;
+		if (tt == n->data.block.tok)
+			break;
+		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
 	}
 
-	*v = &buf[*pos];
+	if (NULL == (mdoc->last = n))
+		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
 
-	/* Scan ahead to end of token. */
+	mdoc->next = MDOC_NEXT_SIBLING;
+	return(mdoc_valid_post(mdoc, tok, ppos));
+}
 
-	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
+scope_rewind_imp(struct mdoc *mdoc, int ppos, 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->data.block.tok))
+			break;
+		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+			continue;
+		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
 	}
 
-	if (0 == buf[*pos])
-		return(1);
+	mdoc->last = n ? n : mdoc->last;
+	mdoc->next = MDOC_NEXT_SIBLING;
+	return(mdoc_valid_post(mdoc, tok, ppos));
+}
 
-	/* 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 *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, tok, pos, buf, 0, &p);
+		if (ARGS_ERROR == c)
+			return(0);
+		else if (ARGS_EOLN == c)
+			break;
+		assert(mdoc_isdelim(p));
+		mdoc_word_alloc(mdoc, lastarg, p);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
+
 	return(1);
 }
 
 
 static int
-append_scoped(struct mdoc *mdoc, int tok, 
-		int pos, int sz, char *args[])
+append_text_argv(struct mdoc *mdoc, int tok, int pos, 
+		int sz, char *args[],
+		int argc, const struct mdoc_arg *argv)
 {
-	enum mdoc_sec	 sec;
 
-	if (0 == sz) 
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
+	if ( ! mdoc_valid_pre(mdoc, tok, pos, 0, NULL, argc, argv))
+		return(0);
 
 	switch (tok) {
-	 /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
-	case (MDOC_Sh):
-		sec = mdoc_atosec((size_t)sz, _CC(args));
-		if (SEC_CUSTOM != sec && sec < mdoc->sec_lastn)
-			if ( ! mdoc_warn(mdoc, tok, pos, WARN_SEC_OO))
-				return(0);
-
-		if (SEC_BODY == mdoc->sec_last && SEC_NAME != sec)
-			return(mdoc_err(mdoc, tok, pos, ERR_SEC_NAME));
-
-		if (SEC_CUSTOM != sec)
-			mdoc->sec_lastn = sec;
-		mdoc->sec_last = sec;
+	case (MDOC_Pf):
+		/* TODO: only use first two arguments in element. */
 		break;
-	case (MDOC_Ss):
-		break;
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
 	default:
-		abort();
-		/* NOTREACHED */
+		break;
 	}
 
-	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);
+	mdoc_elem_alloc(mdoc, pos, tok, (size_t)argc, 
+			argv, (size_t)sz, _CC(args));
+	mdoc->next = MDOC_NEXT_SIBLING;
 	return(1);
 }
 
@@ -127,59 +167,36 @@ append_text(struct mdoc *mdoc, int tok, 
 		int pos, int sz, char *args[])
 {
 
-	assert(sz >= 0);
-	args[sz] = NULL;
+	if ( ! mdoc_valid_pre(mdoc, tok, pos, sz, _CC(args), 0, NULL))
+		return(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)
+	case (MDOC_At):
+		if (0 == sz)
 			break;
-		if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1))
-			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) 
-			break;
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-	 /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
+		if (ATT_DEFAULT == mdoc_atoatt(args[0])) {
+			mdoc_elem_alloc(mdoc, pos, tok, 
+					0, NULL, 0, NULL);
+			mdoc->next = MDOC_NEXT_SIBLING;
+			mdoc_word_alloc(mdoc, pos, args[0]);
+			mdoc->next = MDOC_NEXT_SIBLING;
+		} else {
+			mdoc_elem_alloc(mdoc, pos, tok, 0, 
+					NULL, 1, _CC(&args[0]));
+			mdoc->next = MDOC_NEXT_SIBLING;
+		}
+
+		if (sz > 1)
+			mdoc_word_alloc(mdoc, pos, args[1]);
+		mdoc->next = MDOC_NEXT_SIBLING;
+		return(1);
+
 	default:
-		abort();
-		/* NOTREACHED */
+		break;
 	}
 
-	mdoc_elem_alloc(mdoc, pos, tok, 0, 
-			NULL, (size_t)sz, _CC(args));
+	mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
+	mdoc->next = MDOC_NEXT_SIBLING;
 	return(1);
 }
 
@@ -187,255 +204,504 @@ append_text(struct mdoc *mdoc, int tok, 
 int
 macro_text(MACRO_PROT_ARGS)
 {
-	int		  lastarg, c, lasttok, lastpunct, j;
-	char		 *args[MDOC_LINEARG_MAX], *p;
+	int		  lastarg, lastpunct, c, j, fl;
+	char		 *args[MDOC_LINEARG_MAX];
 
-	lasttok = ppos;
-	lastpunct = 0;
+	/* Token pre-processing.  */
+
+	switch (tok) {
+	case (MDOC_Pp):
+		/* `.Pp' ignored when following `.Sh' or `.Ss'. */
+		assert(mdoc->last);
+		if (MDOC_BODY != mdoc->last->type)
+			break;
+		switch (mdoc->last->data.body.tok) {
+		case (MDOC_Ss):
+			/* FALLTHROUGH */
+		case (MDOC_Sh):
+			if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_AFTER_BLK))
+				return(0);
+			return(1);
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+
+	/* Process line parameters. */
+
 	j = 0;
+	lastarg = ppos;
+	lastpunct = 0;
+	fl = ARGS_DELIM;
 
-	if (SEC_PROLOGUE == mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+	if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+		fl |= ARGS_QUOTED;
 
 again:
+	if (j == MDOC_LINEARG_MAX)
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
 
+	/* 
+	 * Parse out the next argument, unquoted and unescaped.   If
+	 * we're a word (which may be punctuation followed eventually by
+	 * a real word), then fall into checking for callables.  If
+	 * only punctuation remains and we're the first, then flush
+	 * arguments, punctuation and exit; else, return to the caller.
+	 */
+
 	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[j]);
-	
-	if (-1 == c) 
+
+	switch (mdoc_args(mdoc, tok, pos, buf, fl, &args[j])) {
+	case (ARGS_ERROR):
 		return(0);
-	if (0 == c && ! lastpunct)
-		return(append_text(mdoc, tok, lasttok, j, args));
-	else if (0 == c)
-		return(1);
+	case (ARGS_WORD):
+		break;
+	case (ARGS_PUNCT):
+		if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
+			return(0);
+		if (ppos > 1)
+			return(1);
+		return(append_delims(mdoc, tok, pos, buf));
+	case (ARGS_EOLN):
+		if (lastpunct)
+			return(1);
+		return(append_text(mdoc, tok, ppos, j, args));
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 
-	/* Command found. */
+	/* 
+	 * Command found.  First flush out arguments, then call the
+	 * command.  If we're the line macro when it exits, flush
+	 * terminal punctuation.
+	 */
 
 	if (MDOC_MAX != (c = mdoc_find(mdoc, args[j]))) {
-		if ( ! lastpunct)
-			if ( ! append_text(mdoc, tok, lasttok, j, args))
-				return(0);
-		return(mdoc_macro(mdoc, c, lastarg, pos, buf));
+		if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
+			return(0);
+		if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			return(0);
+		if (ppos > 1)
+			return(1);
+		return(append_delims(mdoc, tok, pos, buf));
 	}
 
-	/* Word found. */
+	/* Word/non-term-punctuation found. */
 
 	if ( ! mdoc_isdelim(args[j])) {
+		/* Words are appended to the array of arguments. */
 		j++;
+		lastpunct = 0;
 		goto again;
 	}
 
-	/* Punctuation found.  */
+	/* 
+	 * For punctuation, flush all collected words, then flush
+	 * punctuation, then start collecting again.   Of course, this
+	 * is non-terminal punctuation.
+	 */
 
-	p = args[j]; /* Save argument (NULL-ified in append). */
+	if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
+		return(0);
 
-	if ( ! lastpunct)
-		if ( ! append_text(mdoc, tok, lasttok, j, args))
-			return(0);
-
-	args[j] = p;
-
 	mdoc_word_alloc(mdoc, lastarg, args[j]);
-	lastpunct = 1;
+	mdoc->next = MDOC_NEXT_SIBLING;
 	j = 0;
+	lastpunct = 1;
 
 	goto again;
-
 	/* NOTREACHED */
 }
 
 
+
+/* ARGSUSED */
 int
-macro_prologue_dtitle(MACRO_PROT_ARGS)
+macro_close_explicit(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, j;
+	int		 tt;
+
+	/*
+	 * First close out the explicit scope.  The `end' tags (such as
+	 * `.El' to `.Bl' don't cause anything to happen: we merely
+	 * readjust our last parse point.
+	 */
+
+	switch (tok) {
+	case (MDOC_El):
+		tt = MDOC_Bl;
+		break;
+	case (MDOC_Ed):
+		tt = MDOC_Bd;
+		break;
+	case (MDOC_Re):
+		tt = MDOC_Rs;
+		break;
+	case (MDOC_Ef):
+		tt = MDOC_Bf;
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	return(scope_rewind_exp(mdoc, ppos, tok, tt));
+}
+
+
+int
+macro_scoped(MACRO_PROT_ARGS)
+{
+	int		  i, c, lastarg, argc, sz;
 	char		 *args[MDOC_LINEARG_MAX];
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
+	enum mdoc_sec	  sec;
+	struct mdoc_node *n;
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-	if (0 == mdoc->meta.date)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-	if (mdoc->meta.title[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+	assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
-	j = -1;
+	/* Token pre-processing. */
 
-again:
+	switch (tok) {
+	case (MDOC_Bl):
+		/* FALLTHROUGH */
+	case (MDOC_Bd):
+		/* `.Pp' ignored when preceding `.Bl' or `.Bd'. */
+		assert(mdoc->last);
+		if (MDOC_ELEM != mdoc->last->type)
+			break;
+		if (MDOC_Pp != mdoc->last->data.elem.tok)
+			break;
+		if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
+			return(0);
+		assert(mdoc->last->prev);
+		n = mdoc->last;
+		mdoc->last = mdoc->last->prev;
+		mdoc->last->next = NULL;
+		mdoc_node_free(n);
+		break;
+	case (MDOC_Sh):
+		/* FALLTHROUGH */
+	case (MDOC_Ss):
+		if ( ! scope_rewind_imp(mdoc, ppos, tok))
+			return(0);
+		/* `.Pp' ignored when preceding `.Ss' or `.Sh'. */
+		if (NULL == mdoc->last)
+			break;
+		if (MDOC_ELEM != mdoc->last->type)
+			break;
+		if (MDOC_Pp != mdoc->last->data.elem.tok)
+			break;
+		if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
+			return(0);
+		assert(mdoc->last->prev);
+		n = mdoc->last;
+		mdoc_msg(mdoc, ppos, "removing prior `Pp' macro");
+		mdoc->last = mdoc->last->prev;
+		mdoc->last->next = NULL;
+		mdoc_node_free(n);
+		break;
+	default:
+		break;
+	}
+
+	/* Argument processing. */
+
 	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[++j]);
 
-	if (0 == c) {
-		mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; /* FIXME */
-		if (mdoc->meta.title)
-			return(1);
-		if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1))
-			return(0);
-		(void)xstrlcpy(mdoc->meta.title, 
-				"UNTITLED", META_TITLE_SZ);
-		return(1);
-	} else if (-1 == c)
+	for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+		lastarg = *pos;
+		c = mdoc_argv(mdoc, 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 (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-			(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+	}
+
+	/* Parameter processing. */
+
+	for (sz = 0; argc + sz < MDOC_LINEARG_MAX; sz++) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, tok, pos, buf, 0, &args[sz]);
+		if (ARGS_EOLN == c)
+			break;
+		if (ARGS_WORD == c)
+			continue;
+		mdoc_argv_free(argc, argv);
 		return(0);
+	}
 
-	if (0 == j) {
-		if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ))
-			goto again;
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS));
+	if (MDOC_LINEARG_MAX == (argc + sz)) {
+		mdoc_argv_free(argc, argv);
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	}
 
-	} else if (1 == j) {
-		mdoc->meta.msec = mdoc_atomsec(args[1]);
-		if (MSEC_DEFAULT != mdoc->meta.msec)
-			goto again;
-		return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGS));
+	/* Post-processing. */
 
-	} else if (2 == j) {
-		mdoc->meta.vol = mdoc_atovol(args[2]);
-		if (VOL_DEFAULT != mdoc->meta.vol)
-			goto again;
-		mdoc->meta.arch = mdoc_atoarch(args[2]);
-		if (ARCH_DEFAULT != mdoc->meta.arch)
-			goto again;
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS));
+	if ( ! mdoc_valid_pre(mdoc, tok, ppos, sz, _CC(args), argc, argv)) {
+		mdoc_argv_free(argc, argv);
+		return(0);
 	}
 
-	return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	switch (tok) {
+	case (MDOC_Sh):
+		sec = mdoc_atosec((size_t)sz, _CC(args));
+		if (SEC_CUSTOM != sec)
+			mdoc->sec_lastn = sec;
+		mdoc->sec_last = sec;
+		break;
+	default:
+		break;
+	}
+
+	mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	mdoc_argv_free(argc, argv);
+
+	mdoc_head_alloc(mdoc, ppos, tok);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	for (i = 0; i < sz; i++) {
+		mdoc_word_alloc(mdoc, ppos, args[i]);
+		mdoc->next = MDOC_NEXT_SIBLING;
+	}
+
+	if ( ! scope_rewind_line(mdoc, ppos, tok))
+		return(0);
+
+	mdoc_body_alloc(mdoc, ppos, tok);
+	mdoc->next = MDOC_NEXT_CHILD;
+
+	return(1);
 }
 
 
 int
-macro_prologue_ddate(MACRO_PROT_ARGS)
+macro_scoped_line(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX], date[64];
+	int		  lastarg, c, j;
+	char		  *p;
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-	if (mdoc->meta.title[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-	if (mdoc->meta.date)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+	assert(1 == ppos);
+	
+	mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+	mdoc->next = MDOC_NEXT_CHILD;
 
-	j = -1;
-	date[0] = 0;
+	mdoc_head_alloc(mdoc, ppos, tok);
+	mdoc->next = MDOC_NEXT_CHILD;
 
+	if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL, 0, NULL))
+		return(0);
+
+	/* Process line parameters. */
+
+	j = 0;
+	lastarg = ppos;
+
 again:
+	if (j == MDOC_LINEARG_MAX)
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
 
 	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[++j]);
-	if (0 == c) {
-		if (mdoc->meta.date)
-			return(1);
-		mdoc->meta.date = mdoc_atotime(date);
-		if (mdoc->meta.date)
-			return(1);
-		return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGS));
-	} else if (-1 == c) 
+	c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+
+	switch (c) {
+	case (ARGS_ERROR):
 		return(0);
-	
-	if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-			(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
-		return(0);
-	
-	if (0 == j) {
-		if (xstrcmp("$Mdocdate: December 17 2008 $", args[j])) {
-			mdoc->meta.date = time(NULL);
-			goto again;
-		} else if (xstrcmp("$Mdocdate:", args[j])) 
-			goto again;
-	} else if (4 == j)
-		if ( ! xstrcmp("$", args[j]))
-			goto again;
+	case (ARGS_WORD):
+		break;
+	case (ARGS_PUNCT):
+		if (ppos > 1)
+			return(scope_rewind_imp(mdoc, ppos, tok));
+		if ( ! scope_rewind_line(mdoc, ppos, tok))
+			return(0);
+		if ( ! append_delims(mdoc, tok, pos, buf))
+			return(0);
+		return(scope_rewind_imp(mdoc, ppos, tok));
+	case (ARGS_EOLN):
+		return(scope_rewind_imp(mdoc, ppos, tok));
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 
-	if ( ! xstrlcat(date, args[j], sizeof(date)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS));
-	if ( ! xstrlcat(date, " ", sizeof(date)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS));
+	if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+		if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			return(0);
+		if (ppos > 1)
+			return(scope_rewind_imp(mdoc, ppos, tok));
+		if ( ! scope_rewind_line(mdoc, ppos, tok))
+			return(0);
+		if ( ! append_delims(mdoc, tok, pos, buf))
+			return(0);
+		return(scope_rewind_imp(mdoc, ppos, tok));
+	}
 
+	if (mdoc_isdelim(p))
+		j = 0;
+
+	mdoc_word_alloc(mdoc, lastarg, p);
+	mdoc->next = MDOC_NEXT_SIBLING;
 	goto again;
 	/* NOTREACHED */
 }
 
 
+/* 
+ * FIXME: like in with macro_constant, have the append_ routine chop the
+ * number of requisite arguments (this is ugly when done in-line).
+ */
 int
-macro_scoped_implicit(MACRO_PROT_ARGS)
+macro_constant_delimited(MACRO_PROT_ARGS)
 {
-	int		  t, c, lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX];
-	struct mdoc_node *n;
+	int		  lastarg, flushed, c, maxargs;
+	char		 *p;
 
-	assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
+	/* Process line parameters. */
 
-	if (SEC_PROLOGUE == mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+	lastarg = ppos;
+	flushed = 0;
 
-	/* LINTED */
-	for (n = mdoc->last; n; n = n->parent) {
-		if (MDOC_BLOCK != n->type) 
-			continue;
-		if (tok == (t = n->data.block.tok))
-			break;
-		if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
-			continue;
-		return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+	/* Token pre-processing. */
+
+	switch (tok) {
+	case (MDOC_No):
+		/* FALLTHROUGH */
+	case (MDOC_Ns):
+		/* FALLTHROUGH */
+	case (MDOC_Ux):
+		maxargs = 0;
+		break;
+	default:
+		maxargs = 1;
+		break;
 	}
 
-	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]);
-
-	j = 0;
-
 again:
-
 	lastarg = *pos;
-	c = args_next(mdoc, tok, pos, buf, &args[j]);
-	
-	if (-1 == c) 
+
+	switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) {
+	case (ARGS_ERROR):
 		return(0);
-	if (0 == c)
-		return(append_scoped(mdoc, tok, ppos, j, args));
+	case (ARGS_WORD):
+		break;
+	case (ARGS_PUNCT):
+		if ( ! flushed && ! append_text(mdoc, tok, ppos, 0, &p))
+			return(0);
+		if (ppos > 1)
+			return(1);
+		return(append_delims(mdoc, tok, pos, buf));
+	case (ARGS_EOLN):
+		if (flushed)
+			return(1);
+		return(append_text(mdoc, tok, ppos, 0, &p));
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 
-	/* Command found. */
+	/* Accepts no arguments: flush out symbol and continue. */
 
-	if (MDOC_MAX != (c = mdoc_find(mdoc, args[j])))
-		if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+	if ( ! flushed && 0 == maxargs) {
+		if ( ! append_text(mdoc, tok, ppos, 0, &p))
 			return(0);
+		flushed = 1;
+	}
 
-	/* Word found. */
+	if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+		if ( ! flushed && ! append_text(mdoc, tok, ppos, 0, &p))
+			return(0);
+		if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+			return(0);
+		if (ppos > 1)
+			return(1);
+		return(append_delims(mdoc, tok, pos, buf));
+	}
 
-	j++;
-	goto again;
+	/* 
+	 * We only accept one argument; subsequent tokens are considered
+	 * as literal words (until a macro).
+	 */
 
+	if ( ! flushed && ! mdoc_isdelim(p)) {
+	       if ( ! append_text(mdoc, tok, ppos, 1, &p))
+			return(0);
+		flushed = 1;
+		goto again;
+	} else if ( ! flushed) {
+		if ( ! append_text(mdoc, tok, ppos, 0, &p))
+			return(0);
+		flushed = 1;
+	}
+
+	mdoc_word_alloc(mdoc, lastarg, p);
+	mdoc->next = MDOC_NEXT_SIBLING;
+	goto again;
 	/* NOTREACHED */
 }
 
 
-static int
-xstrcmp(const char *p1, const char *p2)
+int
+macro_constant(MACRO_PROT_ARGS)
 {
+	int		  c, lastarg, argc, sz, fl;
+	char		 *args[MDOC_LINEARG_MAX];
+	struct mdoc_arg	  argv[MDOC_LINEARG_MAX];
 
-	return(0 == strcmp(p1, p2));
-}
+	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, tok, &argv[argc], pos, buf);
+		if (ARGV_EOLN == c) 
+			break;
+		else if (ARGV_ARG == c)
+			continue;
+		else if (ARGV_WORD == c)
+			break;
 
-static int
-xstrlcat(char *dst, const char *src, size_t sz)
-{
+		mdoc_argv_free(argc, argv);
+		return(0);
+	}
 
-	return(strlcat(dst, src, sz) < sz);
+	if (MDOC_LINEARG_MAX == argc) {
+		mdoc_argv_free(argc, argv);
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	}
+
+	for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+		lastarg = *pos;
+		c = mdoc_args(mdoc, tok, pos, buf, fl, &args[sz]);
+		if (ARGS_ERROR == c)
+			return(0);
+		if (ARGS_EOLN == c)
+			break;
+	}
+
+	if (MDOC_LINEARG_MAX == sz + argc) {
+		mdoc_argv_free(argc, argv);
+		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	}
+
+	c = append_text_argv(mdoc, tok, ppos, sz, args, argc, argv);
+	mdoc_argv_free(argc, argv);
+	return(c);
 }
 
 
-static int
-xstrlcpy(char *dst, const char *src, size_t sz)
+/* ARGSUSED */
+int
+macro_obsolete(MACRO_PROT_ARGS)
 {
 
-	return(strlcpy(dst, src, sz) < sz);
+	return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE));
 }