===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.20
retrieving revision 1.26
diff -u -p -r1.20 -r1.26
--- mandoc/roff.c	2008/11/30 12:41:45	1.20
+++ mandoc/roff.c	2008/12/01 09:25:18	1.26
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.20 2008/11/30 12:41:45 kristaps Exp $ */
+/* $Id: roff.c,v 1.26 2008/12/01 09:25:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -34,12 +34,10 @@
 
 /* FIXME: warn about empty lists. */
 
-/* FIXME: ; : } ) (etc.) after text macros? */
+/* FIXME: roff_layout and roff_text have identical-ish lower bodies. */
 
 /* FIXME: NAME section needs specific elements. */
 
-/* FIXME: don't print Os, just do roffbegin. */
-
 #define	ROFF_MAXARG	  32
 
 enum	roffd { 
@@ -70,8 +68,7 @@ struct	rofftok {
 	int		  flags;
 #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. */
+#define	ROFF_SHALLOW	 (1 << 2)		/* Nesting block. */
 };
 
 struct	roffarg {
@@ -108,12 +105,14 @@ struct	rofftree {
 static	int		  roff_Dd(ROFFCALL_ARGS);
 static	int		  roff_Dt(ROFFCALL_ARGS);
 static	int		  roff_Os(ROFFCALL_ARGS);
+#ifdef notyet
+static	int		  roff_Ns(ROFFCALL_ARGS);
+#endif
 
 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(struct rofftree *);
@@ -179,9 +178,9 @@ 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, 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_Os, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Os */
+	{ roff_layout, NULL, NULL, NULL, ROFF_Sh, ROFF_LAYOUT, 0 }, /* Sh */
+	{ roff_layout, NULL, NULL, NULL, ROFF_Ss, ROFF_LAYOUT, 0 }, /* Ss */ 
 	{   roff_text, NULL, NULL, NULL, ROFF_Pp, ROFF_TEXT, 0 }, /* Pp */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* D1 */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Dl */
@@ -189,11 +188,11 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{  roff_close, NULL, NULL, NULL, ROFF_Bd, ROFF_LAYOUT, 0 }, /* Ed */
 	{ roff_layout, roffarg_Bl, NULL, roffchild_Bl, 0, ROFF_LAYOUT, 0 }, /* Bl */
 	{  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_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, ROFF_PARSED | ROFF_SHALLOW }, /* It */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ad */ /* FIXME */
 	{   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 */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Cd */ /* XXX man.4 only */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Cd */ /* XXX man.4 only */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Cm */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dv */ /* XXX needs arg */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Er */ /* XXX needs arg */
@@ -207,7 +206,7 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   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, ROFF_PARSED | ROFF_CALLABLE }, /* Li */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Nd */
+	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* 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, 0 }, /* Ot */ /* XXX deprecated */
@@ -238,7 +237,7 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   roff_text, 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 */
-	{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 },	/* Db */
+	{        NULL, 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 */
@@ -249,11 +248,11 @@ static	const struct rofftok tokens[ROFF_MAX] = {
 	{   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 }, /* Ns */
+	{        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 */
 	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */
-	{   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */
+	{        NULL, 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 */
@@ -265,7 +264,7 @@ 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 }, /* Sq */
-	{roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */
+	{        NULL, 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 */
@@ -310,8 +309,11 @@ const	char *const toknamesp[ROFF_MAX] = {		 
 	"Ic",		"In",		"Li",		"Nd",
 	"Nm",		"Op",		"Ot",		"Pa",
 	"Rv",		"St",		"Va",		"Vt",
+	/* LINTED */
 	"Xr",		"\%A",		"\%B",		"\%D",
+	/* LINTED */
 	"\%I",		"\%J",		"\%N",		"\%O",
+	/* LINTED */
 	"\%P",		"\%R",		"\%T",		"\%V",
 	"Ac",		"Ao",		"Aq",		"At",
 	"Bc",		"Bf",		"Bo",		"Bq",
@@ -441,7 +443,7 @@ static int
 textparse(const struct rofftree *tree, char *buf)
 {
 
-	return((*tree->cb.roffdata)(tree->arg, buf));
+	return((*tree->cb.roffdata)(tree->arg, 1, buf));
 }
 
 
@@ -494,7 +496,6 @@ roffargs(const struct rofftree *tree, 
 }
 
 
-/* XXX */
 static int
 roffscan(int tok, const int *tokv)
 {
@@ -518,6 +519,10 @@ roffparse(struct rofftree *tree, char *buf)
 	char		 *argv[ROFF_MAXARG];
 	char		**argvp;
 
+	if (0 != *buf && 0 != *(buf + 1) && 0 != *(buf + 2))
+		if (0 == strncmp(buf, ".\\\"", 3))
+			return(1);
+
 	if (ROFF_MAX == (tok = rofffindtok(buf + 1))) {
 		roff_err(tree, buf + 1, "bogus line macro");
 		return(0);
@@ -525,9 +530,9 @@ roffparse(struct rofftree *tree, char *buf)
 		roff_err(tree, buf + 1, "unsupported macro `%s'", 
 				toknames[tok]);
 		return(0);
-	} else if (ROFF_COMMENT == tokens[tok].type)
-		return(1);
-	
+	}
+
+	assert(ROFF___ != tok);
 	if ( ! roffargs(tree, tok, buf, argv)) 
 		return(0);
 
@@ -674,7 +679,7 @@ static int
 rofffindtok(const char *buf)
 {
 	char		 token[4];
-	size_t		 i;
+	int		 i;
 
 	for (i = 0; *buf && ! isspace(*buf) && i < 3; i++, buf++)
 		token[i] = *buf;
@@ -696,7 +701,6 @@ rofffindtok(const char *buf)
 }
 
 
-#if notyet
 static int
 roffispunct(const char *p)
 {
@@ -737,7 +741,6 @@ roffispunct(const char *p)
 
 	return(0);
 }
-#endif
 
 
 static int
@@ -985,31 +988,66 @@ roff_layout(ROFFCALL_ARGS) 
 		return(0);
 
 	if ( ! (ROFF_PARSED & tokens[tok].flags)) {
+		i = 0;
 		while (*argv) {
-			if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))
+			if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++))
 				return(0);
+			i = 1;
 		}
 		return((*tree->cb.roffout)(tree->arg, tok));
 	}
 
+	i = 0;
 	while (*argv) {
-		if (ROFF_MAX != (c = rofffindcallable(*argv))) {
-			if (NULL == tokens[c].cb) {
-				roff_err(tree, *argv, "unsupported "
-						"macro `%s'",
-						toknames[c]);
+		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
+			assert(tree->arg);
+			if ( ! (*tree->cb.roffdata)
+					(tree->arg, i, *argv++))
 				return(0);
-			}
-			if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
-				return(0);
-			break;
+			i = 1;
+			continue;
 		}
 
-		assert(tree->arg);
-		if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))
+		if (NULL == tokens[c].cb) {
+			roff_err(tree, *argv, "unsupported macro `%s'",
+					toknames[c]);
 			return(0);
+		}
+
+		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
+			return(0);
+
+		break;
 	}
 
+	/* 
+	 * If we're the first parser (*argv == tree->cur) then purge out
+	 * any additional punctuation, should there be any remaining at
+	 * the end of line. 
+	 */
+
+	if ( ! (ROFF_PARSED & tokens[tok].flags && *argv))
+		return((*tree->cb.roffout)(tree->arg, tok));
+
+	i = 0;
+	while (argv[i])
+		i++;
+
+	assert(i > 0);
+	if ( ! roffispunct(argv[--i]))
+		return((*tree->cb.roffout)(tree->arg, tok));
+
+	while (i >= 0 && roffispunct(argv[i]))
+		i--;
+
+	assert(0 != i);
+	i++;
+
+	/* LINTED */
+	while (argv[i])
+		if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
+			return(0);
+
 	return((*tree->cb.roffout)(tree->arg, tok));
 }
 
@@ -1018,7 +1056,7 @@ roff_layout(ROFFCALL_ARGS) 
 static int
 roff_text(ROFFCALL_ARGS) 
 {
-	int		 i, c, argcp[ROFF_MAXARG];
+	int		 i, j, first, c, argcp[ROFF_MAXARG];
 	char		*v, *argvp[ROFF_MAXARG];
 
 	if (ROFF_PRELUDE & tree->state) {
@@ -1027,6 +1065,9 @@ roff_text(ROFFCALL_ARGS) 
 		return(0);
 	}
 
+	/* FIXME: breaks if passed from roff_layout. */
+	first = *argv == tree->cur;
+
 	i = 0;
 	argv++;
 
@@ -1047,17 +1088,36 @@ roff_text(ROFFCALL_ARGS) 
 		return(0);
 
 	if ( ! (ROFF_PARSED & tokens[tok].flags)) {
+		i = 0;
 		while (*argv) {
-			if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))
+			if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++))
 				return(0);
+			i = 1;
 		}
 		return((*tree->cb.roffout)(tree->arg, tok));
 	}
 
+	i = 0;
 	while (*argv) {
 		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
-			if ( ! (*tree->cb.roffdata)(tree->arg, *argv++))
+			/* 
+			 * If all that remains is roff punctuation, then
+			 * close out our scope and return.
+			 */
+			if (roffispunct(*argv)) {
+				for (j = 0; argv[j]; j++)
+					if ( ! roffispunct(argv[j]))
+						break;
+				if (NULL == argv[j])
+					break;
+				i = 1;
+			}
+			
+			if ( ! (*tree->cb.roffdata)
+					(tree->arg, i, *argv++))
 				return(0);
+
+			i = 1;
 			continue;
 		}
 
@@ -1078,7 +1138,38 @@ roff_text(ROFFCALL_ARGS) 
 		break;
 	}
 
-	return((*tree->cb.roffout)(tree->arg, tok));
+	if ( ! (*tree->cb.roffout)(tree->arg, tok))
+		return(0);
+
+	/* 
+	 * If we're the first parser (*argv == tree->cur) then purge out
+	 * any additional punctuation, should there be any remaining at
+	 * the end of line. 
+	 */
+
+	if ( ! (first && *argv))
+		return(1);
+
+	i = 0;
+	while (argv[i])
+		i++;
+
+	assert(i > 0);
+	if ( ! roffispunct(argv[--i]))
+		return(1);
+
+	while (i >= 0 && roffispunct(argv[i]))
+		i--;
+
+	assert(0 != i);
+	i++;
+
+	/* LINTED */
+	while (argv[i])
+		if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
+			return(0);
+
+	return(1);
 }
 
 
@@ -1100,13 +1191,52 @@ roff_close(ROFFCALL_ARGS)
 }
 
 
+#if notyet
 /* ARGSUSED */
 static int
-roff_special(ROFFCALL_ARGS)
+roff_Ns(ROFFCALL_ARGS)
 {
+	int		 c;
 
-	return((*tree->cb.roffspecial)(tree->arg, tok));
+	argv++;
+
+	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);
+
+		return(1);
+	} else if ( ! (*tree->cb.roffdata)(tree->arg, 0, *argv++))
+		return(0);
+	
+	while (*argv) {
+		if (ROFF_MAX == (c = rofffindcallable(*argv))) {
+			assert(tree->arg);
+			if ( ! (*tree->cb.roffdata)
+					(tree->arg, 1, *argv++))
+				return(0);
+			continue;
+		}
+		if (NULL == tokens[c].cb) {
+			roff_err(tree, *argv, "unsupported macro `%s'",
+					toknames[c]);
+			return(0);
+		}
+		if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
+			return(0);
+
+		break;
+	}
+
+	return(1);
 }
+#endif
 
 
 static void