diff options
| -rw-r--r-- | man_validate.c | 4 | ||||
| -rw-r--r-- | mandoc.h | 12 | ||||
| -rw-r--r-- | mdoc_macro.c | 17 | ||||
| -rw-r--r-- | mdoc_validate.c | 6 | ||||
| -rw-r--r-- | read.c | 4 |
5 files changed, 18 insertions, 25 deletions
diff --git a/man_validate.c b/man_validate.c index def1e47d..72d8d023 100644 --- a/man_validate.c +++ b/man_validate.c @@ -479,7 +479,7 @@ post_nf(CHKARGS) { if (MAN_LITERAL & man->flags) - man_nmsg(man, n, MANDOCERR_SCOPEREP); + man_nmsg(man, n, MANDOCERR_NF_SKIP); man->flags |= MAN_LITERAL; return(1); @@ -490,7 +490,7 @@ post_fi(CHKARGS) { if ( ! (MAN_LITERAL & man->flags)) - man_nmsg(man, n, MANDOCERR_WNOSCOPE); + man_nmsg(man, n, MANDOCERR_FI_SKIP); man->flags &= ~MAN_LITERAL; return(1); @@ -74,12 +74,13 @@ enum mandocerr { MANDOCERR_MACRO_OBS, /* obsolete macro: macro */ MANDOCERR_PAR_SKIP, /* skipping paragraph macro: macro ... */ MANDOCERR_PAR_MOVE, /* moving paragraph macro out of list: macro */ - MANDOCERR_IGNNS, /* skipping no-space macro */ - MANDOCERR_SCOPENEST, /* blocks badly nested */ + MANDOCERR_NS_SKIP, /* skipping no-space macro */ + MANDOCERR_BLOCK_NEST, /* blocks badly nested: macro ... */ MANDOCERR_CHILD, /* child violates parent syntax */ - MANDOCERR_NESTEDDISP, /* nested displays are not portable */ - MANDOCERR_SCOPEREP, /* already in literal mode */ - MANDOCERR_LINESCOPE, /* line scope broken */ + MANDOCERR_BD_NEST, /* nested displays are not portable: macro ... */ + MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping .fi */ + MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping .nf */ + MANDOCERR_LINESCOPE, /* line scope broken: macro breaks macro */ /* related to missing macro arguments */ MANDOCERR_MACROEMPTY, /* skipping empty macro */ @@ -88,7 +89,6 @@ enum mandocerr { MANDOCERR_LISTFIRST, /* list type must come first */ MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */ MANDOCERR_FONTTYPE, /* missing font type */ - MANDOCERR_WNOSCOPE, /* skipping end of block that is not open */ /* related to bad macro arguments */ MANDOCERR_IGNARGV, /* skipping argument */ diff --git a/mdoc_macro.c b/mdoc_macro.c index 502d06ef..36aa8b82 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -528,7 +528,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok, taker->pending = broken->pending; } broken->pending = breaker; - mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, + mandoc_vmsg(MANDOCERR_BLOCK_NEST, mdoc->parse, line, ppos, "%s breaks %s", mdoc_macronames[tok], mdoc_macronames[broken->tok]); return(1); @@ -1354,18 +1354,9 @@ blk_part_imp(MACRO_PROT_ARGS) return(1); } } + assert(n == body); - /* - * If we can't rewind to our body, then our scope has already - * been closed by another macro (like `Oc' closing `Op'). This - * is ugly behaviour nodding its head to OpenBSD's overwhelming - * crufty use of `Op' breakage. - */ - if (n != body) - mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, - ppos, "%s broken", mdoc_macronames[tok]); - - if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) + if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) return(0); /* Standard appending of delimiters. */ @@ -1375,7 +1366,7 @@ blk_part_imp(MACRO_PROT_ARGS) /* Rewind scope, if applicable. */ - if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) + if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) return(0); /* Move trailing .Ns out of scope. */ diff --git a/mdoc_validate.c b/mdoc_validate.c index a0dad19c..cf00a0f4 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -591,7 +591,9 @@ pre_display(PRE_ARGS) break; if (node) - mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP); + mandoc_vmsg(MANDOCERR_BD_NEST, + mdoc->parse, n->line, n->pos, + "%s in Bd", mdoc_macronames[n->tok]); return(1); } @@ -1903,7 +1905,7 @@ post_ns(POST_ARGS) { if (MDOC_LINE & mdoc->last->flags) - mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); + mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); return(1); } @@ -122,7 +122,8 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "blocks badly nested", "child violates parent syntax", "nested displays are not portable", - "already in literal mode", + "fill mode already enabled, skipping .fi", + "fill mode already disabled, skipping .nf", "line scope broken", /* related to missing macro arguments */ @@ -132,7 +133,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "list type must come first", "tag lists require a width argument", "missing font type", - "skipping end of block that is not open", /* related to bad macro arguments */ "skipping argument", |