version 1.149, 2010/06/12 11:58:22 |
version 1.150, 2010/06/12 12:10:55 |
Line 61 static int arg_getattrs(const int *, int *, size_t, |
|
Line 61 static int arg_getattrs(const int *, int *, size_t, |
|
const struct mdoc_node *); |
const struct mdoc_node *); |
static int arg_getattr(int, const struct mdoc_node *); |
static int arg_getattr(int, const struct mdoc_node *); |
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct mdoc_node *, |
|
const struct mdoc_node *); |
const struct mdoc_node *); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_nodelist(DECL_ARGS); |
static void print_mdoc_nodelist(DECL_ARGS); |
Line 564 arg_getattrs(const int *keys, int *vals, |
|
Line 563 arg_getattrs(const int *keys, int *vals, |
|
* too. |
* too. |
*/ |
*/ |
static void |
static void |
print_bvspace(struct termp *p, |
print_bvspace(struct termp *p, const struct mdoc_node *n) |
const struct mdoc_node *bl, |
|
const struct mdoc_node *n) |
|
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
/* FIXME: MDOC_Bd == bl->tok && bl->data.Bd.comp */ |
|
term_newln(p); |
term_newln(p); |
if (arg_hasattr(MDOC_Compact, bl)) |
|
|
if (MDOC_Bl == n->tok && n->data.Bl.comp) |
return; |
return; |
|
if (MDOC_Bd == n->tok && n->data.Bd.comp) |
|
return; |
|
|
/* Do not vspace directly after Ss/Sh. */ |
/* Do not vspace directly after Ss/Sh. */ |
|
|
Line 591 print_bvspace(struct termp *p, |
|
Line 590 print_bvspace(struct termp *p, |
|
|
|
/* A `-column' does not assert vspace within the list. */ |
/* A `-column' does not assert vspace within the list. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type) |
if (MDOC_Bl == n->tok && LIST_column == n->data.Bl.type) |
if (n->prev && MDOC_It == n->prev->tok) |
if (n->prev && MDOC_It == n->prev->tok) |
return; |
return; |
|
|
/* A `-diag' without body does not vspace. */ |
/* A `-diag' without body does not vspace. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type) |
if (MDOC_Bl == n->tok && LIST_diag == n->data.Bl.type) |
if (n->prev && MDOC_It == n->prev->tok) { |
if (n->prev && MDOC_It == n->prev->tok) { |
assert(n->prev->body); |
assert(n->prev->body); |
if (NULL == n->prev->body->child) |
if (NULL == n->prev->body->child) |
Line 646 termp_it_pre(DECL_ARGS) |
|
Line 645 termp_it_pre(DECL_ARGS) |
|
enum mdoc_list type; |
enum mdoc_list type; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n->parent->parent, n); |
print_bvspace(p, n); |
return(1); |
return(1); |
} |
} |
|
|
Line 1607 termp_bd_pre(DECL_ARGS) |
|
Line 1606 termp_bd_pre(DECL_ARGS) |
|
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n, n); |
print_bvspace(p, n); |
return(1); |
return(1); |
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |