===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.55
retrieving revision 1.61
diff -u -p -r1.55 -r1.61
--- mandoc/mdoc_argv.c	2010/07/01 22:56:17	1.55
+++ mandoc/mdoc_argv.c	2010/12/22 11:15:16	1.61
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_argv.c,v 1.55 2010/07/01 22:56:17 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.61 2010/12/22 11:15:16 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -45,7 +45,7 @@
 
 #define	MULTI_STEP	 5
 
-static	int		 argv_a2arg(enum mdoct, const char *);
+static	enum mdocargt	 argv_a2arg(enum mdoct, const char *);
 static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, int, char **);
 static	int		 argv(struct mdoc *, int, 
@@ -95,7 +95,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Os */
 	0, /* Sh */
 	0, /* Ss */ 
-	ARGS_DELIM, /* Pp */ 
+	0, /* Pp */ 
 	ARGS_DELIM, /* D1 */
 	ARGS_DELIM, /* Dl */
 	0, /* Bd */
@@ -196,7 +196,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Fr */
 	0, /* Ud */
 	0, /* Lb */
-	ARGS_DELIM, /* Lp */
+	0, /* Lp */
 	ARGS_DELIM, /* Lk */
 	ARGS_DELIM, /* Mt */
 	ARGS_DELIM, /* Brq */
@@ -313,9 +313,11 @@ mdoc_argv_free(struct mdoc_arg *p)
 void
 mdoc_argn_free(struct mdoc_arg *p, int iarg)
 {
-	struct mdoc_argv *arg = &p->argv[iarg];
+	struct mdoc_argv *arg;
 	int		  j;
 
+	arg = &p->argv[iarg];
+
 	if (arg->sz && arg->value) {
 		for (j = (int)arg->sz - 1; j >= 0; j--) 
 			free(arg->value[j]);
@@ -359,8 +361,7 @@ mdoc_args(struct mdoc *m, int line, int *pos, 
 		if (MDOC_Bl == n->tok)
 			break;
 
-	assert(n->data.Bl);
-	if (n && LIST_column == n->data.Bl->type) {
+	if (n && LIST_column == n->norm->d.Bl.type) {
 		fl |= ARGS_TABSEP;
 		fl &= ~ARGS_DELIM;
 	}
@@ -583,7 +584,7 @@ args(struct mdoc *m, int line, int *pos, 
 }
 
 
-static int
+static enum mdocargt
 argv_a2arg(enum mdoct tok, const char *p)
 {