version 1.140, 2010/12/15 23:39:40 |
version 1.142, 2010/12/16 00:53:04 |
Line 144 static v_post posts_dd[] = { ewarn_ge1, post_dd, post |
|
Line 144 static v_post posts_dd[] = { ewarn_ge1, post_dd, post |
|
static v_post posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, 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 }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_ignpar, post_it, NULL }; |
static v_post posts_lb[] = { eerr_eq1, post_lb, NULL }; |
static v_post posts_lb[] = { eerr_eq1, 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 }; |
Line 170 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 1564 post_bl(POST_ARGS) |
|
Line 1564 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_It): |
continue; |
continue; |
if (MDOC_Sm == n->tok) |
case (MDOC_Sm): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pp): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
continue; |
continue; |
|
default: |
|
break; |
|
} |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
return(0); |
return(0); |
} |
} |
Line 1887 post_ignpar(POST_ARGS) |
|
Line 1886 post_ignpar(POST_ARGS) |
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
|
|
if (NULL != (np = mdoc->last->child)) |
/* |
|
* Lists are allowed to have paragraphs as the first macro (I |
|
* have no idea why: it really uglifies things). |
|
*/ |
|
|
|
np = mdoc->last->child; |
|
if (NULL != np && MDOC_It != mdoc->last->tok) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
mdoc_node_delete(mdoc, np); |
mdoc_node_delete(mdoc, np); |
} |
} |
|
|
|
/* |
|
* Compact lists are allowed to have trailing paragraph macros; |
|
* however, nobody else is (including non-compact lists). |
|
*/ |
|
|
|
np = mdoc->last; |
|
if (MDOC_It == np->tok && ! np->parent->parent->data.Bl->comp) |
|
return(1); |
|
|
if (NULL != (np = mdoc->last->last)) |
if (NULL != (np = mdoc->last->last)) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
Line 1908 pre_par(PRE_ARGS) |
|
Line 1922 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 1916 pre_par(PRE_ARGS) |
|
Line 1932 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->data.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->data.Bd->comp) |
|
return(1); |
|
if (MDOC_It == n->tok && n->parent->data.Bl->comp) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |