From 31f620c338e4694ae72d96330057b88f2e65f394 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 30 Mar 2014 23:34:32 +0000 Subject: Improve formatting of broken blocks in -Tman, somewhat similar to what mdoc_term.c already does for -Tascii. OpenBSD rev. 1.58. --- mdoc_man.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mdoc_man.c b/mdoc_man.c index 44039ab4..e5b65d38 100644 --- a/mdoc_man.c +++ b/mdoc_man.c @@ -601,7 +601,7 @@ print_node(DECL_ARGS) */ act = manacts + n->tok; cond = NULL == act->cond || (*act->cond)(meta, n); - if (cond && act->pre) + if (cond && act->pre && ENDBODY_NOT == n->end) do_sub = (*act->pre)(meta, n); } @@ -617,8 +617,17 @@ print_node(DECL_ARGS) /* * Lastly, conditionally run the post-node handler. */ + if (MDOC_ENDED & n->flags) + return; + if (cond && act->post) (*act->post)(meta, n); + + if (ENDBODY_NOT != n->end) + n->pending->flags |= MDOC_ENDED; + + if (ENDBODY_NOSPACE == n->end) + outflags &= ~(MMAN_spc | MMAN_nl); } static int @@ -656,7 +665,7 @@ post_enc(DECL_ARGS) suffix = manacts[n->tok].suffix; if (NULL == suffix) return; - outflags &= ~MMAN_spc; + outflags &= ~(MMAN_spc | MMAN_nl); print_word(suffix); } -- cgit