diff options
| -rw-r--r-- | mdoc.c | 3 | ||||
| -rw-r--r-- | mdoc_macro.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -375,6 +375,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) switch (p->type) { case (MDOC_BODY): + if (ENDBODY_NOT != p->end) + break; /* FALLTHROUGH */ case (MDOC_TAIL): /* FALLTHROUGH */ @@ -501,6 +503,7 @@ mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, p = node_alloc(m, line, pos, tok, MDOC_BODY); p->pending = body; + p->norm = body->norm; p->end = end; if ( ! node_append(m, p)) return(0); diff --git a/mdoc_macro.c b/mdoc_macro.c index 3e5d46af..29c6cff0 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -738,7 +738,7 @@ blk_exp_close(MACRO_PROT_ARGS) if (later && MDOC_EXPLICIT & mdoc_macros[later->tok].flags) continue; - if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) + if (MDOC_It != n->tok) later = n; } |