version 1.193, 2010/10/10 09:59:48 |
version 1.200, 2010/12/19 12:11:42 |
Line 319 print_mdoc_node(DECL_ARGS) |
|
Line 319 print_mdoc_node(DECL_ARGS) |
|
/* |
/* |
* Keeps only work until the end of a line. If a keep was |
* Keeps only work until the end of a line. If a keep was |
* invoked in a prior line, revert it to PREKEEP. |
* invoked in a prior line, revert it to PREKEEP. |
|
* |
|
* Also let SYNPRETTY sections behave as if they were wrapped |
|
* in a `Bk' block. |
*/ |
*/ |
|
|
if (TERMP_KEEP & p->flags) { |
if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) { |
if (n->prev && n->prev->line != n->line) { |
if (n->prev && n->prev->line != n->line) { |
p->flags &= ~TERMP_KEEP; |
p->flags &= ~TERMP_KEEP; |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
Line 333 print_mdoc_node(DECL_ARGS) |
|
Line 336 print_mdoc_node(DECL_ARGS) |
|
} |
} |
} |
} |
|
|
|
/* |
|
* Since SYNPRETTY sections aren't "turned off" with `Ek', |
|
* we have to intuit whether we should disable formatting. |
|
*/ |
|
|
|
if ( ! (MDOC_SYNPRETTY & n->flags) && |
|
((n->prev && MDOC_SYNPRETTY & n->prev->flags) || |
|
(n->parent && MDOC_SYNPRETTY & n->parent->flags))) |
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
|
if (chld && n->child) |
if (chld && n->child) |
print_mdoc_nodelist(p, &npair, m, n->child); |
print_mdoc_nodelist(p, &npair, m, n->child); |
|
|
Line 1103 termp_an_post(DECL_ARGS) |
|
Line 1116 termp_an_post(DECL_ARGS) |
|
return; |
return; |
} |
} |
|
|
if (AUTH_split == n->data.An.auth) { |
if (AUTH_split == n->data.An->auth) { |
p->flags &= ~TERMP_NOSPLIT; |
p->flags &= ~TERMP_NOSPLIT; |
p->flags |= TERMP_SPLIT; |
p->flags |= TERMP_SPLIT; |
} else if (AUTH_nosplit == n->data.An.auth) { |
} else if (AUTH_nosplit == n->data.An->auth) { |
p->flags &= ~TERMP_SPLIT; |
p->flags &= ~TERMP_SPLIT; |
p->flags |= TERMP_NOSPLIT; |
p->flags |= TERMP_NOSPLIT; |
} |
} |
Line 1592 termp_bd_pre(DECL_ARGS) |
|
Line 1605 termp_bd_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bl): |
case (MDOC_Bl): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_D1): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dl): |
|
/* FALLTHROUGH */ |
case (MDOC_Lp): |
case (MDOC_Lp): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Pp): |
case (MDOC_Pp): |
Line 1657 termp_xx_pre(DECL_ARGS) |
|
Line 1674 termp_xx_pre(DECL_ARGS) |
|
pp = NULL; |
pp = NULL; |
switch (n->tok) { |
switch (n->tok) { |
case (MDOC_Bsx): |
case (MDOC_Bsx): |
pp = "BSDI BSD/OS"; |
pp = "BSD/OS"; |
break; |
break; |
case (MDOC_Dx): |
case (MDOC_Dx): |
pp = "DragonFly"; |
pp = "DragonFly"; |
Line 1798 termp_sp_pre(DECL_ARGS) |
|
Line 1815 termp_sp_pre(DECL_ARGS) |
|
len = 0; |
len = 0; |
break; |
break; |
default: |
default: |
assert(n->parent); |
|
if ((NULL == n->next || NULL == n->prev) && |
|
(MDOC_Ss == n->parent->tok || |
|
MDOC_Sh == n->parent->tok)) |
|
return(0); |
|
len = 1; |
len = 1; |
break; |
break; |
} |
} |
Line 2076 termp_lk_pre(DECL_ARGS) |
|
Line 2088 termp_lk_pre(DECL_ARGS) |
|
|
|
nn = sv = n->child; |
nn = sv = n->child; |
|
|
if (NULL == nn->next) |
if (NULL == nn || NULL == nn->next) |
return(1); |
return(1); |
|
|
for (nn = nn->next; nn; nn = nn->next) |
for (nn = nn->next; nn; nn = nn->next) |
Line 2105 termp_bk_pre(DECL_ARGS) |
|
Line 2117 termp_bk_pre(DECL_ARGS) |
|
case (MDOC_HEAD): |
case (MDOC_HEAD): |
return(0); |
return(0); |
case (MDOC_BODY): |
case (MDOC_BODY): |
p->flags |= TERMP_PREKEEP; |
if (n->parent->args || 0 == n->prev->nchild) |
|
p->flags |= TERMP_PREKEEP; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |