diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-16 00:25:35 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-16 00:25:35 +0000 |
| commit | e2932ed1ff621d2bbe9623a25fa5d93b2a42241d (patch) | |
| tree | bb49c985431742f1a82d3bb5d1d706499107ad9d | |
| parent | 2839585ee67cd98d7251f8bd59de30af7729296a (diff) | |
| download | mandoc-e2932ed1ff621d2bbe9623a25fa5d93b2a42241d.tar.gz | |
First, make `Pp' (next to `Sm') be allowed as the first element of a
`Bl' (before any `It' have been invoked). Next, have the existence of
either macro raise a warning, as it's technically not legal according to
mdoc.7.
Second, delete any `Pp' as the first element of a `Bl' (i.e., before an
`It') ONLY when -compact has not been specified. This matches with the
latest version of groff. This deletion happens prior to the above
check, so double-warnings will not be issued.
| -rw-r--r-- | mdoc_validate.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c index e2ada6d5..40d66564 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -170,7 +170,7 @@ static v_pre pres_dd[] = { pre_dd, NULL }; static v_pre pres_dt[] = { pre_dt, NULL }; static v_pre pres_er[] = { 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_pp[] = { pre_par, NULL }; static v_pre pres_sh[] = { pre_sh, NULL }; @@ -1564,21 +1564,20 @@ post_bl(POST_ARGS) return(post_bl_block(mdoc)); if (MDOC_BODY != mdoc->last->type) 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) { - if (MDOC_BLOCK == n->type && MDOC_It == n->tok) + switch (n->tok) { + case (MDOC_It): continue; - if (MDOC_Sm == n->tok) + case (MDOC_Sm): + /* FALLTHROUGH */ + case (MDOC_Pp): + mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); continue; + default: + break; + } + mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); return(0); } @@ -1908,6 +1907,8 @@ pre_par(PRE_ARGS) if (NULL == mdoc->last) 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 @@ -1916,11 +1917,12 @@ pre_par(PRE_ARGS) if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) return(1); - if (MDOC_Bl == n->tok && n->data.Bl->comp) return(1); if (MDOC_Bd == n->tok && n->data.Bd->comp) return(1); + if (MDOC_It == n->tok && n->parent->data.Bl->comp) + return(1); mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); mdoc_node_delete(mdoc, mdoc->last); |