===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- mandoc/roff.c	2008/11/26 21:42:59	1.7
+++ mandoc/roff.c	2008/11/27 14:02:41	1.11
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.7 2008/11/26 21:42:59 kristaps Exp $ */
+/* $Id: roff.c,v 1.11 2008/11/27 14:02:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -35,8 +35,10 @@
 
 /* FIXME: ; : } ) (etc.) after text macros? */
 
-#define	ROFF_MAXARG	  10
+/* FIXME: NAME section needs specific elements. */
 
+#define	ROFF_MAXARG	  32
+
 enum	roffd { 
 	ROFF_ENTER = 0, 
 	ROFF_EXIT 
@@ -45,7 +47,8 @@ enum	roffd { 
 enum	rofftype { 
 	ROFF_COMMENT, 
 	ROFF_TEXT, 
-	ROFF_LAYOUT 
+	ROFF_LAYOUT,
+	ROFF_SPECIAL
 };
 
 #define	ROFFCALL_ARGS \
@@ -65,6 +68,7 @@ struct	rofftok {
 #define	ROFF_PARSED	 (1 << 0)		/* "Parsed". */
 #define	ROFF_CALLABLE	 (1 << 1)		/* "Callable". */
 #define	ROFF_QUOTES	 (1 << 2)		/* Quoted args. */
+#define	ROFF_SHALLOW	 (1 << 3)		/* Nesting block. */
 };
 
 struct	roffarg {
@@ -105,6 +109,8 @@ static	int		  roff_Os(ROFFCALL_ARGS);
 static	int		  roff_layout(ROFFCALL_ARGS);
 static	int		  roff_text(ROFFCALL_ARGS);
 static	int		  roff_comment(ROFFCALL_ARGS);
+static	int		  roff_close(ROFFCALL_ARGS);
+static	int		  roff_special(ROFFCALL_ARGS);
 
 static	struct roffnode	 *roffnode_new(int, struct rofftree *);
 static	void		  roffnode_free(int, struct rofftree *);
@@ -113,7 +119,8 @@ static	int		  roffscan(int, const int *);
 static	int		  rofffindtok(const char *);
 static	int		  rofffindarg(const char *);
 static	int		  rofffindcallable(const char *);
-static	int		  roffargs(int, char *, char **);
+static	int		  roffargs(const struct rofftree *,
+				int, char *, char **);
 static	int		  roffargok(int, int);
 static	int		  roffnextopt(int, const char ***, char **);
 static	int 		  roffparse(struct rofftree *, char *, size_t);
@@ -144,31 +151,35 @@ static 	const int roffarg_St[] = {
 	ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4,
 	ROFF_ARGMAX };
 
-static	const int roffchild_Oo[] = { ROFF_Op, ROFF_Oc, ROFF_MAX };
 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_Oo[] = { ROFF_Op, ROFF_Oc, 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 };
 static	const int roffparent_Oc[] = { ROFF_Oo, ROFF_Oc, ROFF_MAX };
-static	const int roffparent_It[] = { ROFF_Bl, 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_comment, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 },	/* \" */
-	{     roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Dd */
-	{     roff_Dt, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Dt */
-	{     roff_Os, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Os */
+	{roff_comment, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */
+	{     roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dd */
+	{     roff_Dt, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dt */
+	{     roff_Os, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Os */
 	{ roff_layout, NULL, NULL, NULL, ROFF_Sh, ROFF_LAYOUT, ROFF_PARSED }, /* Sh */
 	{ roff_layout, NULL, NULL, NULL, ROFF_Ss, ROFF_LAYOUT, ROFF_PARSED }, /* Ss */ 
 	{   roff_text, NULL, NULL, NULL, ROFF_Pp, ROFF_TEXT, 0 }, /* Pp */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	 	/* D1 */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, 		/* Dl */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, 	/* Bd */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, 	/* Ed */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* D1 */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Dl */
+	{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, 	/* Bd */
+	{  roff_close, NULL, NULL, NULL, ROFF_Bd, ROFF_LAYOUT, 0 }, /* Ed */
 	{ roff_layout, roffarg_Bl, NULL, roffchild_Bl, 0, ROFF_LAYOUT, 0 }, /* Bl */
-	{ roff_layout, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */
-	{ roff_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, 0 }, /* It */
+	{  roff_close, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */
+	{ roff_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, ROFF_SHALLOW }, /* It */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ad */
 	{   roff_text, roffarg_An, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* An */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ar */
@@ -179,272 +190,200 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ev */ /* XXX needs arg */
 	{   roff_text, roffarg_Ex, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ex */
 	{   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, 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_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 */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* In */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Li */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Nd */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Nm */ /* FIXME */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Nd */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Nm */ /* FIXME */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Op */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ot */
+	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ot */ /* XXX deprecated */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pa */
-	{   roff_text, roffarg_Rv, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Rv */
+	{   roff_text, roffarg_Rv, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Rv */
 	{   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 */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %A */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %B */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %D */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %I */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %J */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %N */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %O */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %P */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %R */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %T */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* %V */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ac */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ao */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Aq */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* At */ /* XXX at most 2 args */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */
+	{   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 */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %I */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %J */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %N */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %O */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %P */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %R */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %T */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %V */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ac */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ao */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Aq */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* At */ /* XXX at most 2 args */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */
 	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Bf */ /* FIXME */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */
 	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bq */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bsx */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bx */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Db */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dc */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dq */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */
+	{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 },	/* Db */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dc */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dq */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */
 	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Ef */ /* FIXME */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Em */ /* XXX needs arg */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Fx */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ms */
+	{   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 }, /* Ns */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Nx */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ox */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pq */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qc */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ql */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qo */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qq */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Re */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Rs */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sc */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* So */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sq */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },	/* Sm */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sx */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */
-	{   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_LAYOUT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pq */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qc */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ql */
+	{ roff_layout, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qo */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qq */
+	{  roff_close, NULL, roffparent_Re, NULL, ROFF_Rs, ROFF_LAYOUT, 0 }, /* Re */
+	{ roff_layout, NULL, NULL, roffchild_Rs, 0, ROFF_LAYOUT, 0 },	/* Rs */
+	{   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 }, /* Sq */
+	{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 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 */
 	{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Fo */
-	{ roff_layout, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */
+	{  roff_close, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */
 	{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */
-	{ roff_layout, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */
+	{  roff_close, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */
+	{ roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */
+	{  roff_close, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */
 };
 
 /* Table of all known token arguments. */
 static	const struct roffarg tokenargs[ROFF_ARGMAX] = {
-	{ 0 },						/* split */
-	{ 0 },						/* nosplit */
-	{ 0 },						/* ragged */
-	{ 0 },						/* unfilled */
-	{ 0 },						/* literal */
-	{ ROFF_VALUE },					/* file */
-	{ ROFF_VALUE },					/* offset */
-	{ 0 },						/* bullet */
-	{ 0 },						/* dash */
-	{ 0 },						/* hyphen */
-	{ 0 },						/* item */
-	{ 0 },						/* enum */
-	{ 0 },						/* tag */
-	{ 0 },						/* diag */
-	{ 0 },						/* hang */
-	{ 0 },						/* ohang */
-	{ 0 },						/* inset */
-	{ 0 },						/* column */
-	{ 0 },						/* width */
-	{ 0 },						/* compact */
+	{ 0 },					/* split */
+	{ 0 },					/* nosplit */
+	{ 0 },					/* ragged */
+	{ 0 },					/* unfilled */
+	{ 0 },					/* literal */
+	{ ROFF_VALUE },				/* file */
+	{ ROFF_VALUE },				/* offset */
+	{ 0 },					/* bullet */
+	{ 0 },					/* dash */
+	{ 0 },					/* hyphen */
+	{ 0 },					/* item */
+	{ 0 },					/* enum */
+	{ 0 },					/* tag */
+	{ 0 },					/* diag */
+	{ 0 },					/* hang */
+	{ 0 },					/* ohang */
+	{ 0 },					/* inset */
+	{ 0 },					/* column */
+	{ 0 },					/* width */
+	{ 0 },					/* compact */
+	{ 0 },					/* std */
+	{ 0 },					/* p1003_1_88 */
+	{ 0 },					/* p1003_1_90 */
+	{ 0 },					/* p1003_1_96 */
+	{ 0 },					/* p1003_1_2001 */
+	{ 0 },					/* p1003_1_2004 */
+	{ 0 },					/* p1003_1 */
+	{ 0 },					/* p1003_1b */
+	{ 0 },					/* p1003_1b_93 */
+	{ 0 },					/* p1003_1c_95 */
+	{ 0 },					/* p1003_1g_2000 */
+	{ 0 },					/* p1003_2_92 */
+	{ 0 },					/* p1387_2_95 */
+	{ 0 },					/* p1003_2 */
+	{ 0 },					/* p1387_2 */
+	{ 0 },					/* isoC_90 */
+	{ 0 },					/* isoC_amd1 */
+	{ 0 },					/* isoC_tcor1 */
+	{ 0 },					/* isoC_tcor2 */
+	{ 0 },					/* isoC_99 */
+	{ 0 },					/* ansiC */
+	{ 0 },					/* ansiC_89 */
+	{ 0 },					/* ansiC_99 */
+	{ 0 },					/* ieee754 */
+	{ 0 },					/* iso8802_3 */
+	{ 0 },					/* xpg3 */
+	{ 0 },					/* xpg4 */
+	{ 0 },					/* xpg4_2 */
+	{ 0 },					/* xpg4_3 */
+	{ 0 },					/* xbd5 */
+	{ 0 },					/* xcu5 */
+	{ 0 },					/* xsh5 */
+	{ 0 },					/* xns5 */
+	{ 0 },					/* xns5_2d2_0 */
+	{ 0 },					/* xcurses4_2 */
+	{ 0 },					/* susv2 */
+	{ 0 },					/* susv3 */
+	{ 0 },					/* svid4 */
 };
 
 const	char *const toknamesp[ROFF_MAX] = 
 	{		 
-	"\\\"",		 
-	"Dd",	/* Title macros. */
-	"Dt",		 
-	"Os",		 
-	"Sh",	/* Layout macros */
-	"Ss",		 
-	"Pp",		 
-	"D1",		 
-	"Dl",		 
-	"Bd",		 
-	"Ed",		 
-	"Bl",		 
-	"El",		 
-	"It",		 
-	"Ad",	/* Text macros. */
-	"An",		 
-	"Ar",		 
-	"Cd",		 
-	"Cm",		 
-	"Dv",		 
-	"Er",		 
-	"Ev",		 
-	"Ex",		 
-	"Fa",		 
-	"Fd",		 
-	"Fl",		 
-	"Fn",		 
-	"Ft",		 
-	"Ic",		 
-	"In",		 
-	"Li",		 
-	"Nd",		 
-	"Nm",		 
-	"Op",		 
-	"Ot",		 
-	"Pa",		 
-	"Rv",		 
-	"St",		 
-	"Va",		 
-	"Vt",		 
-	"Xr",		 
-	"\%A",	/* General text macros. */
-	"\%B",
-	"\%D",
-	"\%I",
-	"\%J",
-	"\%N",
-	"\%O",
-	"\%P",
-	"\%R",
-	"\%T",
-	"\%V",
-	"Ac",
-	"Ao",
-	"Aq",
-	"At",
-	"Bc",
-	"Bf",
-	"Bo",
-	"Bq",
-	"Bsx",
-	"Bx",
-	"Db",
-	"Dc",
-	"Do",
-	"Dq",
-	"Ec",
-	"Ef",
-	"Em",
-	"Eo",
-	"Fx",
-	"Ms",
-	"No",
-	"Ns",
-	"Nx",
-	"Ox",
-	"Pc",
-	"Pf",
-	"Po",
-	"Pq",
-	"Qc",
-	"Ql",
-	"Qo",
-	"Qq",
-	"Re",
-	"Rs",
-	"Sc",
-	"So",
-	"Sq",
-	"Sm",
-	"Sx",
-	"Sy",
-	"Tn",
-	"Ux",
-	"Xc",	/* FIXME: do not support! */
-	"Xo",	/* FIXME: do not support! */
-	"Fo",
-	"Fc",
-	"Oo",
-	"Oc",
+	"\\\"",		"Dd",		"Dt",		"Os",
+	"Sh",		"Ss",		"Pp",		"D1",
+	"Dl",		"Bd",		"Ed",		"Bl",
+	"El",		"It",		"Ad",		"An",
+	"Ar",		"Cd",		"Cm",		"Dv",
+	"Er",		"Ev",		"Ex",		"Fa",
+	"Fd",		"Fl",		"Fn",		"Ft",
+	"Ic",		"In",		"Li",		"Nd",
+	"Nm",		"Op",		"Ot",		"Pa",
+	"Rv",		"St",		"Va",		"Vt",
+	"Xr",		"\%A",		"\%B",		"\%D",
+	"\%I",		"\%J",		"\%N",		"\%O",
+	"\%P",		"\%R",		"\%T",		"\%V",
+	"Ac",		"Ao",		"Aq",		"At",
+	"Bc",		"Bf",		"Bo",		"Bq",
+	"Bsx",		"Bx",		"Db",		"Dc",
+	"Do",		"Dq",		"Ec",		"Ef",
+	"Em",		"Eo",		"Fx",		"Ms",
+	"No",		"Ns",		"Nx",		"Ox",
+	"Pc",		"Pf",		"Po",		"Pq",
+	"Qc",		"Ql",		"Qo",		"Qq",
+	"Re",		"Rs",		"Sc",		"So",
+	"Sq",		"Sm",		"Sx",		"Sy",
+	"Tn",		"Ux",		"Xc",		"Xo",
+	"Fo",		"Fc",		"Oo",		"Oc",
+	"Bk",		"Ek",
 	};
 
 const	char *const tokargnamesp[ROFF_ARGMAX] = 
 	{		 
-	"split",	 
-	"nosplit",	 
-	"ragged",	 
-	"unfilled",	 
-	"literal",	 
-	"file",		 
-	"offset",	 
-	"bullet",	 
-	"dash",		 
-	"hyphen",	 
-	"item",		 
-	"enum",		 
-	"tag",		 
-	"diag",		 
-	"hang",		 
-	"ohang",	 
-	"inset",	 
-	"column",	 
-	"width",	 
-	"compact",	 
-	"std",	 
-	"-p1003.1-88",
-	"-p1003.1-90",
-	"-p1003.1-96",
-	"-p1003.1-2001",
-	"-p1003.1-2004",
-	"-p1003.1",
-	"-p1003.1b",
-	"-p1003.1b-93",
-	"-p1003.1c-95",
-	"-p1003.1g-2000",
-	"-p1003.2-92",
-	"-p1387.2-95",
-	"-p1003.2",
-	"-p1387.2",
-	"-isoC-90",
-	"-isoC-amd1",
-	"-isoC-tcor1",
-	"-isoC-tcor2",
-	"-isoC-99",
-	"-ansiC",
-	"-ansiC-89",
-	"-ansiC-99",
-	"-ieee754",
-	"-iso8802-3",
-	"-xpg3",
-	"-xpg4",
-	"-xpg4.2",
-	"-xpg4.3",
-	"-xbd5",
-	"-xcu5",
-	"-xsh5",
-	"-xns5",
-	"-xns5.2d2.0",
-	"-xcurses4.2",
-	"-susv2",
-	"-susv3",
-	"-svid4",
+	"split",		"nosplit",		"ragged",
+	"unfilled",		"literal",		"file",		 
+	"offset",		"bullet",		"dash",		 
+	"hyphen",		"item",			"enum",		 
+	"tag",			"diag",			"hang",		 
+	"ohang",		"inset",		"column",	 
+	"width",		"compact",		"std",	 
+	"p1003.1-88",		"p1003.1-90",		"p1003.1-96",
+	"p1003.1-2001",		"p1003.1-2004",		"p1003.1",
+	"p1003.1b",		"p1003.1b-93",		"p1003.1c-95",
+	"p1003.1g-2000",	"p1003.2-92",		"p1387.2-95",
+	"p1003.2",		"p1387.2",		"isoC-90",
+	"isoC-amd1",		"isoC-tcor1",		"isoC-tcor2",
+	"isoC-99",		"ansiC",		"ansiC-89",
+	"ansiC-99",		"ieee754",		"iso8802-3",
+	"xpg3",			"xpg4",			"xpg4.2",
+	"xpg4.3",		"xbd5",			"xcu5",
+	"xsh5",			"xns5",			"xns5.2d2.0",
+	"xcurses4.2",		"susv2",		"susv3",
+	"svid4"
 	};
 
 const	char *const *toknames = toknamesp;
@@ -540,22 +479,34 @@ textparse(const struct rofftree *tree, const char *buf
 
 
 static int
-roffargs(int tok, char *buf, char **argv)
+roffargs(const struct rofftree *tree, 
+		int tok, char *buf, char **argv)
 {
 	int		 i;
 
-	(void)tok;/* FIXME: quotable strings? */
-
 	assert(tok >= 0 && tok < ROFF_MAX);
 	assert('.' == *buf);
 
 	/* LINTED */
 	for (i = 0; *buf && i < ROFF_MAXARG; i++) {
-		argv[i] = buf++;
-		while (*buf && ! isspace(*buf))
-			buf++;
-		if (0 == *buf) {
-			continue;
+		if ('\"' == *buf) {
+			argv[i] = ++buf;
+			while (*buf && '\"' != *buf)
+				buf++;
+			if (0 == *buf) {
+				warnx("%s: unclosed quoted arg for "
+						"`%s' (line %zu)",
+						tree->rbuf->name,
+						toknames[tok],
+						tree->rbuf->line);
+				return(0);
+			}
+		} else { 
+			argv[i] = buf++;
+			while (*buf && ! isspace(*buf))
+				buf++;
+			if (0 == *buf)
+				continue;
 		}
 		*buf++ = 0;
 		while (*buf && isspace(*buf))
@@ -563,10 +514,20 @@ roffargs(int tok, char *buf, char **argv)
 	}
 	
 	assert(i > 0);
-	if (i < ROFF_MAXARG)
-		argv[i] = NULL;
+	if (ROFF_MAXARG == i && *buf) {
+		warnx("%s: too many args for `%s' (line %zu)",
+				tree->rbuf->name, toknames[tok],
+				tree->rbuf->line);
+		return(0);
+	}
 
-	return(ROFF_MAXARG > i);
+#ifdef DEBUG
+	(void)printf("argparse: %d arguments for `%s'\n",
+			i, toknames[tok]);
+#endif
+
+	argv[i] = NULL;
+	return(1);
 }
 
 
@@ -608,12 +569,9 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 	} else if (ROFF_COMMENT == tokens[tok].type)
 		return(1);
 	
-	if ( ! roffargs(tok, buf, argv)) {
-		warnx("%s: too many args to `%s' (line %zu)",
-				tree->rbuf->name, toknames[tok], 
-				tree->rbuf->line);
+	if ( ! roffargs(tree, tok, buf, argv)) 
 		return(0);
-	} else
+	else
 		argvp = (const char **)argv + 1;
 
 	/* 
@@ -641,12 +599,6 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 		return(0);
 	} 
 
-
-#if 0
-	(void)printf("parse: macro `%s' (%d), parent `%s' (%d)\n",
-			toknames[tok], tok, 
-			toknames[tree->last->tok], tree->last->tok);
-
 	if ( ! roffscan(tok, tokens[tree->last->tok].children)) {
 		warnx("%s: invalid child `%s' for `%s' (line %zu)",
 				tree->rbuf->name, toknames[tok], 
@@ -654,7 +606,6 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 				tree->rbuf->line);
 		return(0);
 	}
-#endif
 
 	/*
 	 * Branch if we're not a layout token.
@@ -676,7 +627,16 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 					n->tok == tokens[n->tok].ctx);
 			if (n->tok == tok)
 				break;
+			if (ROFF_SHALLOW & tokens[tok].flags) {
+				n = NULL;
+				break;
+			}
 		}
+
+		/*
+		 * Create a new scope, as no previous one exists to
+		 * close out.
+		 */
 		if (NULL == n) {
 #ifdef DEBUG
 			(void)printf("scope: new `%s'\n",
@@ -684,6 +644,11 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 #endif
 			return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
 		}
+
+		/* 
+		 * Close out all intermediary scoped blocks.
+		 */
+
 		do {
 			t = tree->last->tok;
 #ifdef DEBUG
@@ -694,9 +659,16 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 				return(0);
 		} while (t != tok);
 
+#ifdef DEBUG
+		(void)printf("scope: new parent of `%s' is `%s'\n", 
+				toknames[tok], 
+				toknames[tree->last->tok]);
+#endif
+
 		return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
 	}
 
+	assert(tree->last);
 	assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx);
 
 	do {
@@ -708,7 +680,8 @@ roffparse(struct rofftree *tree, char *buf, size_t sz)
 			return(0);
 	} while (t != tokens[tok].ctx);
 
-	return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
+	assert(tree->last);
+	return(1);
 }
 
 
@@ -738,12 +711,8 @@ rofffindtok(const char *buf)
 	for (i = 0; *buf && ! isspace(*buf) && i < 3; i++, buf++)
 		token[i] = *buf;
 
-	if (i == 3) {
-#ifdef DEBUG
-		(void)printf("lookup: macro too long: `%s'\n", buf);
-#endif
+	if (i == 3) 
 		return(ROFF_MAX);
-	}
 
 	token[i] = 0;
 
@@ -775,6 +744,7 @@ rofffindcallable(const char *name)
 
 	if (ROFF_MAX == (c = rofffindtok(name)))
 		return(ROFF_MAX);
+	assert(c >= 0 && c < ROFF_MAX);
 	return(ROFF_CALLABLE & tokens[c].flags ? c : ROFF_MAX);
 }
 
@@ -793,6 +763,15 @@ roffnode_new(int tokid, struct rofftree *tree)
 	p->tok = tokid;
 	p->parent = tree->last;
 	tree->last = p;
+
+#ifdef DEBUG
+	(void)printf("scope: new `%s' child of `%s'\n",
+			toknames[tree->last->tok], 
+			tree->last->parent ?
+				toknames[tree->last->parent->tok] :
+				"<root>");
+#endif
+
 	return(p);
 }
 
@@ -821,6 +800,14 @@ roffnode_free(int tokid, struct rofftree *tree)
 	assert(tree->last);
 	assert(tree->last->tok == tokid);
 
+#ifdef DEBUG
+	(void)printf("scope: closing `%s' back to `%s'\n",
+			toknames[tree->last->tok],
+			tree->last->parent ?
+				toknames[tree->last->parent->tok] :
+				"<root>");
+#endif
+
 	p = tree->last;
 	tree->last = tree->last->parent;
 	free(p);
@@ -1023,12 +1010,19 @@ roff_layout(ROFFCALL_ARGS) 
 	}
 
 	while (*argv) {
-		if (2 >= strlen(*argv) && ROFF_MAX != 
-				(c = rofffindcallable(*argv)))
+		if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+			if (NULL == tokens[c].cb) {
+				warnx("%s: macro `%s' not supported "
+						"(line %zu)",
+						tree->rbuf->name, 
+						toknames[c],
+						tree->rbuf->line);
+				return(0);
+			}
 			if ( ! (*tokens[c].cb)(c, tree, 
 						argv + 1, ROFF_ENTER))
 				return(0);
-
+		}
 		/* TODO: print token. */
 		argv++;
 	}
@@ -1083,12 +1077,19 @@ roff_text(ROFFCALL_ARGS) 
 	}
 
 	while (*argv) {
-		if (2 >= strlen(*argv) && ROFF_MAX != 
-				(c = rofffindcallable(*argv)))
+		if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+			if (NULL == tokens[c].cb) {
+				warnx("%s: macro `%s' not supported "
+						"(line %zu)",
+						tree->rbuf->name, 
+						toknames[c],
+						tree->rbuf->line);
+				return(0);
+			}
 			if ( ! (*tokens[c].cb)(c, tree, 
 						argv + 1, ROFF_ENTER))
 				return(0);
-
+		}
 		/* TODO: print token. */
 		argv++;
 	}
@@ -1097,10 +1098,28 @@ roff_text(ROFFCALL_ARGS) 
 }
 
 
-/* ARGUSED */
+/* ARGSUSED */
 static int
 roff_comment(ROFFCALL_ARGS)
 {
 
 	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+roff_close(ROFFCALL_ARGS)
+{
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+roff_special(ROFFCALL_ARGS)
+{
+
+	return((*tree->cb->roffspecial)(tok));
 }