version 1.151, 2011/01/03 23:53:51 |
version 1.159, 2011/03/15 16:23:51 |
Line 78 static int concat(struct mdoc *, char *, |
|
Line 78 static int concat(struct mdoc *, char *, |
|
static int ebool(POST_ARGS); |
static int ebool(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int eerr_ge1(POST_ARGS); |
|
static int ewarn_eq0(POST_ARGS); |
static int ewarn_eq0(POST_ARGS); |
static int ewarn_eq1(POST_ARGS); |
static int ewarn_eq1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
Line 96 static int post_bl_block(POST_ARGS); |
|
Line 95 static int post_bl_block(POST_ARGS); |
|
static int post_bl_block_width(POST_ARGS); |
static int post_bl_block_width(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
|
static int post_bx(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_defaults(POST_ARGS); |
static int post_defaults(POST_ARGS); |
Line 104 static int post_eoln(POST_ARGS); |
|
Line 104 static int post_eoln(POST_ARGS); |
|
static int post_it(POST_ARGS); |
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_ns(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
Line 135 static v_post posts_bd[] = { post_literal, hwarn_eq0, |
|
Line 136 static v_post posts_bd[] = { post_literal, hwarn_eq0, |
|
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, 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_bx[] = { post_bx, NULL }; |
static v_post posts_bool[] = { ebool, NULL }; |
static v_post posts_bool[] = { ebool, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
static v_post posts_dd[] = { ewarn_ge1, post_dd, post_prol, NULL }; |
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
Line 147 static v_post posts_lb[] = { post_lb, NULL }; |
|
Line 149 static v_post posts_lb[] = { post_lb, NULL }; |
|
static v_post posts_nd[] = { berr_ge1, NULL }; |
static v_post posts_nd[] = { berr_ge1, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
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_ns[] = { post_ns, 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[] = { post_rs, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, bwarn_ge1, post_sh, NULL }; |
Line 154 static v_post posts_sp[] = { ewarn_le1, NULL }; |
|
Line 157 static v_post posts_sp[] = { ewarn_le1, NULL }; |
|
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, bwarn_ge1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, bwarn_ge1, NULL }; |
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_st[] = { 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[] = { ewarn_ge1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
|
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
Line 190 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 192 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ pres_bl, posts_bl }, /* Bl */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ pres_it, posts_it }, /* It */ |
{ pres_it, posts_it }, /* It */ |
{ NULL, posts_text }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ pres_an, posts_an }, /* An */ |
{ pres_an, posts_an }, /* An */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_text }, /* Cd */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ pres_er, posts_text }, /* Er */ |
{ pres_er, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_std }, /* Ex */ |
{ pres_std, posts_std }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ pres_fd, posts_text }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, posts_text }, /* Fn */ |
{ NULL, NULL }, /* Fn */ |
{ NULL, posts_wtext }, /* Ft */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, posts_text }, /* Ic */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, posts_text1 }, /* In */ |
{ NULL, posts_text1 }, /* In */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nd }, /* Nd */ |
Line 216 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 218 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_wtext }, /* Xr */ |
{ NULL, posts_text }, /* Xr */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %D */ /* FIXME: check date with mandoc_a2time(). */ |
{ NULL, posts_text }, /* %D */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %N */ |
{ NULL, posts_text }, /* %N */ |
Line 237 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 239 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, posts_bx }, /* Bx */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Do */ |
Line 247 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 249 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, posts_text }, /* Ms */ |
{ NULL, NULL }, /* Ms */ |
{ NULL, posts_notext }, /* No */ |
{ NULL, posts_notext }, /* No */ |
{ NULL, posts_notext }, /* Ns */ |
{ NULL, posts_ns }, /* Ns */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
Line 266 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 268 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, NULL }, /* Sx */ |
{ NULL, posts_text }, /* Sy */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, posts_text }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Ux */ |
{ NULL, NULL }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xo */ |
{ NULL, NULL }, /* Xo */ |
Line 284 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 286 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
Line 336 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 338 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TBL): |
case (MDOC_TBL): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_EQN): |
|
/* FALLTHROUGH */ |
case (MDOC_ROOT): |
case (MDOC_ROOT): |
return(1); |
return(1); |
default: |
default: |
Line 365 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 369 mdoc_valid_post(struct mdoc *mdoc) |
|
switch (mdoc->last->type) { |
switch (mdoc->last->type) { |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_EQN): |
|
/* FALLTHROUGH */ |
case (MDOC_TBL): |
case (MDOC_TBL): |
return(1); |
return(1); |
case (MDOC_ROOT): |
case (MDOC_ROOT): |
Line 434 bwarn_ge1(POST_ARGS) |
|
Line 440 bwarn_ge1(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
eerr_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_ERROR, CHECK_GT, 0)); |
|
} |
|
|
|
static int |
|
ewarn_eq0(POST_ARGS) |
ewarn_eq0(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
|
|
pre_dt(PRE_ARGS) |
pre_dt(PRE_ARGS) |
{ |
{ |
|
|
if (0 == mdoc->meta.date || mdoc->meta.os) |
if (NULL == mdoc->meta.date || mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
|
|
if (mdoc->meta.title) |
if (mdoc->meta.title) |
|
|
pre_os(PRE_ARGS) |
pre_os(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->meta.title || 0 == mdoc->meta.date) |
if (NULL == mdoc->meta.title || NULL == mdoc->meta.date) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
|
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
Line 1079 post_vt(POST_ARGS) |
|
Line 1079 post_vt(POST_ARGS) |
|
/* |
/* |
* The Vt macro comes in both ELEM and BLOCK form, both of which |
* The Vt macro comes in both ELEM and BLOCK form, both of which |
* have different syntaxes (yet more context-sensitive |
* have different syntaxes (yet more context-sensitive |
* behaviour). ELEM types must have a child; BLOCK types, |
* behaviour). ELEM types must have a child, which is already |
|
* guaranteed by the in_line parsing routine; BLOCK types, |
* specifically the BODY, should only have TEXT children. |
* specifically the BODY, should only have TEXT children. |
*/ |
*/ |
|
|
if (MDOC_ELEM == mdoc->last->type) |
|
return(eerr_ge1(mdoc)); |
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
|
|
Line 1228 post_an(POST_ARGS) |
|
Line 1227 post_an(POST_ARGS) |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE != np->norm->An.auth && np->child) { |
if (AUTH__NONE == np->norm->An.auth) { |
|
if (0 == np->child) |
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0); |
|
} else if (np->child) |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0); |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0); |
return(1); |
|
} |
|
|
|
/* |
|
* FIXME: make this ewarn and make sure that the front-ends |
|
* don't print the arguments. |
|
*/ |
|
if (AUTH__NONE != np->norm->An.auth || np->child) |
|
return(1); |
|
|
|
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1681 post_rs(POST_ARGS) |
|
Line 1673 post_rs(POST_ARGS) |
|
break; |
break; |
|
|
if (i < RSORD_MAX) { |
if (i < RSORD_MAX) { |
if (MDOC__J == rsord[i]) |
if (MDOC__J == rsord[i] || MDOC__B == rsord[i]) |
mdoc->last->norm->Rs.child_J = nn; |
mdoc->last->norm->Rs.quote_T++; |
next = nn->next; |
next = nn->next; |
continue; |
continue; |
} |
} |
Line 1758 post_rs(POST_ARGS) |
|
Line 1750 post_rs(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_ns(POST_ARGS) |
|
{ |
|
|
|
if (MDOC_LINE & mdoc->last->flags) |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); |
|
return(1); |
|
} |
|
|
|
static int |
post_sh(POST_ARGS) |
post_sh(POST_ARGS) |
{ |
{ |
|
|
Line 1970 post_dd(POST_ARGS) |
|
Line 1971 post_dd(POST_ARGS) |
|
char buf[DATESIZE]; |
char buf[DATESIZE]; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = mdoc->last; |
if (mdoc->meta.date) |
|
free(mdoc->meta.date); |
|
|
if (NULL == n->child) { |
n = mdoc->last; |
mdoc->meta.date = time(NULL); |
if (NULL == n->child || '\0' == n->child->string[0]) { |
|
mdoc->meta.date = mandoc_normdate(NULL, |
|
mdoc->msg, mdoc->data, n->line, n->pos); |
return(1); |
return(1); |
} |
} |
|
|
if ( ! concat(mdoc, buf, n->child, DATESIZE)) |
if ( ! concat(mdoc, buf, n->child, DATESIZE)) |
return(0); |
return(0); |
|
|
mdoc->meta.date = mandoc_a2time |
mdoc->meta.date = mandoc_normdate(buf, |
(MTIME_MDOCDATE | MTIME_CANONICAL, buf); |
mdoc->msg, mdoc->data, n->line, n->pos); |
|
|
if (0 == mdoc->meta.date) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE); |
|
mdoc->meta.date = time(NULL); |
|
} |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 2111 post_prol(POST_ARGS) |
|
Line 2110 post_prol(POST_ARGS) |
|
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os) |
if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os) |
mdoc->flags |= MDOC_PBODY; |
mdoc->flags |= MDOC_PBODY; |
|
|
|
return(1); |
|
} |
|
|
|
static int |
|
post_bx(POST_ARGS) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
/* |
|
* Make `Bx's second argument always start with an uppercase |
|
* letter. Groff checks if it's an "accepted" term, but we just |
|
* uppercase blindly. |
|
*/ |
|
|
|
n = mdoc->last->child; |
|
if (n && NULL != (n = n->next)) |
|
*n->string = (char)toupper |
|
((unsigned char)*n->string); |
|
|
return(1); |
return(1); |
} |
} |