diff options
| -rw-r--r-- | mandoc.h | 1 | ||||
| -rw-r--r-- | mdoc_validate.c | 32 | ||||
| -rw-r--r-- | read.c | 1 |
3 files changed, 12 insertions, 22 deletions
@@ -161,7 +161,6 @@ enum mandocerr { MANDOCERR_FATAL, /* ===== start of fatal errors ===== */ MANDOCERR_TOOLARGE, /* input too large */ - MANDOCERR_COLUMNS, /* column syntax is inconsistent */ MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */ MANDOCERR_SO_PATH, /* NOT IMPLEMENTED: .so with absolute path or ".." */ MANDOCERR_SO_FAIL, /* .so request failed */ diff --git a/mdoc_validate.c b/mdoc_validate.c index 8cb075fa..6913c8ef 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1451,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) @@ -1458,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; @@ -1484,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 @@ -1492,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; @@ -205,7 +205,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "generic fatal error", "input too large", - "column syntax is inconsistent", "NOT IMPLEMENTED: .Bd -file", "NOT IMPLEMENTED: .so with absolute path or \"..\"", ".so request failed", |