===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.31
retrieving revision 1.41
diff -u -p -r1.31 -r1.41
--- mandoc/roff.c	2008/12/02 00:10:37	1.31
+++ mandoc/roff.c	2008/12/05 11:28:17	1.41
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.31 2008/12/02 00:10:37 kristaps Exp $ */
+/* $Id: roff.c,v 1.41 2008/12/05 11:28:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,6 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/param.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -30,22 +31,18 @@
 #include "libmdocml.h"
 #include "private.h"
 
+/* FIXME: First letters of quoted-text interpreted in rofffindtok. */
+/* FIXME: `No' not implemented. */
 /* TODO: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */
-
 /* TODO: warn about "X section only" macros. */
-
 /* TODO: warn about empty lists. */
-
 /* TODO: (warn) some sections need specific elements. */
-
 /* TODO: (warn) NAME section has particular order. */
-
 /* TODO: unify empty-content tags a la <br />. */
-
 /* TODO: macros with a set number of arguments? */
+/* TODO: validate Dt macro arguments. */
+/* FIXME: Bl -diag ignore callable children. */
 
-#define	ROFF_MAXARG	  32
-
 enum	roffd { 
 	ROFF_ENTER = 0, 
 	ROFF_EXIT 
@@ -67,22 +64,17 @@ struct	rofftree;
 struct	rofftok {
 	int		(*cb)(ROFFCALL_ARGS);	/* Callback. */
 	const int	 *args;			/* Args (or NULL). */
-	const int	 *parents;
-	const int	 *children;
-	int		  ctx;
+	const int	 *parents;		/* Limit to parents. */
+	const int	 *children;		/* Limit to kids. */
+	int		  ctx;			/* Blk-close node. */
 	enum rofftype	  type;			/* Type of macro. */
-	int		  flags;
+	int	  	  flags;
 #define	ROFF_PARSED	 (1 << 0)		/* "Parsed". */
 #define	ROFF_CALLABLE	 (1 << 1)		/* "Callable". */
 #define	ROFF_SHALLOW	 (1 << 2)		/* Nesting block. */
-#define	ROFF_LSCOPE	 (1 << 3)
+#define	ROFF_LSCOPE	 (1 << 3)		/* Line scope. */
 };
 
-struct	roffarg {
-	int		  flags;
-#define	ROFF_VALUE	 (1 << 0)		/* Has a value. */
-};
-
 struct	roffnode {
 	int		  tok;			/* Token id. */
 	struct roffnode	 *parent;		/* Parent (or NULL). */
@@ -90,43 +82,38 @@ struct	roffnode {
 
 struct	rofftree {
 	struct roffnode	 *last;			/* Last parsed node. */
-	char		 *cur;
-
+	char		 *cur;			/* Line start. */
 	struct tm	  tm;			/* `Dd' results. */
 	char		  os[64];		/* `Os' results. */
 	char		  title[64];		/* `Dt' results. */
 	char		  section[64];		/* `Dt' results. */
 	char		  volume[64];		/* `Dt' results. */
-
 	int		  state;
 #define	ROFF_PRELUDE	 (1 << 1)		/* In roff prelude. */
 #define	ROFF_PRELUDE_Os	 (1 << 2)		/* `Os' is parsed. */
 #define	ROFF_PRELUDE_Dt	 (1 << 3)		/* `Dt' is parsed. */
 #define	ROFF_PRELUDE_Dd	 (1 << 4)		/* `Dd' is parsed. */
 #define	ROFF_BODY	 (1 << 5)		/* In roff body. */
-
-	struct roffcb	  cb;
-	void		 *arg;
+	struct roffcb	  cb;			/* Callbacks. */
+	void		 *arg;			/* Callbacks' arg. */
 };
 
 static	int		  roff_Dd(ROFFCALL_ARGS);
 static	int		  roff_Dt(ROFFCALL_ARGS);
 static	int		  roff_Os(ROFFCALL_ARGS);
 static	int		  roff_Ns(ROFFCALL_ARGS);
-
+static	int		  roff_Sm(ROFFCALL_ARGS);
 static	int		  roff_layout(ROFFCALL_ARGS);
 static	int		  roff_text(ROFFCALL_ARGS);
 static	int		  roff_noop(ROFFCALL_ARGS);
 static	int		  roff_depr(ROFFCALL_ARGS);
-
+static	int		  roff_ordered(ROFFCALL_ARGS);
 static	struct roffnode	 *roffnode_new(int, struct rofftree *);
 static	void		  roffnode_free(struct rofftree *);
-
 static	void		  roff_warn(const struct rofftree *, 
 				const char *, char *, ...);
 static	void		  roff_err(const struct rofftree *, 
 				const char *, char *, ...);
-
 static	int		  roffpurgepunct(struct rofftree *, char **);
 static	int		  roffscan(int, const int *);
 static	int		  rofffindtok(const char *);
@@ -139,40 +126,47 @@ static	int		  roffnextopt(const struct rofftree *,
 				int, char ***, char **);
 static	int		  roffparseopts(struct rofftree *, int, 
 				char ***, int *, char **);
+static	int		  roffcall(struct rofftree *, int, char **);
 static	int 		  roffparse(struct rofftree *, char *);
-static	int		  textparse(const struct rofftree *, char *);
+static	int		  textparse(struct rofftree *, char *);
+static	int		  roffdata(struct rofftree *, int, char *);
+static	int		  roffspecial(struct rofftree *, int, char **);
 
+#ifdef __linux__ 
+extern	size_t		  strlcat(char *, const char *, size_t);
+extern	size_t		  strlcpy(char *, const char *, size_t);
+extern	int		  vsnprintf(char *, size_t, 
+				const char *, va_list);
+extern	char		 *strptime(const char *, const char *,
+				struct tm *);
+#endif
 
-static	const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit, 
-	ROFF_ARGMAX };
-static	const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled, 
-	ROFF_Literal, ROFF_File, ROFF_Offset, ROFF_Filled,
-	ROFF_Compact, ROFF_ARGMAX };
+
+static	const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit, ROFF_ARGMAX };
+static	const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled, ROFF_Literal,
+	ROFF_File, ROFF_Offset, ROFF_Filled, ROFF_Compact, ROFF_ARGMAX };
 static	const int roffarg_Bk[] = { ROFF_Words, ROFF_ARGMAX };
 static	const int roffarg_Ex[] = { ROFF_Std, ROFF_ARGMAX };
 static	const int roffarg_Rv[] = { ROFF_Std, ROFF_ARGMAX };
-static 	const int roffarg_Bl[] = { ROFF_Bullet, ROFF_Dash, 
-	ROFF_Hyphen, ROFF_Item, ROFF_Enum, ROFF_Tag, ROFF_Diag, 
-	ROFF_Hang, ROFF_Ohang, ROFF_Inset, ROFF_Column, ROFF_Offset, 
-	ROFF_Width, ROFF_Compact, ROFF_ARGMAX };
-static 	const int roffarg_St[] = {
-	ROFF_p1003_1_88, ROFF_p1003_1_90, ROFF_p1003_1_96,
-	ROFF_p1003_1_2001, ROFF_p1003_1_2004, ROFF_p1003_1,
-	ROFF_p1003_1b, ROFF_p1003_1b_93, ROFF_p1003_1c_95,
-	ROFF_p1003_1g_2000, ROFF_p1003_2_92, ROFF_p1387_2_95,
-	ROFF_p1003_2, ROFF_p1387_2, ROFF_isoC_90, ROFF_isoC_amd1,
-	ROFF_isoC_tcor1, ROFF_isoC_tcor2, ROFF_isoC_99, ROFF_ansiC,
-	ROFF_ansiC_89, ROFF_ansiC_99, ROFF_ieee754, ROFF_iso8802_3,
-	ROFF_xpg3, ROFF_xpg4, ROFF_xpg4_2, ROFF_xpg4_3, ROFF_xbd5,
-	ROFF_xcu5, ROFF_xsh5, ROFF_xns5, ROFF_xns5_2d2_0,
-	ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4,
+static 	const int roffarg_Bl[] = { ROFF_Bullet, ROFF_Dash, ROFF_Hyphen,
+	ROFF_Item, ROFF_Enum, ROFF_Tag, ROFF_Diag, ROFF_Hang, ROFF_Ohang,
+	ROFF_Inset, ROFF_Column, ROFF_Offset, ROFF_Width, ROFF_Compact,
 	ROFF_ARGMAX };
+static 	const int roffarg_St[] = { ROFF_p1003_1_88, ROFF_p1003_1_90,
+	ROFF_p1003_1_96, ROFF_p1003_1_2001, ROFF_p1003_1_2004, ROFF_p1003_1,
+	ROFF_p1003_1b, ROFF_p1003_1b_93, ROFF_p1003_1c_95, ROFF_p1003_1g_2000,
+	ROFF_p1003_2_92, ROFF_p1387_2_95, ROFF_p1003_2, ROFF_p1387_2,
+	ROFF_isoC_90, ROFF_isoC_amd1, ROFF_isoC_tcor1, ROFF_isoC_tcor2,
+	ROFF_isoC_99, ROFF_ansiC, ROFF_ansiC_89, ROFF_ansiC_99, ROFF_ieee754,
+	ROFF_iso8802_3, ROFF_xpg3, ROFF_xpg4, ROFF_xpg4_2, ROFF_xpg4_3,
+	ROFF_xbd5, ROFF_xcu5, ROFF_xsh5, ROFF_xns5, ROFF_xns5_2d2_0,
+	ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4, ROFF_ARGMAX };
 
 static	const int roffchild_Bl[] = { ROFF_It, ROFF_El, ROFF_MAX };
 static	const int roffchild_Fo[] = { ROFF_Fa, ROFF_Fc, ROFF_MAX };
-static	const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B,
-	ROFF__D, ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P,
-	ROFF__R, ROFF__T, ROFF__V, ROFF_MAX };
+static	const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B, ROFF__D,
+	ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P, ROFF__R, ROFF__T, ROFF__V,
+	ROFF_MAX };
 
 static	const int roffparent_El[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
 static	const int roffparent_Fc[] = { ROFF_Fo, ROFF_Fa, ROFF_MAX };
@@ -180,7 +174,6 @@ static	const int roffparent_Oc[] = { ROFF_Oo, ROFF_MAX
 static	const int roffparent_It[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
 static	const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX };
 
-/* Table of all known tokens. */
 static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_noop, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */
 	{     roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dd */
@@ -208,7 +201,7 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fa */ /* XXX needs arg */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fd */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fl */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fn */ /* XXX needs arg */ /* FIXME */
+	{roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, /*XXX*/ -1 }, /* Fn */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ft */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ic */ /* XXX needs arg */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* In */
@@ -222,7 +215,7 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, roffarg_St, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* St */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Va */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Vt */ /* XXX needs arg */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xr */ /* XXX needs arg */
+	{roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, /*XXX*/ -1 }, /* Xr */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %A */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %B */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %D */
@@ -254,7 +247,7 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Fx */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ms */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* No */
+	{        NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* No */
 	{     roff_Ns, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Nx */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ox */
@@ -271,13 +264,13 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sc */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* So */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Sq */
-	{        NULL, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */
+	{     roff_Sm, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Sm */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sx */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ux */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */
+	{        NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */
+	{        NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */
 	{ roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */
 	{   roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */
 	{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */
@@ -290,7 +283,8 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{        NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */
 	};
 
-/* Table of all known token arguments. */
+#define	ROFF_VALUE	(1 << 0)
+
 static	const int tokenargs[ROFF_ARGMAX] = {
 	0,		0,		0,		0,
 	0,		ROFF_VALUE,	ROFF_VALUE,	0,
@@ -455,14 +449,43 @@ roff_engine(struct rofftree *tree, char *buf)
 
 
 static int
-textparse(const struct rofftree *tree, char *buf)
+textparse(struct rofftree *tree, char *buf)
 {
+	char		*bufp;
 
+	/* TODO: literal parsing. */
+
 	if ( ! (ROFF_BODY & tree->state)) {
 		roff_err(tree, buf, "data not in body");
 		return(0);
 	}
-	return((*tree->cb.roffdata)(tree->arg, 1, buf));
+
+	/* LINTED */
+	while (*buf) {
+		while (*buf && isspace(*buf))
+			buf++;
+
+		if (0 == *buf)
+			break;
+
+		bufp = buf++;
+
+		while (*buf && ! isspace(*buf))
+			buf++;
+
+		if (0 != *buf) {
+			*buf++ = 0;
+			if ( ! roffdata(tree, 1, bufp))
+				return(0);
+			continue;
+		}
+
+		if ( ! roffdata(tree, 1, bufp))
+			return(0);
+		break;
+	}
+
+	return(1);
 }
 
 
@@ -478,8 +501,15 @@ roffargs(const struct rofftree *tree, 
 
 	p = buf;
 
+	/*
+	 * This is an ugly little loop.  It parses a line into
+	 * space-delimited tokens.  If a quote mark is encountered, a
+	 * token is alloted the entire quoted text.  If whitespace is
+	 * escaped, it's included in the prior alloted token.
+	 */
+
 	/* LINTED */
-	for (i = 0; *buf && i < ROFF_MAXARG; i++) {
+	for (i = 0; *buf && i < ROFF_MAXLINEARG; i++) {
 		if ('\"' == *buf) {
 			argv[i] = ++buf;
 			while (*buf && '\"' != *buf)
@@ -493,8 +523,17 @@ roffargs(const struct rofftree *tree, 
 			}
 		} else { 
 			argv[i] = buf++;
-			while (*buf && ! isspace(*buf))
-				buf++;
+			while (*buf) {
+				if ( ! isspace(*buf)) {
+					buf++;
+					continue;
+				}
+				if (*(buf - 1) == '\\') {
+					buf++;
+					continue;
+				}
+				break;
+			}
 			if (0 == *buf)
 				continue;
 		}
@@ -502,9 +541,9 @@ roffargs(const struct rofftree *tree, 
 		while (*buf && isspace(*buf))
 			buf++;
 	}
-	
+
 	assert(i > 0);
-	if (ROFF_MAXARG == i && *buf) {
+	if (ROFF_MAXLINEARG == i && *buf) {
 		roff_err(tree, p, "too many arguments for `%s'", toknames
 				[tok]);
 		return(0);
@@ -535,7 +574,7 @@ roffparse(struct rofftree *tree, char *buf)
 {
 	int		  tok, t;
 	struct roffnode	 *n;
-	char		 *argv[ROFF_MAXARG];
+	char		 *argv[ROFF_MAXLINEARG];
 	char		**argvp;
 
 	if (0 != *buf && 0 != *(buf + 1) && 0 != *(buf + 2))
@@ -665,6 +704,7 @@ roffparse(struct rofftree *tree, char *buf)
 
 	assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx);
 
+	/* LINTED */
 	for (n = tree->last; n; n = n->parent)
 		if (n->tok != tokens[tok].ctx) {
 			if (n->tok == tokens[n->tok].ctx)
@@ -837,6 +877,30 @@ roffnode_free(struct rofftree *tree)
 
 
 static int
+roffspecial(struct rofftree *tree, int tok, char **ordp)
+{
+
+	return((*tree->cb.roffspecial)(tree->arg, tok, 
+				tree->cur, ordp));
+}
+
+
+static int
+roffcall(struct rofftree *tree, int tok, char **argv)
+{
+
+	if (NULL == tokens[tok].cb) {
+		roff_err(tree, *argv, "unsupported macro `%s'", 
+				toknames[tok]);
+		return(0);
+	}
+	if ( ! (*tokens[tok].cb)(tok, tree, argv, ROFF_ENTER))
+		return(0);
+	return(1);
+}
+
+
+static int
 roffnextopt(const struct rofftree *tree, int tok, 
 		char ***in, char **val)
 {
@@ -854,7 +918,7 @@ roffnextopt(const struct rofftree *tree, int tok, 
 
 	if (ROFF_ARGMAX == (v = rofffindarg(arg + 1))) {
 		roff_warn(tree, arg, "argument-like parameter `%s' to "
-				"`%s'", &arg[1], toknames[tok]);
+				"`%s'", arg, toknames[tok]);
 		return(-1);
 	} 
 	
@@ -896,7 +960,7 @@ roffpurgepunct(struct rofftree *tree, char **argv)
 
 	/* LINTED */
 	while (argv[i])
-		if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
+		if ( ! roffdata(tree, 0, argv[i++]))
 			return(0);
 	return(1);
 }
@@ -927,6 +991,17 @@ roffparseopts(struct rofftree *tree, int tok, 
 }
 
 
+static int
+roffdata(struct rofftree *tree, int space, char *buf)
+{
+
+	if (0 == *buf)
+		return(1);
+	return((*tree->cb.roffdata)(tree->arg, 
+				space != 0, tree->cur, buf));
+}
+
+
 /* ARGSUSED */
 static	int
 roff_Dd(ROFFCALL_ARGS)
@@ -955,7 +1030,7 @@ roff_Dd(ROFFCALL_ARGS)
 
 	argv++;
 
-	if (0 == strcmp(*argv, "$Mdocdate: December 2 2008 $")) {
+	if (0 == strcmp(*argv, "$Mdocdate: December 5 2008 $")) {
 		t = time(NULL);
 		if (NULL == localtime_r(&t, &tree->tm))
 			err(1, "localtime_r");
@@ -1072,73 +1147,77 @@ roff_Dt(ROFFCALL_ARGS)
 
 /* ARGSUSED */
 static	int
-roff_Ns(ROFFCALL_ARGS)
+roff_Sm(ROFFCALL_ARGS)
 {
-	int		 j, c, first;
+	char		*morep[1], *p;
 
-	first = (*argv == tree->cur);
+	p = *argv++;
 
-	argv++;
+	if (NULL == (morep[0] = *argv++)) {
+		roff_err(tree, p, "`Sm' expects an argument");
+		return(0);
+	} else if (0 != strcmp(morep[0], "on") && 
+			0 != strcmp(morep[0], "off")) {
+		roff_err(tree, p, "`Sm' has invalid argument");
+		return(0);
+	}
 
-	if (ROFF_MAX != (c = rofffindcallable(*argv))) {
-		if (NULL == tokens[c].cb) {
-			roff_err(tree, *argv, "unsupported macro `%s'",
-					toknames[c]);
-			return(0);
-		}
-		if ( ! (*tree->cb.roffspecial)(tree->arg, tok))
-			return(0);
-		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
-			return(0);
-		if ( ! first)
-			return(1);
-		return(roffpurgepunct(tree, argv));
-	} 
+	if (*argv) 
+		roff_warn(tree, *argv, "`Sm' shouldn't have arguments");
 
-	if ( ! (*tree->cb.roffdata)(tree->arg, 0, *argv++))
+	if ( ! roffspecial(tree, tok, morep))
 		return(0);
 
-	while (*argv) {
-		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
-			if ( ! roffispunct(*argv)) {
-				if ( ! (*tree->cb.roffdata)
-						(tree->arg, 1, *argv++))
-					return(0);
-				continue;
-			}
-			
-			/* FIXME: this is identical to that of
-			 * roff_text. */
+	while (*argv)
+		if ( ! roffdata(tree, 1, *argv++))
+			return(0);
 
-			/* See if only punctuation remains. */
+	return(1);
+}
 
-			for (j = 0; argv[j]; j++)
-				if ( ! roffispunct(argv[j]))
-					break;
 
-			if (argv[j]) {
-				if ( ! (*tree->cb.roffdata)
-						(tree->arg, 0, *argv++))
-					return(0);
-				continue;
-			}
+/* ARGSUSED */
+static	int
+roff_Ns(ROFFCALL_ARGS)
+{
+	int		 j, c, first;
+	char		*morep[1];
 
-			/*  Only punctuation remains. */
+	first = (*argv++ == tree->cur);
+	morep[0] = NULL;
 
+	if ( ! roffspecial(tree, tok, morep))
+		return(0);
+
+	while (*argv) {
+		if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+			if ( ! roffcall(tree, c, argv))
+				return(0);
 			break;
 		}
-		if (NULL == tokens[c].cb) {
-			roff_err(tree, *argv, "unsupported macro `%s'",
-					toknames[c]);
-			return(0);
+
+		if ( ! roffispunct(*argv)) {
+			if ( ! roffdata(tree, 1, *argv++))
+				return(0);
+			continue;
 		}
-		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
-			return(0);
+
+		for (j = 0; argv[j]; j++)
+			if ( ! roffispunct(argv[j]))
+				break;
+
+		if (argv[j]) {
+			if ( ! roffdata(tree, 0, *argv++))
+				return(0);
+			continue;
+		}
+
 		break;
 	}
 
 	if ( ! first)
 		return(1);
+
 	return(roffpurgepunct(tree, argv));
 }
 
@@ -1187,7 +1266,9 @@ roff_Os(ROFFCALL_ARGS)
 
 	assert(NULL == tree->last);
 
-	return((*tree->cb.roffhead)(tree->arg));
+	return((*tree->cb.roffhead)(tree->arg, &tree->tm,
+				tree->os, tree->title, tree->section,
+				tree->volume));
 }
 
 
@@ -1195,8 +1276,8 @@ roff_Os(ROFFCALL_ARGS)
 static int
 roff_layout(ROFFCALL_ARGS) 
 {
-	int		 i, c, argcp[ROFF_MAXARG];
-	char		*argvp[ROFF_MAXARG];
+	int		 i, c, argcp[ROFF_MAXLINEARG];
+	char		*argvp[ROFF_MAXLINEARG];
 
 	if (ROFF_PRELUDE & tree->state) {
 		roff_err(tree, *argv, "bad `%s' in prelude", 
@@ -1204,6 +1285,8 @@ roff_layout(ROFFCALL_ARGS) 
 		return(0);
 	} else if (ROFF_EXIT == type) {
 		roffnode_free(tree);
+		if ( ! (*tree->cb.roffblkbodyout)(tree->arg, tok))
+			return(0);
 		return((*tree->cb.roffblkout)(tree->arg, tok));
 	} 
 
@@ -1225,8 +1308,10 @@ roff_layout(ROFFCALL_ARGS) 
 	if ( ! (*tree->cb.roffblkin)(tree->arg, tok, argcp, argvp))
 		return(0);
 	if (NULL == *argv)
-		return(1);
-	if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp))
+		return((*tree->cb.roffblkbodyin)
+				(tree->arg, tok, argcp, argvp));
+
+	if ( ! (*tree->cb.roffblkheadin)(tree->arg, tok, argcp, argvp))
 		return(0);
 
 	/*
@@ -1236,12 +1321,14 @@ roff_layout(ROFFCALL_ARGS) 
 
 	if ( ! (ROFF_PARSED & tokens[tok].flags)) {
 		i = 0;
-		while (*argv) {
-			if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++))
+		while (*argv)
+			if ( ! roffdata(tree, i++, *argv++))
 				return(0);
-			i = 1;
-		}
-		return((*tree->cb.roffout)(tree->arg, tok));
+
+		if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok))
+			return(0);
+		return((*tree->cb.roffblkbodyin)
+				(tree->arg, tok, argcp, argvp));
 	}
 
 	/*
@@ -1253,22 +1340,12 @@ roff_layout(ROFFCALL_ARGS) 
 	while (*argv) {
 		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
 			assert(tree->arg);
-			if ( ! (*tree->cb.roffdata)
-					(tree->arg, i, *argv++))
+			if ( ! roffdata(tree, i++, *argv++))
 				return(0);
-			i = 1;
 			continue;
 		}
-
-		if (NULL == tokens[c].cb) {
-			roff_err(tree, *argv, "unsupported macro `%s'",
-					toknames[c]);
+		if ( ! roffcall(tree, c, argv))
 			return(0);
-		}
-
-		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
-			return(0);
-
 		break;
 	}
 
@@ -1278,8 +1355,12 @@ roff_layout(ROFFCALL_ARGS) 
 	 * macro.
 	 */
 
-	if (NULL == *argv)
-		return((*tree->cb.roffout)(tree->arg, tok));
+	if (NULL == *argv) {
+		if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok))
+			return(0);
+		return((*tree->cb.roffblkbodyin)
+				(tree->arg, tok, argcp, argvp));
+	}
 
 	/*
 	 * Expensive.  Scan to the end of line then work backwards until
@@ -1289,16 +1370,74 @@ roff_layout(ROFFCALL_ARGS) 
 	if ( ! roffpurgepunct(tree, argv))
 		return(0);
 
-	return((*tree->cb.roffout)(tree->arg, tok));
+	if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok))
+		return(0);
+	return((*tree->cb.roffblkbodyin)
+			(tree->arg, tok, argcp, argvp));
 }
 
 
 /* ARGSUSED */
 static int
+roff_ordered(ROFFCALL_ARGS) 
+{
+	int		 i, first, c;
+	char		*ordp[ROFF_MAXLINEARG];
+
+	if (ROFF_PRELUDE & tree->state) {
+		roff_err(tree, *argv, "`%s' disallowed in prelude", 
+				toknames[tok]);
+		return(0);
+	}
+
+	first = (*argv == tree->cur);
+	argv++;
+
+	if (NULL == *argv) {
+
+		/* FIXME: satisfies number of args? */
+
+		ordp[0] = NULL;
+		return(roffspecial(tree, tok, ordp));
+	}
+
+	i = 0;
+	while (*argv && i < ROFF_MAXLINEARG) {
+		if (ROFF_MAX != (c = rofffindcallable(*argv)))
+			return(roffcall(tree, c, argv));
+		if (roffispunct(*argv)) 
+			break;
+
+		ordp[i++] = *argv++;
+	}
+
+	ordp[i] = NULL;
+
+	/* FIXME: too many or too few args? */
+
+	if (i == ROFF_MAXLINEARG && *argv) {
+		roff_err(tree, *argv, "too many args", toknames[tok]);
+		return(0);
+	}
+
+	/* FIXME: error if there's stuff after the punctuation. */
+
+	if ( ! roffspecial(tree, tok, ordp))
+		return(0);
+
+	if ( ! first || NULL == *argv)
+		return(1);
+
+	return(roffpurgepunct(tree, argv));
+}
+
+
+/* ARGSUSED */
+static int
 roff_text(ROFFCALL_ARGS) 
 {
-	int		 i, j, first, c, argcp[ROFF_MAXARG];
-	char		*argvp[ROFF_MAXARG];
+	int		 i, j, first, c, argcp[ROFF_MAXLINEARG];
+	char		*argvp[ROFF_MAXLINEARG];
 
 	if (ROFF_PRELUDE & tree->state) {
 		roff_err(tree, *argv, "`%s' disallowed in prelude", 
@@ -1318,11 +1457,10 @@ roff_text(ROFFCALL_ARGS) 
 
 	if ( ! (ROFF_PARSED & tokens[tok].flags)) {
 		i = 0;
-		while (*argv) {
-			if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++))
+		while (*argv)
+			if ( ! roffdata(tree, i++, *argv++))
 				return(0);
-			i = 1;
-		}
+
 		return((*tree->cb.roffout)(tree->arg, tok));
 	}
 
@@ -1335,60 +1473,40 @@ roff_text(ROFFCALL_ARGS) 
 
 	i = 0;
 	while (*argv) {
-		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
-			if ( ! roffispunct(*argv)) {
-				if ( ! (*tree->cb.roffdata)
-						(tree->arg, i, *argv++))
+		if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+			if ( ! (ROFF_LSCOPE & tokens[tok].flags))
+				if ( ! (*tree->cb.roffout)(tree->arg, tok))
 					return(0);
-				i = 1;
-				continue;
-			}
-
-			/* See if only punctuation remains. */
-
-			i = 1;
-			for (j = 0; argv[j]; j++)
-				if ( ! roffispunct(argv[j]))
-					break;
-
-			if (argv[j]) {
-				if ( ! (*tree->cb.roffdata)
-						(tree->arg, 0, *argv++))
+	
+			if ( ! roffcall(tree, c, argv))
+				return(0);
+	
+			if (ROFF_LSCOPE & tokens[tok].flags)
+				if ( ! (*tree->cb.roffout)(tree->arg, tok))
 					return(0);
-				continue;
-			}
+	
+			break;
+		}
 
-			/*  Only punctuation remains. */
-
-			if ( ! (*tree->cb.roffout)(tree->arg, tok))
+		if ( ! roffispunct(*argv)) {
+			if ( ! roffdata(tree, i++, *argv++))
 				return(0);
-			break;
+			continue;
 		}
 
-		/*
-		 * A sub-command has been found.  Execute it and
-		 * discontinue parsing for arguments.  If we're
-		 * line-scoped, then close out after it returns; if we
-		 * aren't, then close out before.
-		 */
+		i = 1;
+		for (j = 0; argv[j]; j++)
+			if ( ! roffispunct(argv[j]))
+				break;
 
-		if (NULL == tokens[c].cb) {
-			roff_err(tree, *argv, "unsupported macro `%s'",
-					toknames[c]);
-			return(0);
-		} 
-		
-		if ( ! (ROFF_LSCOPE & tokens[tok].flags))
-			if ( ! (*tree->cb.roffout)(tree->arg, tok))
+		if (argv[j]) {
+			if ( ! roffdata(tree, 0, *argv++))
 				return(0);
-		
-		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
-			return(0);
+			continue;
+		}
 
-		if (ROFF_LSCOPE & tokens[tok].flags)
-			if ( ! (*tree->cb.roffout)(tree->arg, tok))
-				return(0);
-
+		if ( ! (*tree->cb.roffout)(tree->arg, tok))
+			return(0);
 		break;
 	}
 
@@ -1448,3 +1566,4 @@ roff_err(const struct rofftree *tree, const char *pos,
 	(*tree->cb.roffmsg)(tree->arg, 
 			ROFF_ERROR, tree->cur, pos, buf);
 }
+