===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.235
retrieving revision 1.237
diff -u -p -r1.235 -r1.237
--- mandoc/mdoc_validate.c	2014/07/30 17:06:26	1.235
+++ mandoc/mdoc_validate.c	2014/07/31 00:41:10	1.237
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.235 2014/07/30 17:06:26 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.237 2014/07/31 00:41:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1210,7 +1210,6 @@ post_it(POST_ARGS)
 	int		  i, cols;
 	enum mdoc_list	  lt;
 	struct mdoc_node *nbl, *nit, *nch;
-	enum mandocerr	  er;
 
 	nit = mdoc->last;
 	if (MDOC_BLOCK != nit->type)
@@ -1261,16 +1260,11 @@ post_it(POST_ARGS)
 			if (MDOC_BODY == nch->type)
 				i++;
 
-		if (i < cols)
-			er = MANDOCERR_ARGCOUNT;
-		else if (i == cols || i == cols + 1)
-			break;
-		else
-			er = MANDOCERR_SYNTARGCOUNT;
-
-		mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos,
-		    "columns == %d (have %d)", cols, i);
-		return(MANDOCERR_ARGCOUNT == er);
+		if (i < cols || i > cols + 1)
+			mandoc_vmsg(MANDOCERR_ARGCOUNT,
+			    mdoc->parse, nit->line, nit->pos,
+			    "columns == %d (have %d)", cols, i);
+		break;
 	default:
 		abort();
 	}
@@ -1457,6 +1451,7 @@ static int
 post_bl_head(POST_ARGS)
 {
 	struct mdoc_node *np, *nn, *nnp;
+	struct mdoc_argv *argv;
 	int		  i, j;
 
 	if (LIST_column != mdoc->last->norm->Bl.type)
@@ -1464,22 +1459,12 @@ post_bl_head(POST_ARGS)
 		return(hwarn_eq0(mdoc));
 
 	/*
-	 * Convert old-style lists, where the column width specifiers
+	 * Append 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->norm->Bl.ncols && mdoc->last->nchild) {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
-		return(0);
-	} else if (NULL == mdoc->last->child)
+	if (mdoc->last->child == NULL)
 		return(1);
 
 	np = mdoc->last->parent;
@@ -1490,7 +1475,6 @@ post_bl_head(POST_ARGS)
 			break;
 
 	assert(j < (int)np->args->argc);
-	assert(0 == np->args->argv[j].sz);
 
 	/*
 	 * Accommodate for new-style groff column syntax.  Shuffle the
@@ -1498,15 +1482,17 @@ post_bl_head(POST_ARGS)
 	 * column field.  Then, delete the head children.
 	 */
 
-	np->args->argv[j].sz = (size_t)mdoc->last->nchild;
-	np->args->argv[j].value = mandoc_reallocarray(NULL,
-	    (size_t)mdoc->last->nchild, sizeof(char *));
+	argv = np->args->argv + j;
+	i = argv->sz;
+	argv->sz += mdoc->last->nchild;
+	argv->value = mandoc_reallocarray(argv->value,
+	    argv->sz, sizeof(char *));
 
-	mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
-	mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value;
+	mdoc->last->norm->Bl.ncols = argv->sz;
+	mdoc->last->norm->Bl.cols = (void *)argv->value;
 
-	for (i = 0, nn = mdoc->last->child; nn; i++) {
-		np->args->argv[j].value[i] = nn->string;
+	for (nn = mdoc->last->child; nn; i++) {
+		argv->value[i] = nn->string;
 		nn->string = NULL;
 		nnp = nn;
 		nn = nn->next;