=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.148 retrieving revision 1.151 diff -u -p -r1.148 -r1.151 --- mandoc/mdoc_term.c 2010/06/12 11:21:44 1.148 +++ mandoc/mdoc_term.c 2010/06/12 12:21:41 1.151 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.148 2010/06/12 11:21:44 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.151 2010/06/12 12:21:41 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -571,8 +571,11 @@ print_bvspace(struct termp *p, const struct mdoc_node *nn; term_newln(p); - if (arg_hasattr(MDOC_Compact, bl)) + + if (MDOC_Bd == bl->tok && bl->data.Bd.comp) return; + if (MDOC_Bl == bl->tok && bl->data.Bl.comp) + return; /* Do not vspace directly after Ss/Sh. */ @@ -590,13 +593,13 @@ print_bvspace(struct termp *p, /* A `-column' does not assert vspace within the list. */ - if (MDOC_Bl == bl->tok && LIST_column == bl->data.list) + if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type) if (n->prev && MDOC_It == n->prev->tok) return; /* A `-diag' without body does not vspace. */ - if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list) + if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type) if (n->prev && MDOC_It == n->prev->tok) { assert(n->prev->body); if (NULL == n->prev->body->child) @@ -661,7 +664,7 @@ termp_it_pre(DECL_ARGS) arg_getattrs(keys, vals, 3, bl); - type = bl->data.list; + type = bl->data.Bl.type; /* * First calculate width and offset. This is pretty easy unless @@ -989,7 +992,7 @@ termp_it_post(DECL_ARGS) if (MDOC_BLOCK == n->type) return; - type = n->parent->parent->parent->data.list; + type = n->parent->parent->parent->data.Bl.type; switch (type) { case (LIST_item):