version 1.137, 2010/12/05 15:55:01 |
version 1.148, 2010/12/25 13:50:37 |
Line 107 static int post_it(POST_ARGS); |
|
Line 107 static int post_it(POST_ARGS); |
|
static int post_lb(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
|
static int post_ignpar(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_rs(POST_ARGS); |
static int post_rs(POST_ARGS); |
Line 150 static v_post posts_nm[] = { post_nm, NULL }; |
|
Line 151 static v_post posts_nm[] = { post_nm, NULL }; |
|
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; |
static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { post_ignpar, herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_ss[] = { post_ignpar, herr_ge1, bwarn_ge1, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
Line 169 static v_pre pres_dd[] = { pre_dd, NULL }; |
|
Line 170 static v_pre pres_dd[] = { pre_dd, NULL }; |
|
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_it[] = { pre_it, NULL }; |
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
Line 210 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 211 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, posts_wline }, /* Op */ |
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, posts_std }, /* Rv */ |
{ pres_std, posts_std }, /* Rv */ |
Line 231 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 232 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_text }, /* %V */ |
{ NULL, posts_text }, /* %V */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ao */ |
{ NULL, NULL }, /* Ao */ |
{ NULL, posts_wline }, /* Aq */ |
{ NULL, NULL }, /* Aq */ |
{ NULL, posts_at }, /* At */ |
{ NULL, posts_at }, /* At */ |
{ NULL, NULL }, /* Bc */ |
{ NULL, NULL }, /* Bc */ |
{ NULL, posts_bf }, /* Bf */ |
{ NULL, posts_bf }, /* Bf */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, posts_wline }, /* Bq */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Do */ |
{ NULL, posts_wline }, /* Dq */ |
{ NULL, NULL }, /* Dq */ |
{ NULL, NULL }, /* Ec */ |
{ NULL, NULL }, /* Ec */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Em */ |
Line 256 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 257 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, posts_text1 }, /* Pf */ |
{ NULL, posts_text1 }, /* Pf */ |
{ NULL, NULL }, /* Po */ |
{ NULL, NULL }, /* Po */ |
{ NULL, posts_wline }, /* Pq */ |
{ NULL, NULL }, /* Pq */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, posts_wline }, /* Ql */ |
{ NULL, NULL }, /* Ql */ |
{ NULL, NULL }, /* Qo */ |
{ NULL, NULL }, /* Qo */ |
{ NULL, posts_wline }, /* Qq */ |
{ NULL, NULL }, /* Qq */ |
{ NULL, NULL }, /* Re */ |
{ NULL, NULL }, /* Re */ |
{ NULL, posts_rs }, /* Rs */ |
{ NULL, posts_rs }, /* Rs */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, posts_wline }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, posts_text }, /* Sy */ |
{ NULL, posts_text }, /* Sy */ |
Line 287 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 288 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_wline }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, posts_text }, /* %C */ |
Line 608 pre_bl(PRE_ARGS) |
|
Line 609 pre_bl(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bl == np->tok); |
assert(MDOC_Bl == np->tok); |
assert(np->data.Bl); |
|
n->data.Bl = np->data.Bl; |
|
return(1); |
return(1); |
} |
} |
|
|
Line 619 pre_bl(PRE_ARGS) |
|
Line 618 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
assert(NULL == n->data.Bl); |
|
n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
lt = LIST__NONE; |
lt = LIST__NONE; |
Line 664 pre_bl(PRE_ARGS) |
|
Line 660 pre_bl(PRE_ARGS) |
|
break; |
break; |
/* Set list arguments. */ |
/* Set list arguments. */ |
case (MDOC_Compact): |
case (MDOC_Compact): |
dup = n->data.Bl->comp; |
dup = n->norm->Bl.comp; |
comp = 1; |
comp = 1; |
break; |
break; |
case (MDOC_Width): |
case (MDOC_Width): |
dup = (NULL != n->data.Bl->width); |
dup = (NULL != n->norm->Bl.width); |
width = n->args->argv[i].value[0]; |
width = n->args->argv[i].value[0]; |
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bl->offs); |
dup = (NULL != n->norm->Bl.offs); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
Line 690 pre_bl(PRE_ARGS) |
|
Line 686 pre_bl(PRE_ARGS) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bl->comp = comp; |
n->norm->Bl.comp = comp; |
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bl->offs = offs; |
n->norm->Bl.offs = offs; |
if (width && ! dup) |
if (width && ! dup) |
n->data.Bl->width = width; |
n->norm->Bl.width = width; |
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { |
if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) { |
n->data.Bl->type = lt; |
n->norm->Bl.type = lt; |
/* Set column information, too. */ |
/* Set column information, too. */ |
if (LIST_column == lt) { |
if (LIST_column == lt) { |
n->data.Bl->ncols = |
n->norm->Bl.ncols = |
n->args->argv[i].sz; |
n->args->argv[i].sz; |
n->data.Bl->cols = (const char **) |
n->norm->Bl.cols = (const char **) |
n->args->argv[i].value; |
n->args->argv[i].value; |
} |
} |
} |
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
if (n->data.Bl->type == LIST__NONE) |
if (n->norm->Bl.type == LIST__NONE) |
if (n->data.Bl->width || |
if (n->norm->Bl.width || |
n->data.Bl->offs || |
n->norm->Bl.offs || |
n->data.Bl->comp) |
n->norm->Bl.comp) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
|
|
continue; |
continue; |
Line 727 pre_bl(PRE_ARGS) |
|
Line 723 pre_bl(PRE_ARGS) |
|
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->data.Bl->type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
n->data.Bl->type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
/* |
/* |
Line 738 pre_bl(PRE_ARGS) |
|
Line 734 pre_bl(PRE_ARGS) |
|
* and must also be warned. |
* and must also be warned. |
*/ |
*/ |
|
|
switch (n->data.Bl->type) { |
switch (n->norm->Bl.type) { |
case (LIST_tag): |
case (LIST_tag): |
if (n->data.Bl->width) |
if (n->norm->Bl.width) |
break; |
break; |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
break; |
break; |
Line 753 pre_bl(PRE_ARGS) |
|
Line 749 pre_bl(PRE_ARGS) |
|
case (LIST_inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (n->data.Bl->width) |
if (n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
break; |
break; |
default: |
default: |
Line 782 pre_bd(PRE_ARGS) |
|
Line 778 pre_bd(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bd == np->tok); |
assert(MDOC_Bd == np->tok); |
assert(np->data.Bd); |
|
n->data.Bd = np->data.Bd; |
|
return(1); |
return(1); |
} |
} |
|
|
assert(NULL == n->data.Bd); |
|
n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
dt = DISP__NONE; |
dt = DISP__NONE; |
Line 819 pre_bd(PRE_ARGS) |
|
Line 810 pre_bd(PRE_ARGS) |
|
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bd->offs); |
dup = (NULL != n->norm->Bd.offs); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
comp = 1; |
comp = 1; |
dup = n->data.Bd->comp; |
dup = n->norm->Bd.comp; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 841 pre_bd(PRE_ARGS) |
|
Line 832 pre_bd(PRE_ARGS) |
|
/* Make our auxiliary assignments. */ |
/* Make our auxiliary assignments. */ |
|
|
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bd->offs = offs; |
n->norm->Bd.offs = offs; |
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bd->comp = comp; |
n->norm->Bd.comp = comp; |
|
|
/* Check whether a type has already been assigned. */ |
/* Check whether a type has already been assigned. */ |
|
|
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE) |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
|
|
/* Make our type assignment. */ |
/* Make our type assignment. */ |
|
|
if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) |
if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE) |
n->data.Bd->type = dt; |
n->norm->Bd.type = dt; |
} |
} |
|
|
if (DISP__NONE == n->data.Bd->type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
n->data.Bd->type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(1); |
Line 894 pre_it(PRE_ARGS) |
|
Line 885 pre_it(PRE_ARGS) |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
/* |
|
* FIXME: this can probably be lifted if we make the It into |
|
* something else on-the-fly? |
|
*/ |
|
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
} |
} |
|
|
Line 915 pre_an(PRE_ARGS) |
|
Line 902 pre_an(PRE_ARGS) |
|
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
|
|
if (MDOC_Split == n->args->argv[0].arg) |
if (MDOC_Split == n->args->argv[0].arg) |
n->data.An.auth = AUTH_split; |
n->norm->An.auth = AUTH_split; |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
n->data.An.auth = AUTH_nosplit; |
n->norm->An.auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
|
|
Line 999 post_bf(POST_ARGS) |
|
Line 986 post_bf(POST_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_Bf == np->tok); |
assert(MDOC_Bf == np->tok); |
assert(np->data.Bf); |
|
mdoc->last->data.Bf = np->data.Bf; |
|
return(1); |
return(1); |
} |
} |
|
|
np = mdoc->last; |
np = mdoc->last; |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_Bf == np->parent->tok); |
assert(MDOC_Bf == np->parent->tok); |
np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf)); |
|
|
|
/* |
/* |
* Cannot have both argument and parameter. |
* Cannot have both argument and parameter. |
Line 1027 post_bf(POST_ARGS) |
|
Line 1011 post_bf(POST_ARGS) |
|
if (np->parent->args) { |
if (np->parent->args) { |
arg = np->parent->args->argv[0].arg; |
arg = np->parent->args->argv[0].arg; |
if (MDOC_Emphasis == arg) |
if (MDOC_Emphasis == arg) |
np->data.Bf->font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (MDOC_Literal == arg) |
else if (MDOC_Literal == arg) |
np->data.Bf->font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (MDOC_Symbolic == arg) |
else if (MDOC_Symbolic == arg) |
np->data.Bf->font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
abort(); |
abort(); |
return(1); |
return(1); |
Line 1040 post_bf(POST_ARGS) |
|
Line 1024 post_bf(POST_ARGS) |
|
/* Extract parameter into data. */ |
/* Extract parameter into data. */ |
|
|
if (0 == strcmp(np->child->string, "Em")) |
if (0 == strcmp(np->child->string, "Em")) |
np->data.Bf->font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (0 == strcmp(np->child->string, "Li")) |
else if (0 == strcmp(np->child->string, "Li")) |
np->data.Bf->font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (0 == strcmp(np->child->string, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
np->data.Bf->font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
|
|
Line 1250 post_an(POST_ARGS) |
|
Line 1234 post_an(POST_ARGS) |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE != np->data.An.auth && np->child) |
if (AUTH__NONE != np->norm->An.auth && np->child) |
return(eerr_eq0(mdoc)); |
return(eerr_eq0(mdoc)); |
|
|
/* |
/* |
* FIXME: make this ewarn and make sure that the front-ends |
* FIXME: make this ewarn and make sure that the front-ends |
* don't print the arguments. |
* don't print the arguments. |
*/ |
*/ |
if (AUTH__NONE != np->data.An.auth || np->child) |
if (AUTH__NONE != np->norm->An.auth || np->child) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
Line 1277 post_it(POST_ARGS) |
|
Line 1261 post_it(POST_ARGS) |
|
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
n = mdoc->last->parent->parent; |
assert(n->data.Bl); |
lt = n->norm->Bl.type; |
lt = n->data.Bl->type; |
|
|
|
if (LIST__NONE == lt) { |
if (LIST__NONE == lt) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
Line 1317 post_it(POST_ARGS) |
|
Line 1300 post_it(POST_ARGS) |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = (int)n->data.Bl->ncols; |
cols = (int)n->norm->Bl.ncols; |
|
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
Line 1361 post_bl_block(POST_ARGS) |
|
Line 1344 post_bl_block(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (LIST_tag == n->data.Bl->type && |
if (LIST_tag == n->norm->Bl.type && |
NULL == n->data.Bl->width) { |
NULL == n->norm->Bl.width) { |
if ( ! post_bl_block_tag(mdoc)) |
if ( ! post_bl_block_tag(mdoc)) |
return(0); |
return(0); |
} else if (NULL != n->data.Bl->width) { |
} else if (NULL != n->norm->Bl.width) { |
if ( ! post_bl_block_width(mdoc)) |
if ( ! post_bl_block_width(mdoc)) |
return(0); |
return(0); |
} else |
} else |
return(1); |
return(1); |
|
|
assert(n->data.Bl->width); |
assert(n->norm->Bl.width); |
return(1); |
return(1); |
} |
} |
|
|
Line 1395 post_bl_block_width(POST_ARGS) |
|
Line 1378 post_bl_block_width(POST_ARGS) |
|
* the macro's width as set in share/tmac/mdoc/doc-common. |
* the macro's width as set in share/tmac/mdoc/doc-common. |
*/ |
*/ |
|
|
if (0 == strcmp(n->data.Bl->width, "Ds")) |
if (0 == strcmp(n->norm->Bl.width, "Ds")) |
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) { |
else if (0 == (width = mdoc_macro2len(tok))) { |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
Line 1419 post_bl_block_width(POST_ARGS) |
|
Line 1402 post_bl_block_width(POST_ARGS) |
|
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl->width = n->args->argv[i].value[0]; |
n->norm->Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1448 post_bl_block_tag(POST_ARGS) |
|
Line 1431 post_bl_block_tag(POST_ARGS) |
|
assert(MDOC_BLOCK == nn->type); |
assert(MDOC_BLOCK == nn->type); |
nn = nn->head->child; |
nn = nn->head->child; |
|
|
if (nn == NULL) { |
if (nn == NULL) |
/* No -width for .Bl and first .It is emtpy */ |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
break; |
break; |
} |
|
|
|
if (MDOC_TEXT == nn->type) { |
if (MDOC_TEXT == nn->type) { |
sz = strlen(nn->string) + 1; |
sz = strlen(nn->string) + 1; |
Line 1461 post_bl_block_tag(POST_ARGS) |
|
Line 1441 post_bl_block_tag(POST_ARGS) |
|
|
|
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
sz = ssz; |
sz = ssz; |
else |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
|
|
break; |
break; |
} |
} |
Line 1490 post_bl_block_tag(POST_ARGS) |
|
Line 1468 post_bl_block_tag(POST_ARGS) |
|
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl->width = n->args->argv[i].value[0]; |
n->norm->Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1501 post_bl_head(POST_ARGS) |
|
Line 1479 post_bl_head(POST_ARGS) |
|
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->data.Bl->type) |
if (LIST_column != mdoc->last->norm->Bl.type) |
/* FIXME: this should be ERROR class... */ |
/* FIXME: this should be ERROR class... */ |
return(hwarn_eq0(mdoc)); |
return(hwarn_eq0(mdoc)); |
|
|
Line 1518 post_bl_head(POST_ARGS) |
|
Line 1496 post_bl_head(POST_ARGS) |
|
* lists, but I'll leave that for another day. |
* lists, but I'll leave that for another day. |
*/ |
*/ |
|
|
if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) { |
if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
return(0); |
return(0); |
} else if (NULL == mdoc->last->child) |
} else if (NULL == mdoc->last->child) |
Line 1544 post_bl_head(POST_ARGS) |
|
Line 1522 post_bl_head(POST_ARGS) |
|
np->args->argv[j].value = mandoc_malloc |
np->args->argv[j].value = mandoc_malloc |
((size_t)mdoc->last->nchild * sizeof(char *)); |
((size_t)mdoc->last->nchild * sizeof(char *)); |
|
|
mdoc->last->data.Bl->ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value; |
|
|
for (i = 0, nn = mdoc->last->child; nn; i++) { |
for (i = 0, nn = mdoc->last->child; nn; i++) { |
np->args->argv[j].value[i] = nn->string; |
np->args->argv[j].value[i] = nn->string; |
Line 1572 post_bl(POST_ARGS) |
|
Line 1550 post_bl(POST_ARGS) |
|
return(post_bl_block(mdoc)); |
return(post_bl_block(mdoc)); |
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
if (NULL == mdoc->last->child) |
|
return(1); |
|
|
|
/* |
|
* We only allow certain children of `Bl'. This is usually on |
|
* `It', but apparently `Sm' occurs here and there, so we let |
|
* that one through, too. |
|
*/ |
|
|
|
/* LINTED */ |
|
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
if (MDOC_BLOCK == n->type && MDOC_It == n->tok) |
switch (n->tok) { |
|
case (MDOC_Lp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pp): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
|
/* FALLTHROUGH */ |
|
case (MDOC_It): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sm): |
continue; |
continue; |
if (MDOC_Sm == n->tok) |
default: |
continue; |
break; |
|
} |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
return(0); |
return(0); |
} |
} |
Line 1670 post_rs(POST_ARGS) |
|
Line 1649 post_rs(POST_ARGS) |
|
{ |
{ |
struct mdoc_node *nn, *next, *prev; |
struct mdoc_node *nn, *next, *prev; |
int i, j; |
int i, j; |
|
int *tj; |
|
#define RS_JOURNAL (1 << 0) |
|
#define RS_TITLE (1 << 1) |
|
|
if (MDOC_BODY != mdoc->last->type) |
/* Mark whether we're carrying both a %T and %J. */ |
|
|
|
tj = &mdoc->last->norm->Rs.titlejournal; |
|
|
|
if (MDOC_BLOCK == mdoc->last->type) { |
|
if ( ! (RS_JOURNAL & *tj && RS_TITLE & *tj)) |
|
*tj = 0; |
return(1); |
return(1); |
|
} else if (MDOC_BODY != mdoc->last->type) |
|
return(1); |
|
|
/* |
/* |
* Make sure only certain types of nodes are allowed within the |
* Make sure only certain types of nodes are allowed within the |
Line 1687 post_rs(POST_ARGS) |
|
Line 1677 post_rs(POST_ARGS) |
|
break; |
break; |
|
|
if (i < RSORD_MAX) { |
if (i < RSORD_MAX) { |
|
if (MDOC__T == rsord[i]) |
|
*tj |= RS_TITLE; |
|
else if (MDOC__J == rsord[i]) |
|
*tj |= RS_JOURNAL; |
next = nn->next; |
next = nn->next; |
continue; |
continue; |
} |
} |
Line 1888 post_sh_head(POST_ARGS) |
|
Line 1882 post_sh_head(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_ignpar(POST_ARGS) |
|
{ |
|
struct mdoc_node *np; |
|
|
|
if (MDOC_BODY != mdoc->last->type) |
|
return(1); |
|
|
|
if (NULL != (np = mdoc->last->child)) |
|
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, np); |
|
} |
|
|
|
if (NULL != (np = mdoc->last->last)) |
|
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, np); |
|
} |
|
|
|
return(1); |
|
} |
|
|
|
static int |
pre_par(PRE_ARGS) |
pre_par(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->last) |
if (NULL == mdoc->last) |
return(1); |
return(1); |
|
if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) |
|
return(1); |
|
|
/* |
/* |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
Line 1901 pre_par(PRE_ARGS) |
|
Line 1920 pre_par(PRE_ARGS) |
|
|
|
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
return(1); |
return(1); |
|
if (MDOC_Bl == n->tok && n->norm->Bl.comp) |
if (MDOC_Bl == n->tok && n->data.Bl->comp) |
|
return(1); |
return(1); |
if (MDOC_Bd == n->tok && n->data.Bd->comp) |
if (MDOC_Bd == n->tok && n->norm->Bd.comp) |
return(1); |
return(1); |
|
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
|
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
Line 1929 pre_literal(PRE_ARGS) |
|
Line 1949 pre_literal(PRE_ARGS) |
|
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
break; |
break; |
case (MDOC_Bd): |
case (MDOC_Bd): |
assert(n->data.Bd); |
if (DISP_literal == n->norm->Bd.type) |
if (DISP_literal == n->data.Bd->type) |
|
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
if (DISP_unfilled == n->data.Bd->type) |
if (DISP_unfilled == n->norm->Bd.type) |
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
break; |
break; |
default: |
default: |