===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.128
retrieving revision 1.130
diff -u -p -r1.128 -r1.130
--- mandoc/mdoc_validate.c	2010/11/29 15:45:15	1.128
+++ mandoc/mdoc_validate.c	2010/11/30 10:32:05	1.130
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.128 2010/11/29 15:45:15 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.130 2010/11/30 10:32:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -193,7 +193,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_nm },			/* Nm */
 	{ NULL, posts_wline },			/* Op */
 	{ NULL, NULL },				/* Ot */
-	{ NULL, NULL },				/* Pa */
+	{ NULL, posts_defaults },		/* Pa */
 	{ pres_rv, NULL },			/* Rv */
 	{ NULL, posts_st },			/* St */ 
 	{ NULL, NULL },				/* Va */
@@ -1154,12 +1154,41 @@ post_vt(POST_ARGS)
 static int
 post_nm(POST_ARGS)
 {
+	struct mdoc_node *nn;
+	char		  buf[BUFSIZ];
 
-	if (mdoc->last->child)
+	/* If no child specified, make sure we have the meta name. */
+
+	if (NULL == mdoc->last->child && NULL == mdoc->meta.name) {
+		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
 		return(1);
-	if (mdoc->meta.name)
+	} else if (mdoc->meta.name)
 		return(1);
-	return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME));
+
+	/* If no meta name, set it from the child. */
+
+	buf[0] = '\0';
+
+	for (nn = mdoc->last->child; nn; nn = nn->next) {
+		/* XXX - copied from concat(). */
+		assert(MDOC_TEXT == nn->type);
+
+		if (strlcat(buf, nn->string, BUFSIZ) >= BUFSIZ) {
+			mdoc_nmsg(mdoc, nn, MANDOCERR_MEM);
+			return(0);
+		}
+
+		if (NULL == nn->next)
+			continue;
+
+		if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
+			mdoc_nmsg(mdoc, nn, MANDOCERR_MEM);
+			return(0);
+		}
+	}
+
+	mdoc->meta.name = mandoc_strdup(buf);
+	return(1);
 }
 
 static int
@@ -1186,8 +1215,8 @@ post_defaults(POST_ARGS)
 
 	/*
 	 * The `Ar' defaults to "file ..." if no value is provided as an
-	 * argument; the `Mt' macro uses "~"; the `Li' just gets an
-	 * empty string.
+	 * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
+	 * gets an empty string.
 	 */
 
 	if (mdoc->last->child)
@@ -1213,6 +1242,8 @@ post_defaults(POST_ARGS)
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
 			return(0);
 		break;
+	case (MDOC_Pa):
+		/* FALLTHROUGH */
 	case (MDOC_Mt):
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
 			return(0);
@@ -1371,23 +1402,68 @@ post_it(POST_ARGS)
 static int
 post_bl_head(POST_ARGS) 
 {
-	struct mdoc_node *n;
+	struct mdoc_node *np, *nn, *nnp;
+	int		  i, j;
 
-	assert(mdoc->last->parent);
-	n = mdoc->last->parent;
+	if (LIST_column != mdoc->last->data.Bl->type)
+		/* FIXME: this should be ERROR class... */
+		return(hwarn_eq0(mdoc));
 
-	if (LIST_column == n->data.Bl->type) {
-		if (n->data.Bl->ncols && mdoc->last->nchild) {
-			mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);
-			return(0);
-		}
+	/*
+	 * Convert old-style lists, where the column width specifiers
+	 * trail as macro parameters, to the new-style ("normal-form")
+	 * lists where they're argument values following -column.
+	 */
+
+	/* First, disallow both types and allow normal-form. */
+
+	/* 
+	 * TODO: technically, we can accept both and just merge the two
+	 * lists, but I'll leave that for another day.
+	 */
+
+	if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) {
+		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
+		return(0);
+	} else if (NULL == mdoc->last->child)
 		return(1);
+
+	np = mdoc->last->parent;
+	assert(np->args);
+
+	for (j = 0; j < (int)np->args->argc; j++) 
+		if (MDOC_Column == np->args->argv[j].arg)
+			break;
+
+	assert(j < (int)np->args->argc);
+	assert(0 == np->args->argv[j].sz);
+
+	/*
+	 * Accomodate for new-style groff column syntax.  Shuffle the
+	 * child nodes, all of which must be TEXT, as arguments for the
+	 * column field.  Then, delete the head children.
+	 */
+
+	np->args->argv[j].sz = (size_t)mdoc->last->nchild;
+	np->args->argv[j].value = mandoc_malloc
+		((size_t)mdoc->last->nchild * sizeof(char *));
+
+	mdoc->last->data.Bl->ncols = np->args->argv[j].sz;
+	mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value;
+
+	for (i = 0, nn = mdoc->last->child; nn; i++) {
+		np->args->argv[j].value[i] = nn->string;
+		nn->string = NULL;
+		nnp = nn;
+		nn = nn->next;
+		mdoc_node_delete(NULL, nnp);
 	}
 
-	/* FIXME: should be ERROR class. */
-	return(hwarn_eq0(mdoc));
-}
+	mdoc->last->nchild = 0;
+	mdoc->last->child = NULL;
 
+	return(1);
+}
 
 static int
 post_bl(POST_ARGS)