===================================================================
RCS file: /cvs/mandoc/Attic/argv.c,v
retrieving revision 1.36
retrieving revision 1.43
diff -u -p -r1.36 -r1.43
--- mandoc/Attic/argv.c	2009/03/05 12:08:53	1.36
+++ mandoc/Attic/argv.c	2009/03/08 20:57:35	1.43
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.36 2009/03/05 12:08:53 kristaps Exp $ */
+/* $Id: argv.c,v 1.43 2009/03/08 20:57:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -29,44 +29,46 @@
  * Routines to parse arguments of macros.  Arguments follow the syntax
  * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
  * arguments, multiple arguments per value, no-value arguments, etc.
+ *
+ * There's no limit to the number or arguments that may be allocated.
  */
 
 #define	ARGS_QUOTED	(1 << 0)
 #define	ARGS_DELIM	(1 << 1)
 #define	ARGS_TABSEP	(1 << 2)
+#define	ARGS_ARGVLIKE	(1 << 3)
 
 #define	ARGV_NONE	(1 << 0)
 #define	ARGV_SINGLE	(1 << 1)
 #define	ARGV_MULTI	(1 << 2)
 #define	ARGV_OPT_SINGLE	(1 << 3)
 
+enum 	mwarn {
+	WQUOTPARM,
+	WARGVPARM,
+	WCOLEMPTY,
+	WTAILWS	
+};
+
+enum	merr {
+	EQUOTTERM,
+	EARGVAL	
+};
+
 static	int		 argv_a2arg(int, const char *);
 static	int		 args(struct mdoc *, int, int *, 
 				char *, int, char **);
-static	int		 argv(struct mdoc *, int,
-				struct mdoc_arg *, int *, char *);
+static	int		 argv(struct mdoc *, int, int,
+				struct mdoc_argv *, int *, char *);
 static	int		 argv_single(struct mdoc *, int, 
-				struct mdoc_arg *, int *, char *);
+				struct mdoc_argv *, int *, char *);
 static	int		 argv_opt_single(struct mdoc *, int, 
-				struct mdoc_arg *, int *, char *);
+				struct mdoc_argv *, int *, char *);
 static	int		 argv_multi(struct mdoc *, int, 
-				struct mdoc_arg *, int *, char *);
-static	int		 pwarn(struct mdoc *, int, int, int);
-static	int		 perr(struct mdoc *, int, int, int);
+				struct mdoc_argv *, int *, char *);
+static	int		 pwarn(struct mdoc *, int, int, enum mwarn);
+static	int		 perr(struct mdoc *, int, int, enum merr);
 
-/* Warning messages. */
-
-#define	WQUOTPARM	(0)
-#define	WARGVPARM	(1)
-#define	WCOLEMPTY	(2)
-#define	WTAILWS		(3)
-
-/* Error messages. */
-
-#define	EQUOTTERM	(0)
-#define	EARGVAL		(1)
-#define	EARGMANY	(2)
-
 /* Per-argument flags. */
 
 static	int mdoc_argvflags[MDOC_ARG_MAX] = {
@@ -90,44 +92,7 @@ static	int mdoc_argvflags[MDOC_ARG_MAX] = {
 	ARGV_MULTI,	/* MDOC_Column */
 	ARGV_SINGLE,	/* MDOC_Width */
 	ARGV_NONE,	/* MDOC_Compact */
-	ARGV_OPT_SINGLE, /* MDOC_Std */
-	ARGV_NONE,	/* MDOC_p1003_1_88 */
-	ARGV_NONE,	/* MDOC_p1003_1_90 */
-	ARGV_NONE,	/* MDOC_p1003_1_96 */
-	ARGV_NONE,	/* MDOC_p1003_1_2001 */
-	ARGV_NONE,	/* MDOC_p1003_1_2004 */
-	ARGV_NONE,	/* MDOC_p1003_1 */
-	ARGV_NONE,	/* MDOC_p1003_1b */
-	ARGV_NONE,	/* MDOC_p1003_1b_93 */
-	ARGV_NONE,	/* MDOC_p1003_1c_95 */
-	ARGV_NONE,	/* MDOC_p1003_1g_2000 */
-	ARGV_NONE,	/* MDOC_p1003_2_92 */
-	ARGV_NONE,	/* MDOC_p1387_2_95 */
-	ARGV_NONE,	/* MDOC_p1003_2 */
-	ARGV_NONE,	/* MDOC_p1387_2 */
-	ARGV_NONE,	/* MDOC_isoC_90 */
-	ARGV_NONE,	/* MDOC_isoC_amd1 */
-	ARGV_NONE,	/* MDOC_isoC_tcor1 */
-	ARGV_NONE,	/* MDOC_isoC_tcor2 */
-	ARGV_NONE,	/* MDOC_isoC_99 */
-	ARGV_NONE,	/* MDOC_ansiC */
-	ARGV_NONE,	/* MDOC_ansiC_89 */
-	ARGV_NONE,	/* MDOC_ansiC_99 */
-	ARGV_NONE,	/* MDOC_ieee754 */
-	ARGV_NONE,	/* MDOC_iso8802_3 */
-	ARGV_NONE,	/* MDOC_xpg3 */
-	ARGV_NONE,	/* MDOC_xpg4 */
-	ARGV_NONE,	/* MDOC_xpg4_2 */
-	ARGV_NONE,	/* MDOC_xpg4_3 */
-	ARGV_NONE,	/* MDOC_xbd5 */
-	ARGV_NONE,	/* MDOC_xcu5 */
-	ARGV_NONE,	/* MDOC_xsh5 */
-	ARGV_NONE,	/* MDOC_xns5 */
-	ARGV_NONE,	/* MDOC_xns5_2d2_0 */
-	ARGV_NONE,	/* MDOC_xcurses4_2 */
-	ARGV_NONE,	/* MDOC_susv2 */
-	ARGV_NONE,	/* MDOC_susv3 */
-	ARGV_NONE,	/* MDOC_svid4 */
+	ARGV_SINGLE,	/* MDOC_Std */
 	ARGV_NONE,	/* MDOC_Filled */
 	ARGV_NONE,	/* MDOC_Words */
 	ARGV_NONE,	/* MDOC_Emphasis */
@@ -172,7 +137,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Ot */
 	ARGS_DELIM, /* Pa */
 	0, /* Rv */
-	ARGS_DELIM, /* St */ 
+	ARGS_DELIM | ARGS_ARGVLIKE, /* St */ 
 	ARGS_DELIM, /* Va */
 	ARGS_DELIM, /* Vt */ 
 	ARGS_DELIM, /* Xr */
@@ -241,62 +206,172 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Hf */
 	0, /* Fr */
 	0, /* Ud */
+	0, /* Lb */
+	0, /* Ap */
+	0, /* Lp */
 };
 
 
+/*
+ * Parse an argument from line text.  This comes in the form of -key
+ * [value0...], which may either have a single mandatory value, at least
+ * one mandatory value, an optional single value, or no value.
+ */
+int
+mdoc_argv(struct mdoc *mdoc, int line, int tok,
+		struct mdoc_arg **v, int *pos, char *buf)
+{
+	int		  i;
+	char		 *p;
+	struct mdoc_argv tmp;
+	struct mdoc_arg	 *arg;
+
+	if (0 == buf[*pos])
+		return(ARGV_EOLN);
+
+	assert( ! isspace((u_char)buf[*pos]));
+
+	if ('-' != buf[*pos])
+		return(ARGV_WORD);
+
+	i = *pos;
+	p = &buf[++(*pos)];
+
+	assert(*pos > 0);
+
+	/* LINTED */
+	while (buf[*pos]) {
+		if (isspace((u_char)buf[*pos])) 
+			if ('\\' != buf[*pos - 1])
+				break;
+		(*pos)++;
+	}
+
+	if (buf[*pos])
+		buf[(*pos)++] = 0;
+
+	(void)memset(&tmp, 0, sizeof(struct mdoc_argv));
+	tmp.line = line;
+	tmp.pos = *pos;
+
+	/*
+	 * We now parse out the per-macro arguments.  XXX - this can be
+	 * made much cleaner using per-argument tables.  See argv_a2arg
+	 * for details.
+	 */
+
+	if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) {
+		if ( ! pwarn(mdoc, line, i, WARGVPARM))
+			return(ARGV_ERROR);
+		return(ARGV_WORD);
+	}
+
+	while (buf[*pos] && isspace((u_char)buf[*pos]))
+		(*pos)++;
+
+	/* FIXME: whitespace if no value. */
+
+	if ( ! argv(mdoc, tok, line, &tmp, pos, buf))
+		return(ARGV_ERROR);
+
+	if (NULL == (arg = *v)) {
+		*v = xcalloc(1, sizeof(struct mdoc_arg));
+		arg = *v;
+	} 
+
+	arg->argc++;
+	arg->argv = xrealloc(arg->argv, arg->argc * 
+			sizeof(struct mdoc_argv));
+
+	(void)memcpy(&arg->argv[(int)arg->argc - 1], 
+			&tmp, sizeof(struct mdoc_argv));
+
+	return(ARGV_ARG);
+}
+
+
+void
+mdoc_argv_free(struct mdoc_arg *p)
+{
+	int		 i, j;
+
+	if (NULL == p)
+		return;
+
+	if (p->refcnt) {
+		--(p->refcnt);
+		if (p->refcnt)
+			return;
+	}
+
+	assert(p->argc);
+
+	/* LINTED */
+	for (i = 0; i < (int)p->argc; i++) {
+		if (0 == p->argv[i].sz)
+			continue;
+		/* LINTED */
+		for (j = 0; j < (int)p->argv[i].sz; j++)
+			free(p->argv[i].value[j]);
+
+		free(p->argv[i].value);
+	}
+
+	free(p->argv);
+	free(p);
+}
+
+
+
 static int
-perr(struct mdoc *mdoc, int line, int pos, int code)
+perr(struct mdoc *mdoc, int line, int pos, enum merr code)
 {
-	int		 c;
+	char		*p;
 
+	p = NULL;
+
 	switch (code) {
 	case (EQUOTTERM):
-		c = mdoc_perr(mdoc, line, pos, 
-				"unterminated quoted parameter");
+		p = "unterminated quoted parameter";
 		break;
 	case (EARGVAL):
-		c = mdoc_perr(mdoc, line, pos, 
-				"argument requires a value");
+		p = "argument requires a value";
 		break;
-	case (EARGMANY):
-		c = mdoc_perr(mdoc, line, pos, 
-				"too many values for argument");
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
 	}
-	return(c);
+
+	assert(p);
+	return(mdoc_perr(mdoc, line, pos, p));
 }
 
 
 static int
-pwarn(struct mdoc *mdoc, int line, int pos, int code)
+pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code)
 {
+	char		*p;
 	int		 c;
 
+	p = NULL;
+	c = WARN_SYNTAX;
+
 	switch (code) {
 	case (WQUOTPARM):
-		c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-				"unexpected quoted parameter");
+		p = "unexpected quoted parameter";
 		break;
 	case (WARGVPARM):
-		c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-				"argument-like parameter");
+		p = "argument-like parameter";
 		break;
 	case (WCOLEMPTY):
-		c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-				"last list column is empty");
+		p = "last list column is empty";
+		c = WARN_COMPAT;
 		break;
 	case (WTAILWS):
-		c = mdoc_pwarn(mdoc, line, pos, WARN_COMPAT, 
-				"trailing whitespace");
+		p = "trailing whitespace";
+		c = WARN_COMPAT;
 		break;
-	default:
-		abort();
-		/* NOTREACHED */
 	}
-	return(c);
+
+	assert(p);
+	return(mdoc_pwarn(mdoc, line, pos, c, p));
 }
 
 
@@ -322,7 +397,7 @@ mdoc_args(struct mdoc *mdoc, int line, 
 				break;
 
 		assert(n);
-		c = (int)n->data.block.argc;
+		c = (int)(n->args ? n->args->argc : 0);
 		assert(c > 0);
 
 		/*
@@ -333,7 +408,7 @@ mdoc_args(struct mdoc *mdoc, int line, 
 
 		/* LINTED */
 		for (i = 0; i < c; i++) {
-			switch (n->data.block.argv[i].arg) {
+			switch (n->args->argv[i].arg) {
 			case (MDOC_Column):
 				fl |= ARGS_TABSEP;
 				fl &= ~ARGS_DELIM;
@@ -347,6 +422,7 @@ mdoc_args(struct mdoc *mdoc, int line, 
 				break;
 			}
 		}
+		break;
 	default:
 		break;
 	}
@@ -373,7 +449,7 @@ args(struct mdoc *mdoc, int line, 
 		if ( ! pwarn(mdoc, line, *pos, WQUOTPARM))
 			return(ARGS_ERROR);
 
-	if ('-' == buf[*pos]) 
+	if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) 
 		if ( ! pwarn(mdoc, line, *pos, WARGVPARM))
 			return(ARGS_ERROR);
 
@@ -389,10 +465,10 @@ args(struct mdoc *mdoc, int line, 
 				break;
 			i++;
 			/* There must be at least one space... */
-			if (0 == buf[i] || ! isspace((int)buf[i]))
+			if (0 == buf[i] || ! isspace((u_char)buf[i]))
 				break;
 			i++;
-			while (buf[i] && isspace((int)buf[i]))
+			while (buf[i] && isspace((u_char)buf[i]))
 				i++;
 		}
 		if (0 == buf[i]) {
@@ -500,7 +576,7 @@ args(struct mdoc *mdoc, int line, 
 		
 		if ( ! (ARGS_TABSEP & fl))
 			while (buf[*pos]) {
-				if (isspace((int)buf[*pos]))
+				if (isspace((u_char)buf[*pos]))
 					if ('\\' != buf[*pos - 1])
 						break;
 				(*pos)++;
@@ -515,7 +591,7 @@ args(struct mdoc *mdoc, int line, 
 			return(ARGS_WORD);
 
 		if ( ! (ARGS_TABSEP & fl))
-			while (buf[*pos] && isspace((int)buf[*pos]))
+			while (buf[*pos] && isspace((u_char)buf[*pos]))
 				(*pos)++;
 
 		if (buf[*pos])
@@ -547,7 +623,7 @@ args(struct mdoc *mdoc, int line, 
 	if (0 == buf[*pos])
 		return(ARGS_QWORD);
 
-	while (buf[*pos] && isspace((int)buf[*pos]))
+	while (buf[*pos] && isspace((u_char)buf[*pos]))
 		(*pos)++;
 
 	if (buf[*pos])
@@ -646,84 +722,6 @@ argv_a2arg(int tok, const char *argv)
 		if (xstrcmp(argv, "std"))
 			return(MDOC_Std);
 		break;
-	
-	case (MDOC_St):
-		if (xstrcmp(argv, "p1003.1-88"))
-			return(MDOC_p1003_1_88);
-		else if (xstrcmp(argv, "p1003.1-90"))
-			return(MDOC_p1003_1_90);
-		else if (xstrcmp(argv, "p1003.1-96"))
-			return(MDOC_p1003_1_96);
-		else if (xstrcmp(argv, "p1003.1-2001"))
-			return(MDOC_p1003_1_2001);
-		else if (xstrcmp(argv, "p1003.1-2004"))
-			return(MDOC_p1003_1_2004);
-		else if (xstrcmp(argv, "p1003.1"))
-			return(MDOC_p1003_1);
-		else if (xstrcmp(argv, "p1003.1b"))
-			return(MDOC_p1003_1b);
-		else if (xstrcmp(argv, "p1003.1b-93"))
-			return(MDOC_p1003_1b_93);
-		else if (xstrcmp(argv, "p1003.1c-95"))
-			return(MDOC_p1003_1c_95);
-		else if (xstrcmp(argv, "p1003.1g-2000"))
-			return(MDOC_p1003_1g_2000);
-		else if (xstrcmp(argv, "p1003.2-92"))
-			return(MDOC_p1003_2_92);
-		else if (xstrcmp(argv, "p1003.2-95"))
-			return(MDOC_p1387_2_95);
-		else if (xstrcmp(argv, "p1003.2"))
-			return(MDOC_p1003_2);
-		else if (xstrcmp(argv, "p1387.2-95"))
-			return(MDOC_p1387_2);
-		else if (xstrcmp(argv, "isoC-90"))
-			return(MDOC_isoC_90);
-		else if (xstrcmp(argv, "isoC-amd1"))
-			return(MDOC_isoC_amd1);
-		else if (xstrcmp(argv, "isoC-tcor1"))
-			return(MDOC_isoC_tcor1);
-		else if (xstrcmp(argv, "isoC-tcor2"))
-			return(MDOC_isoC_tcor2);
-		else if (xstrcmp(argv, "isoC-99"))
-			return(MDOC_isoC_99);
-		else if (xstrcmp(argv, "ansiC"))
-			return(MDOC_ansiC);
-		else if (xstrcmp(argv, "ansiC-89"))
-			return(MDOC_ansiC_89);
-		else if (xstrcmp(argv, "ansiC-99"))
-			return(MDOC_ansiC_99);
-		else if (xstrcmp(argv, "ieee754"))
-			return(MDOC_ieee754);
-		else if (xstrcmp(argv, "iso8802-3"))
-			return(MDOC_iso8802_3);
-		else if (xstrcmp(argv, "xpg3"))
-			return(MDOC_xpg3);
-		else if (xstrcmp(argv, "xpg4"))
-			return(MDOC_xpg4);
-		else if (xstrcmp(argv, "xpg4.2"))
-			return(MDOC_xpg4_2);
-		else if (xstrcmp(argv, "xpg4.3"))
-			return(MDOC_xpg4_3);
-		else if (xstrcmp(argv, "xbd5"))
-			return(MDOC_xbd5);
-		else if (xstrcmp(argv, "xcu5"))
-			return(MDOC_xcu5);
-		else if (xstrcmp(argv, "xsh5"))
-			return(MDOC_xsh5);
-		else if (xstrcmp(argv, "xns5"))
-			return(MDOC_xns5);
-		else if (xstrcmp(argv, "xns5.2d2.0"))
-			return(MDOC_xns5_2d2_0);
-		else if (xstrcmp(argv, "xcurses4.2"))
-			return(MDOC_xcurses4_2);
-		else if (xstrcmp(argv, "susv2"))
-			return(MDOC_susv2);
-		else if (xstrcmp(argv, "susv3"))
-			return(MDOC_susv3);
-		else if (xstrcmp(argv, "svid4"))
-			return(MDOC_svid4);
-		break;
-
 	default:
 		break;
 	}
@@ -734,48 +732,43 @@ argv_a2arg(int tok, const char *argv)
 
 static int
 argv_multi(struct mdoc *mdoc, int line, 
-		struct mdoc_arg *v, int *pos, char *buf)
+		struct mdoc_argv *v, int *pos, char *buf)
 {
 	int		 c, ppos;
 	char		*p;
 
-	v->sz = 0;
-	v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));
-
 	ppos = *pos;
 
-	for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) {
+	for (v->sz = 0; ; v->sz++) {
 		if ('-' == buf[*pos])
 			break;
 		c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
-		if (ARGS_ERROR == c) {
-			free(v->value);
+		if (ARGS_ERROR == c)
 			return(0);
-		} else if (ARGS_EOLN == c)
+		else if (ARGS_EOLN == c)
 			break;
-		v->value[(int)v->sz] = p;
+
+		if (0 == v->sz % 5)
+			v->value = xrealloc(v->value, 
+				(v->sz + 5) * sizeof(char *));
+
+		v->value[(int)v->sz] = xstrdup(p);
 	}
 
-	if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
+	if (v->sz)
 		return(1);
 
-	free(v->value);
-	if (0 == v->sz) 
-		return(perr(mdoc, line, ppos, EARGVAL));
-
-	return(perr(mdoc, line, ppos, EARGMANY));
+	return(perr(mdoc, line, ppos, EARGVAL));
 }
 
 
 static int
 argv_opt_single(struct mdoc *mdoc, int line, 
-		struct mdoc_arg *v, int *pos, char *buf)
+		struct mdoc_argv *v, int *pos, char *buf)
 {
-	int		 c, ppos;
+	int		 c;
 	char		*p;
 
-	ppos = *pos;
-
 	if ('-' == buf[*pos])
 		return(1);
 
@@ -787,7 +780,7 @@ argv_opt_single(struct mdoc *mdoc, int line, 
 
 	v->sz = 1;
 	v->value = xcalloc(1, sizeof(char *));
-	v->value[0] = p;
+	v->value[0] = xstrdup(p);
 	return(1);
 }
 
@@ -797,7 +790,7 @@ argv_opt_single(struct mdoc *mdoc, int line, 
  */
 static int
 argv_single(struct mdoc *mdoc, int line, 
-		struct mdoc_arg *v, int *pos, char *buf)
+		struct mdoc_argv *v, int *pos, char *buf)
 {
 	int		 c, ppos;
 	char		*p;
@@ -812,7 +805,7 @@ argv_single(struct mdoc *mdoc, int line, 
 
 	v->sz = 1;
 	v->value = xcalloc(1, sizeof(char *));
-	v->value[0] = p;
+	v->value[0] = xstrdup(p);
 	return(1);
 }
 
@@ -823,14 +816,28 @@ argv_single(struct mdoc *mdoc, int line, 
  * multiple parameters.
  */
 static int
-argv(struct mdoc *mdoc, int line, 
-		struct mdoc_arg *v, int *pos, char *buf)
+argv(struct mdoc *mdoc, int tok, int line, 
+		struct mdoc_argv *v, int *pos, char *buf)
 {
+	int		 fl;
 
 	v->sz = 0;
 	v->value = NULL;
+	fl = mdoc_argvflags[v->arg];
 
-	switch (mdoc_argvflags[v->arg]) {
+	/*
+	 * Override the default per-argument value.
+	 */
+
+	switch (tok) {
+	case (MDOC_Ex):
+		fl = ARGV_OPT_SINGLE;
+		break;
+	default:
+		break;
+	}
+
+	switch (fl) {
 	case (ARGV_SINGLE):
 		return(argv_single(mdoc, line, v, pos, buf));
 	case (ARGV_MULTI):
@@ -844,85 +851,3 @@ argv(struct mdoc *mdoc, int line, 
 
 	return(1);
 }
-
-
-/*
- * Parse an argument from line text.  This comes in the form of -key
- * [value0...], which may either have a single mandatory value, at least
- * one mandatory value, an optional single value, or no value.
- */
-int
-mdoc_argv(struct mdoc *mdoc, int line, int tok,
-		struct mdoc_arg *v, int *pos, char *buf)
-{
-	int		 i;
-	char		*p;
-
-	(void)memset(v, 0, sizeof(struct mdoc_arg));
-
-	if (0 == buf[*pos])
-		return(ARGV_EOLN);
-
-	assert( ! isspace((int)buf[*pos]));
-
-	if ('-' != buf[*pos])
-		return(ARGV_WORD);
-
-	i = *pos;
-	p = &buf[++(*pos)];
-
-	v->line = line;
-	v->pos = *pos;
-
-	assert(*pos > 0);
-
-	/* LINTED */
-	while (buf[*pos]) {
-		if (isspace((int)buf[*pos])) 
-			if ('\\' != buf[*pos - 1])
-				break;
-		(*pos)++;
-	}
-
-	if (buf[*pos])
-		buf[(*pos)++] = 0;
-
-	/*
-	 * We now parse out the per-macro arguments.  XXX - this can be
-	 * made much cleaner using per-argument tables.  See argv_a2arg
-	 * for details.
-	 */
-
-	if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) {
-		if ( ! pwarn(mdoc, line, i, WARGVPARM))
-			return(ARGV_ERROR);
-		return(ARGV_WORD);
-	}
-
-	while (buf[*pos] && isspace((int)buf[*pos]))
-		(*pos)++;
-
-	/* FIXME: whitespace if no value. */
-
-	if ( ! argv(mdoc, line, v, pos, buf))
-		return(ARGV_ERROR);
-
-	return(ARGV_ARG);
-}
-
-
-void
-mdoc_argv_free(int sz, struct mdoc_arg *arg)
-{
-	int		 i;
-
-	for (i = 0; i < sz; i++) {
-		if (0 == arg[i].sz) {
-			assert(NULL == arg[i].value);
-			continue;
-		}
-		assert(arg[i].value);
-		free(arg[i].value);
-	}
-}
-