version 1.90, 2010/05/31 23:40:25 |
version 1.104, 2010/07/01 22:56:17 |
|
|
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* TODO: ignoring Pp (it's superfluous in some invocations). */ |
/* TODO: ignoring Pp (it's superfluous in some invocations). */ |
|
|
#define PRE_ARGS struct mdoc *mdoc, const struct mdoc_node *n |
#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n |
#define POST_ARGS struct mdoc *mdoc |
#define POST_ARGS struct mdoc *mdoc |
|
|
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_pre)(PRE_ARGS); |
|
|
|
|
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); |
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); |
static int check_stdarg(PRE_ARGS); |
static int check_stdarg(PRE_ARGS); |
static int check_text(struct mdoc *, int, int, const char *); |
static int check_text(struct mdoc *, int, int, char *); |
static int check_argv(struct mdoc *, |
static int check_argv(struct mdoc *, |
const struct mdoc_node *, |
struct mdoc_node *, struct mdoc_argv *); |
const struct mdoc_argv *); |
static int check_args(struct mdoc *, struct mdoc_node *); |
static int check_args(struct mdoc *, |
|
const struct mdoc_node *); |
|
static int err_child_lt(struct mdoc *, const char *, int); |
static int err_child_lt(struct mdoc *, const char *, int); |
static int warn_child_lt(struct mdoc *, const char *, int); |
static int warn_child_lt(struct mdoc *, const char *, int); |
static int err_child_gt(struct mdoc *, const char *, int); |
static int err_child_gt(struct mdoc *, const char *, int); |
Line 109 static int pre_ss(PRE_ARGS); |
|
Line 107 static int pre_ss(PRE_ARGS); |
|
|
|
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
Line 156 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 154 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_notext }, /* Pp */ |
{ NULL, posts_notext }, /* Pp */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pres_bd, posts_bd_bk }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
Line 247 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 245 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fc */ |
{ NULL, NULL }, /* Fc */ |
{ NULL, NULL }, /* Oo */ |
{ NULL, NULL }, /* Oo */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, posts_wline }, /* Bk */ |
{ NULL, posts_bd_bk }, /* Bk */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
Line 273 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 271 const struct valids mdoc_valids[MDOC_MAX] = { |
|
|
|
|
|
int |
int |
mdoc_valid_pre(struct mdoc *mdoc, const struct mdoc_node *n) |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
v_pre *p; |
v_pre *p; |
int line, pos; |
int line, pos; |
const char *tp; |
char *tp; |
|
|
if (MDOC_TEXT == n->type) { |
if (MDOC_TEXT == n->type) { |
tp = n->string; |
tp = n->string; |
Line 419 check_stdarg(PRE_ARGS) |
|
Line 417 check_stdarg(PRE_ARGS) |
|
|
|
|
|
static int |
static int |
check_args(struct mdoc *m, const struct mdoc_node *n) |
check_args(struct mdoc *m, struct mdoc_node *n) |
{ |
{ |
int i; |
int i; |
|
|
Line 436 check_args(struct mdoc *m, const struct mdoc_node *n) |
|
Line 434 check_args(struct mdoc *m, const struct mdoc_node *n) |
|
|
|
|
|
static int |
static int |
check_argv(struct mdoc *m, const struct mdoc_node *n, |
check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v) |
const struct mdoc_argv *v) |
|
{ |
{ |
int i; |
int i; |
|
|
Line 457 check_argv(struct mdoc *m, const struct mdoc_node *n, |
|
Line 454 check_argv(struct mdoc *m, const struct mdoc_node *n, |
|
|
|
|
|
static int |
static int |
check_text(struct mdoc *mdoc, int line, int pos, const char *p) |
check_text(struct mdoc *mdoc, int line, int pos, char *p) |
{ |
{ |
int c; |
int c; |
|
|
|
/* |
|
* FIXME: we absolutely cannot let \b get through or it will |
|
* destroy some assumptions in terms of format. |
|
*/ |
|
|
for ( ; *p; p++, pos++) { |
for ( ; *p; p++, pos++) { |
if ('\t' == *p) { |
if ('\t' == *p) { |
if ( ! (MDOC_LITERAL & mdoc->flags)) |
if ( ! (MDOC_LITERAL & mdoc->flags)) |
Line 535 pre_display(PRE_ARGS) |
|
Line 537 pre_display(PRE_ARGS) |
|
static int |
static int |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
int pos, type, width, offset; |
int i, comp, dup; |
|
const char *offs, *width; |
|
enum mdoc_list lt; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) { |
|
if (ENDBODY_NOT != n->end) { |
|
assert(n->pending); |
|
np = n->pending->parent; |
|
} else |
|
np = n->parent; |
|
|
|
assert(np); |
|
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bl == np->tok); |
|
assert(np->data.Bl); |
|
n->data.Bl = np->data.Bl; |
return(1); |
return(1); |
if (NULL == n->args) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
|
return(0); |
|
} |
} |
|
|
/* Make sure that only one type of list is specified. */ |
/* |
|
* First figure out which kind of list to use: bind ourselves to |
|
* the first mentioned list type and warn about any remaining |
|
* ones. If we find no list type, we default to LIST_item. |
|
*/ |
|
|
type = offset = width = -1; |
assert(NULL == n->data.Bl); |
|
n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (pos = 0; pos < (int)n->args->argc; pos++) |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
switch (n->args->argv[pos].arg) { |
lt = LIST__NONE; |
|
dup = comp = 0; |
|
width = offs = NULL; |
|
switch (n->args->argv[i].arg) { |
|
/* Set list types. */ |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
/* FALLTHROUGH */ |
lt = LIST_bullet; |
|
break; |
case (MDOC_Dash): |
case (MDOC_Dash): |
/* FALLTHROUGH */ |
lt = LIST_dash; |
|
break; |
case (MDOC_Enum): |
case (MDOC_Enum): |
/* FALLTHROUGH */ |
lt = LIST_enum; |
|
break; |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
lt = LIST_hyphen; |
|
break; |
case (MDOC_Item): |
case (MDOC_Item): |
/* FALLTHROUGH */ |
lt = LIST_item; |
|
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
/* FALLTHROUGH */ |
lt = LIST_tag; |
|
break; |
case (MDOC_Diag): |
case (MDOC_Diag): |
/* FALLTHROUGH */ |
lt = LIST_diag; |
|
break; |
case (MDOC_Hang): |
case (MDOC_Hang): |
/* FALLTHROUGH */ |
lt = LIST_hang; |
|
break; |
case (MDOC_Ohang): |
case (MDOC_Ohang): |
/* FALLTHROUGH */ |
lt = LIST_ohang; |
|
break; |
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
lt = LIST_inset; |
|
break; |
case (MDOC_Column): |
case (MDOC_Column): |
if (type < 0) { |
lt = LIST_column; |
type = n->args->argv[pos].arg; |
break; |
break; |
/* Set list arguments. */ |
} |
|
if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
|
break; |
|
return(0); |
|
case (MDOC_Compact): |
case (MDOC_Compact): |
if (type >= 0) |
dup = n->data.Bl->comp; |
break; |
comp = 1; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
break; |
break; |
|
return(0); |
|
case (MDOC_Width): |
case (MDOC_Width): |
if (width >= 0) |
dup = (NULL != n->data.Bl->width); |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
width = n->args->argv[i].value[0]; |
return(0); |
|
if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
|
return(0); |
|
width = n->args->argv[pos].arg; |
|
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
if (offset >= 0) |
/* NB: this can be empty! */ |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
if (n->args->argv[i].sz) { |
return(0); |
offs = n->args->argv[i].value[0]; |
if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
dup = (NULL != n->data.Bl->offs); |
|
break; |
|
} |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
offset = n->args->argv[pos].arg; |
|
break; |
break; |
default: |
|
break; |
|
} |
} |
|
|
if (type < 0) { |
/* Check: duplicate auxiliary arguments. */ |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
|
return(0); |
if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
|
return(0); |
|
|
|
if (comp && ! dup) |
|
n->data.Bl->comp = comp; |
|
if (offs && ! dup) |
|
n->data.Bl->offs = offs; |
|
if (width && ! dup) |
|
n->data.Bl->width = width; |
|
|
|
/* Check: multiple list types. */ |
|
|
|
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
|
return(0); |
|
|
|
/* Assign list type. */ |
|
|
|
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) |
|
n->data.Bl->type = lt; |
|
|
|
/* The list type should come first. */ |
|
|
|
if (n->data.Bl->type == LIST__NONE) |
|
if (n->data.Bl->width || |
|
n->data.Bl->offs || |
|
n->data.Bl->comp) |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
|
return(0); |
|
|
|
continue; |
} |
} |
|
|
|
/* Allow lists to default to LIST_item. */ |
|
|
|
if (LIST__NONE == n->data.Bl->type) { |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE)) |
|
return(0); |
|
n->data.Bl->type = LIST_item; |
|
} |
|
|
/* |
/* |
* Validate the width field. Some list types don't need width |
* Validate the width field. Some list types don't need width |
* types and should be warned about them. Others should have it |
* types and should be warned about them. Others should have it |
* and must also be warned. |
* and must also be warned. |
*/ |
*/ |
|
|
switch (type) { |
switch (n->data.Bl->type) { |
case (MDOC_Tag): |
case (LIST_tag): |
if (width < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
if (n->data.Bl->width) |
return(0); |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
case (MDOC_Column): |
break; |
|
return(0); |
|
case (LIST_column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Diag): |
case (LIST_diag): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ohang): |
case (LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (LIST_item): |
if (width >= 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
if (NULL == n->data.Bl->width) |
return(0); |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
|
break; |
|
return(0); |
default: |
default: |
break; |
break; |
} |
} |
Line 644 pre_bl(PRE_ARGS) |
|
Line 708 pre_bl(PRE_ARGS) |
|
static int |
static int |
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
int i, type, err; |
int i, dup, comp; |
|
enum mdoc_disp dt; |
|
const char *offs; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) { |
|
if (ENDBODY_NOT != n->end) { |
|
assert(n->pending); |
|
np = n->pending->parent; |
|
} else |
|
np = n->parent; |
|
|
|
assert(np); |
|
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bd == np->tok); |
|
assert(np->data.Bd); |
|
n->data.Bd = np->data.Bd; |
return(1); |
return(1); |
if (NULL == n->args) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
|
return(0); |
|
} |
} |
|
|
/* Make sure that only one type of display is specified. */ |
assert(NULL == n->data.Bd); |
|
n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0, err = type = 0; ! err && |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
i < (int)n->args->argc; i++) |
dt = DISP__NONE; |
|
dup = comp = 0; |
|
offs = NULL; |
|
|
switch (n->args->argv[i].arg) { |
switch (n->args->argv[i].arg) { |
case (MDOC_Centred): |
case (MDOC_Centred): |
/* FALLTHROUGH */ |
dt = DISP_centred; |
|
break; |
case (MDOC_Ragged): |
case (MDOC_Ragged): |
/* FALLTHROUGH */ |
dt = DISP_ragged; |
|
break; |
case (MDOC_Unfilled): |
case (MDOC_Unfilled): |
/* FALLTHROUGH */ |
dt = DISP_unfilled; |
|
break; |
case (MDOC_Filled): |
case (MDOC_Filled): |
/* FALLTHROUGH */ |
dt = DISP_filled; |
|
break; |
case (MDOC_Literal): |
case (MDOC_Literal): |
if (0 == type++) |
dt = DISP_literal; |
|
break; |
|
case (MDOC_File): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP); |
|
return(0); |
|
case (MDOC_Offset): |
|
/* NB: this can be empty! */ |
|
if (n->args->argv[i].sz) { |
|
offs = n->args->argv[i].value[0]; |
|
dup = (NULL != n->data.Bd->offs); |
break; |
break; |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
} |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
break; |
break; |
default: |
case (MDOC_Compact): |
|
comp = 1; |
|
dup = n->data.Bd->comp; |
break; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
if (type) |
/* Check whether we have duplicates. */ |
return(1); |
|
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP)) |
return(0); |
return(0); |
|
|
|
/* Make our auxiliary assignments. */ |
|
|
|
if (offs && ! dup) |
|
n->data.Bd->offs = offs; |
|
if (comp && ! dup) |
|
n->data.Bd->comp = comp; |
|
|
|
/* Check whether a type has already been assigned. */ |
|
|
|
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
|
return(0); |
|
|
|
/* Make our type assignment. */ |
|
|
|
if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) |
|
n->data.Bd->type = dt; |
|
} |
|
|
|
if (DISP__NONE == n->data.Bd->type) { |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
|
return(0); |
|
n->data.Bd->type = DISP_ragged; |
|
} |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 700 pre_sh(PRE_ARGS) |
|
Line 825 pre_sh(PRE_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
|
mdoc->regs->regs[(int)REG_nS].set = 0; |
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
} |
} |
|
|
Line 938 post_it(POST_ARGS) |
|
Line 1065 post_it(POST_ARGS) |
|
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
n = mdoc->last->parent->parent; |
lt = n->data.list; |
assert(n->data.Bl); |
|
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 1030 post_bl_head(POST_ARGS) |
|
Line 1158 post_bl_head(POST_ARGS) |
|
assert(mdoc->last->parent); |
assert(mdoc->last->parent); |
n = mdoc->last->parent; |
n = mdoc->last->parent; |
|
|
if (LIST_column == n->data.list) { |
if (LIST_column == n->data.Bl->type) { |
for (i = 0; i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) |
if (MDOC_Column == n->args->argv[i].arg) |
if (MDOC_Column == n->args->argv[i].arg) |
break; |
break; |