diff options
| -rw-r--r-- | mdoc_macro.c | 4 | ||||
| -rw-r--r-- | mdoc_term.c | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index acc9c68c..e62b76cb 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -437,9 +437,11 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * Default block rewinding rules. * In particular, always skip block end markers, * and let all blocks rewind Nm children. + * Do not warn again when closing a block, + * since closing the body already warned. */ if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || - (MDOC_BLOCK == p->type && + MDOC_BLOCK == type || (MDOC_BLOCK == p->type && ! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) return(REWIND_MORE); diff --git a/mdoc_term.c b/mdoc_term.c index 8f440733..af662bc3 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1374,14 +1374,17 @@ static int termp_sh_pre(DECL_ARGS) { - /* No vspace between consecutive `Sh' calls. */ - switch (n->type) { case MDOC_BLOCK: - if (n->prev && MDOC_Sh == n->prev->tok) - if (NULL == n->prev->body->child) - break; - term_vspace(p); + /* + * Vertical space before sections, except + * when the previous section was empty. + */ + if (n->prev == NULL || + MDOC_Sh != n->prev->tok || + (n->prev->body != NULL && + n->prev->body->child != NULL)) + term_vspace(p); break; case MDOC_HEAD: term_fontpush(p, TERMFONT_BOLD); |