version 1.288, 2014/10/30 20:10:02 |
version 1.291, 2014/11/19 22:00:37 |
Line 193 static const struct termact termacts[MDOC_MAX] = { |
|
Line 193 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Eo */ |
{ termp_quote_pre, termp_quote_post }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ NULL, NULL }, /* No */ |
{ termp_li_pre, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Ox */ |
{ termp_xx_pre, NULL }, /* Ox */ |
Line 572 print_bvspace(struct termp *p, |
|
Line 572 print_bvspace(struct termp *p, |
|
|
|
/* Do not vspace directly after Ss/Sh. */ |
/* Do not vspace directly after Ss/Sh. */ |
|
|
for (nn = n; nn; nn = nn->parent) { |
nn = n; |
if (MDOC_BLOCK != nn->type) |
while (nn->prev == NULL) { |
continue; |
do { |
if (MDOC_Ss == nn->tok) |
nn = nn->parent; |
|
if (nn->type == MDOC_ROOT) |
|
return; |
|
} while (nn->type != MDOC_BLOCK); |
|
if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss) |
return; |
return; |
if (MDOC_Sh == nn->tok) |
if (nn->tok == MDOC_It && |
return; |
nn->parent->parent->norm->Bl.type != LIST_item) |
if (NULL == nn->prev) |
break; |
continue; |
|
break; |
|
} |
} |
|
|
/* A `-column' does not assert vspace within the list. */ |
/* A `-column' does not assert vspace within the list. */ |
Line 1852 termp_quote_pre(DECL_ARGS) |
|
Line 1854 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, "<"); |
term_word(p, n->parent->prev != NULL && |
|
n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1923 termp_quote_post(DECL_ARGS) |
|
Line 1926 termp_quote_post(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, ">"); |
term_word(p, n->parent->prev != NULL && |
|
n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |