diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-06-18 17:58:48 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-06-18 17:58:48 +0000 |
commit | 0c9872ac2f450f2fcfcbf234c266d9bd9d404143 (patch) | |
tree | 665865f5fb0fa5540ad8d544bef601eea60e5e45 /man_term.c | |
parent | 56635f91688db2f5e34654a48a7297984673b807 (diff) | |
download | mandoc-0c9872ac2f450f2fcfcbf234c266d9bd9d404143.tar.gz |
Fix two TODOs with one check-in. Both of these relate to vertical space
before paragraphs and/or within `RS' blocks.
Diffstat (limited to 'man_term.c')
-rw-r--r-- | man_term.c | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -198,27 +198,31 @@ a2width(const struct termp *p, const char *cp) return((int)term_hspan(p, &su)); } - +/* + * Printing leading vertical space before a block. + * This is used for the paragraph macros. + * The rules are pretty simple, since there's very little nesting going + * on here. Basically, if we're the first within another block (SS/SH), + * then don't emit vertical space. If we are (RS), then do. If not the + * first, print it. + */ static void print_bvspace(struct termp *p, const struct man_node *n) { - term_newln(p); - if (n->body && n->body->child && MAN_TBL == n->body->child->type) - return; + term_newln(p); - if (NULL == n->prev) - return; + if (n->body && n->body->child) + if (MAN_TBL == n->body->child->type) + return; - if (MAN_SS == n->prev->tok) - return; - if (MAN_SH == n->prev->tok) - return; + if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok) + if (NULL == n->prev) + return; term_vspace(p); } - /* ARGSUSED */ static int pre_ign(DECL_ARGS) |