In .Bl -column, if some of the column width declarations are given

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 5cceeff510c7a8b028c43a11c3ad6f9f5438b0f4..67e21df7f0382fb12a0cbd57d1c2d312c12d3140 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.236 2014/07/30 23:38:52 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>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1451,6 +1451,7 @@ static int
 post_bl_head(POST_ARGS)
 {
        struct mdoc_node *np, *nn, *nnp;
 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)
        int               i, j;
 
        if (LIST_column != mdoc->last->norm->Bl.type)


@@ -1458,22 +1459,12 @@ post_bl_head(POST_ARGS)
                return(hwarn_eq0(mdoc));
 
        /*
                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.
         */
 
         * 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;
                return(1);
 
        np = mdoc->last->parent;


@@ -1484,7 +1475,6 @@ post_bl_head(POST_ARGS)
                        break;
 
        assert(j < (int)np->args->argc);
                        break;
 
        assert(j < (int)np->args->argc);

-       assert(0 == np->args->argv[j].sz);

 
        /*
         * Accommodate for new-style groff column syntax.  Shuffle the
 
        /*
         * Accommodate for new-style groff column syntax.  Shuffle the


@@ -1492,15 +1482,17 @@ post_bl_head(POST_ARGS)
         * column field.  Then, delete the head children.
         */
 
         * 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;
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;