version 1.219, 2014/07/02 05:52:25 |
version 1.225, 2014/07/04 01:50:07 |
Line 591 pre_display(PRE_ARGS) |
|
Line 591 pre_display(PRE_ARGS) |
|
break; |
break; |
|
|
if (node) |
if (node) |
mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP); |
mandoc_vmsg(MANDOCERR_BD_NEST, |
|
mdoc->parse, n->line, n->pos, |
|
"%s in Bd", mdoc_macronames[n->tok]); |
|
|
return(1); |
return(1); |
} |
} |
Line 725 pre_bl(PRE_ARGS) |
|
Line 727 pre_bl(PRE_ARGS) |
|
if (n->norm->Bl.width || |
if (n->norm->Bl.width || |
n->norm->Bl.offs || |
n->norm->Bl.offs || |
n->norm->Bl.comp) |
n->norm->Bl.comp) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
|
mdoc->parse, n->line, n->pos, |
|
mdoc_argnames[n->args->argv[0].arg]); |
continue; |
continue; |
} |
} |
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->norm->Bl.type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE); |
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
Line 747 pre_bl(PRE_ARGS) |
|
Line 750 pre_bl(PRE_ARGS) |
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (NULL == n->norm->Bl.width) |
if (NULL == n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_WIDTH); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 867 pre_bd(PRE_ARGS) |
|
Line 870 pre_bd(PRE_ARGS) |
|
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
Line 932 pre_std(PRE_ARGS) |
|
Line 935 pre_std(PRE_ARGS) |
|
if (MDOC_Std == n->args->argv[0].arg) |
if (MDOC_Std == n->args->argv[0].arg) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV); |
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 1115 post_vt(POST_ARGS) |
|
Line 1119 post_vt(POST_ARGS) |
|
|
|
for (n = mdoc->last->child; n; n = n->next) |
for (n = mdoc->last->child; n; n = n->next) |
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type) |
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
return(1); |
return(1); |
} |
} |
Line 1267 post_it(POST_ARGS) |
|
Line 1272 post_it(POST_ARGS) |
|
{ |
{ |
int i, cols; |
int i, cols; |
enum mdoc_list lt; |
enum mdoc_list lt; |
struct mdoc_node *n, *c; |
struct mdoc_node *nbl, *nit, *nch; |
enum mandocerr er; |
enum mandocerr er; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
nit = mdoc->last; |
|
if (MDOC_BLOCK != nit->type) |
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
nbl = nit->parent->parent; |
lt = n->norm->Bl.type; |
lt = nbl->norm->Bl.type; |
|
|
if (LIST__NONE == lt) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
|
return(1); |
|
} |
|
|
|
switch (lt) { |
switch (lt) { |
case LIST_tag: |
case LIST_tag: |
if (mdoc->last->head->child) |
/* FALLTHROUGH */ |
break; |
|
/* FIXME: give this a dummy value. */ |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
|
break; |
|
case LIST_hang: |
case LIST_hang: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_ohang: |
case LIST_ohang: |
Line 1295 post_it(POST_ARGS) |
|
Line 1292 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == mdoc->last->head->child) |
if (NULL == nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1305 post_it(POST_ARGS) |
|
Line 1304 post_it(POST_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == mdoc->last->body->child) |
if (NULL == nit->body->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
mandoc_msg(MANDOCERR_IT_NOBODY, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if (mdoc->last->head->child) |
if (NULL != nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
mdoc_nmsg(mdoc, nit, MANDOCERR_ARGSLOST); |
break; |
break; |
case LIST_column: |
case LIST_column: |
cols = (int)n->norm->Bl.ncols; |
cols = (int)nbl->norm->Bl.ncols; |
|
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == nit->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
for (i = 0, nch = nit->child; nch; nch = nch->next) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
if (MDOC_BODY == nch->type) |
|
|
for (i = 0, c = mdoc->last->child; c; c = c->next) |
|
if (MDOC_BODY == c->type) |
|
i++; |
i++; |
|
|
if (i < cols) |
if (i < cols) |
Line 1331 post_it(POST_ARGS) |
|
Line 1329 post_it(POST_ARGS) |
|
else |
else |
er = MANDOCERR_SYNTARGCOUNT; |
er = MANDOCERR_SYNTARGCOUNT; |
|
|
mandoc_vmsg(er, mdoc->parse, |
mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos, |
mdoc->last->line, mdoc->last->pos, |
|
"columns == %d (have %d)", cols, i); |
"columns == %d (have %d)", cols, i); |
return(MANDOCERR_ARGCOUNT == er); |
return(MANDOCERR_ARGCOUNT == er); |
default: |
default: |
break; |
abort(); |
} |
} |
|
|
return(1); |
return(1); |
Line 1611 post_bl(POST_ARGS) |
|
Line 1608 post_bl(POST_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse, |
|
nchild->line, nchild->pos, |
|
mdoc_macronames[nchild->tok]); |
|
|
/* |
/* |
* Move the node out of the Bl block. |
* Move the node out of the Bl block. |
Line 1663 ebool(struct mdoc *mdoc) |
|
Line 1662 ebool(struct mdoc *mdoc) |
|
{ |
{ |
|
|
if (NULL == mdoc->last->child) { |
if (NULL == mdoc->last->child) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
if (MDOC_Sm == mdoc->last->tok) |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc->flags ^= MDOC_SMOFF; |
return(1); |
return(1); |
} |
} |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1); |
|
|
|
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2); |
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
if (0 == strcmp(mdoc->last->child->string, "on")) { |
if (0 == strcmp(mdoc->last->child->string, "on")) { |
Line 1723 post_st(POST_ARGS) |
|
Line 1723 post_st(POST_ARGS) |
|
const char *p; |
const char *p; |
|
|
if (NULL == (ch = mdoc->last->child)) { |
if (NULL == (ch = mdoc->last->child)) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
mdoc_macronames[mdoc->last->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
} |
} |
Line 1780 post_rs(POST_ARGS) |
|
Line 1782 post_rs(POST_ARGS) |
|
} |
} |
|
|
next = nn->next; |
next = nn->next; |
mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse, |
|
nn->line, nn->pos, mdoc_macronames[nn->tok]); |
mdoc_node_delete(mdoc, nn); |
mdoc_node_delete(mdoc, nn); |
} |
} |
|
|
Line 1903 post_ns(POST_ARGS) |
|
Line 1906 post_ns(POST_ARGS) |
|
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); |
return(1); |
return(1); |
} |
} |
|
|