===================================================================
RCS file: /cvs/mandoc/Attic/argv.c,v
retrieving revision 1.42
retrieving revision 1.51
diff -u -p -r1.42 -r1.51
--- mandoc/Attic/argv.c	2009/03/08 20:50:12	1.42
+++ mandoc/Attic/argv.c	2009/03/14 05:21:58	1.51
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.42 2009/03/08 20:50:12 kristaps Exp $ */
+/* $Id: argv.c,v 1.51 2009/03/14 05:21:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
@@ -58,7 +60,7 @@ enum	merr {
 static	int		 argv_a2arg(int, const char *);
 static	int		 args(struct mdoc *, int, int *, 
 				char *, int, char **);
-static	int		 argv(struct mdoc *, int, int,
+static	int		 argv(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
 static	int		 argv_single(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
@@ -92,10 +94,11 @@ static	int mdoc_argvflags[MDOC_ARG_MAX] = {
 	ARGV_MULTI,	/* MDOC_Column */
 	ARGV_SINGLE,	/* MDOC_Width */
 	ARGV_NONE,	/* MDOC_Compact */
-	ARGV_SINGLE,	/* MDOC_Std */
+	ARGV_OPT_SINGLE, /* MDOC_Std */
 	ARGV_NONE,	/* MDOC_Filled */
 	ARGV_NONE,	/* MDOC_Words */
 	ARGV_NONE,	/* MDOC_Emphasis */
+	ARGV_NONE,	/* MDOC_Symbolic */
 	ARGV_NONE	/* MDOC_Symbolic */
 };
 
@@ -208,6 +211,13 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Ud */
 	0, /* Lb */
 	0, /* Ap */
+	ARGS_DELIM, /* Lp */
+	ARGS_DELIM | ARGS_QUOTED, /* Lk */
+	ARGS_DELIM | ARGS_QUOTED, /* Mt */
+	ARGS_DELIM, /* Brq */
+	0, /* Bro */
+	ARGS_DELIM, /* Brc */
+	ARGS_QUOTED, /* %C */
 };
 
 
@@ -221,7 +231,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		struct mdoc_arg **v, int *pos, char *buf)
 {
 	int		  i;
-	char		 *p;
+	char		 *p, sv;
 	struct mdoc_argv tmp;
 	struct mdoc_arg	 *arg;
 
@@ -246,8 +256,17 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		(*pos)++;
 	}
 
-	if (buf[*pos])
+	/* 
+	 * XXX: save the nullified byte as we'll restore it if this
+	 * doesn't end up being a command after all.  This is a little
+	 * bit hacky.  I don't like it, but it works for now.
+	 */
+
+	sv = 0;
+	if (buf[*pos]) {
+		sv = buf[*pos];
 		buf[(*pos)++] = 0;
+	}
 
 	(void)memset(&tmp, 0, sizeof(struct mdoc_argv));
 	tmp.line = line;
@@ -260,6 +279,9 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 	 */
 
 	if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) {
+		/* XXX - restore saved byte. */
+		if (sv)
+			buf[*pos - 1] = sv;
 		if ( ! pwarn(mdoc, line, i, WARGVPARM))
 			return(ARGV_ERROR);
 		return(ARGV_WORD);
@@ -270,7 +292,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 
 	/* FIXME: whitespace if no value. */
 
-	if ( ! argv(mdoc, tok, line, &tmp, pos, buf))
+	if ( ! argv(mdoc, line, &tmp, pos, buf))
 		return(ARGV_ERROR);
 
 	if (NULL == (arg = *v)) {
@@ -556,7 +578,7 @@ args(struct mdoc *mdoc, int line, 
 					return(0);
 
 			if (p)
-				return(ARGS_WORD);
+				return(ARGS_PHRASE);
 
 			/* Configure the eoln case, too. */
 
@@ -568,9 +590,9 @@ args(struct mdoc *mdoc, int line, 
 					return(0);
 			*pos += (int)(p - *v);
 
-			return(ARGS_WORD);
+			return(ARGS_PHRASE);
 		} 
-
+		
 		/* Do non-tabsep look-ahead here. */
 		
 		if ( ! (ARGS_TABSEP & fl))
@@ -668,6 +690,8 @@ argv_a2arg(int tok, const char *argv)
 			return(MDOC_File);
 		else if (xstrcmp(argv, "offset"))
 			return(MDOC_Offset);
+		else if (xstrcmp(argv, "compact"))
+			return(MDOC_Compact);
 		break;
 
 	case (MDOC_Bf):
@@ -713,6 +737,8 @@ argv_a2arg(int tok, const char *argv)
 			return(MDOC_Offset);
 		else if (xstrcmp(argv, "compact"))
 			return(MDOC_Compact);
+		else if (xstrcmp(argv, "nested"))
+			return(MDOC_Nested);
 		break;
 	
 	case (MDOC_Rv):
@@ -815,28 +841,14 @@ argv_single(struct mdoc *mdoc, int line, 
  * multiple parameters.
  */
 static int
-argv(struct mdoc *mdoc, int tok, int line, 
+argv(struct mdoc *mdoc, int line, 
 		struct mdoc_argv *v, int *pos, char *buf)
 {
-	int		 fl;
 
 	v->sz = 0;
 	v->value = NULL;
-	fl = mdoc_argvflags[v->arg];
 
-	/*
-	 * Override the default per-argument value.
-	 */
-
-	switch (tok) {
-	case (MDOC_Ex):
-		fl = ARGV_OPT_SINGLE;
-		break;
-	default:
-		break;
-	}
-
-	switch (fl) {
+	switch (mdoc_argvflags[v->arg]) {
 	case (ARGV_SINGLE):
 		return(argv_single(mdoc, line, v, pos, buf));
 	case (ARGV_MULTI):