version 1.157, 2014/12/02 10:08:06 |
version 1.160, 2014/12/23 01:57:35 |
Line 123 static const struct termact termacts[MAN_MAX] = { |
|
Line 123 static const struct termact termacts[MAN_MAX] = { |
|
{ NULL, NULL, 0 }, /* RE */ |
{ NULL, NULL, 0 }, /* RE */ |
{ pre_RS, post_RS, 0 }, /* RS */ |
{ pre_RS, post_RS, 0 }, /* RS */ |
{ pre_ign, NULL, 0 }, /* DT */ |
{ pre_ign, NULL, 0 }, /* DT */ |
{ pre_ign, NULL, 0 }, /* UC */ |
{ pre_ign, NULL, MAN_NOTEXT }, /* UC */ |
{ pre_PD, NULL, MAN_NOTEXT }, /* PD */ |
{ pre_PD, NULL, MAN_NOTEXT }, /* PD */ |
{ pre_ign, NULL, 0 }, /* AT */ |
{ pre_ign, NULL, 0 }, /* AT */ |
{ pre_in, NULL, MAN_NOTEXT }, /* in */ |
{ pre_in, NULL, MAN_NOTEXT }, /* in */ |
Line 201 a2width(const struct termp *p, const char *cp) |
|
Line 201 a2width(const struct termp *p, const char *cp) |
|
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
if ( ! a2roffsu(cp, &su, SCALE_BU)) |
if ( ! a2roffsu(cp, &su, SCALE_EN)) |
return(-1); |
return(-1); |
|
|
return((int)term_hspan(p, &su)); |
return((int)term_hspan(p, &su)); |
Line 288 pre_literal(DECL_ARGS) |
|
Line 288 pre_literal(DECL_ARGS) |
|
static int |
static int |
pre_PD(DECL_ARGS) |
pre_PD(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
|
|
n = n->child; |
n = n->child; |
if (0 == n) { |
if (n == NULL) { |
mt->pardist = 1; |
mt->pardist = 1; |
return(0); |
return(0); |
} |
} |
assert(MAN_TEXT == n->type); |
assert(MAN_TEXT == n->type); |
mt->pardist = atoi(n->string); |
if (a2roffsu(n->string, &su, SCALE_VS)) |
|
mt->pardist = term_vspan(p, &su); |
return(0); |
return(0); |
} |
} |
|
|
Line 778 pre_SS(DECL_ARGS) |
|
Line 780 pre_SS(DECL_ARGS) |
|
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->offset = term_len(p, p->defindent); |
mt->offset = term_len(p, p->defindent); |
/* If following a prior empty `SS', no vspace. */ |
|
if (n->prev && MAN_SS == n->prev->tok) |
/* |
if (NULL == n->prev->body->child) |
* No vertical space before the first subsection |
break; |
* and after an empty subsection. |
if (NULL == n->prev) |
*/ |
|
|
|
do { |
|
n = n->prev; |
|
} while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT); |
|
if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL)) |
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
term_vspace(p); |
term_vspace(p); |
break; |
break; |
Line 827 pre_SH(DECL_ARGS) |
|
Line 835 pre_SH(DECL_ARGS) |
|
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->offset = term_len(p, p->defindent); |
mt->offset = term_len(p, p->defindent); |
/* If following a prior empty `SH', no vspace. */ |
|
if (n->prev && MAN_SH == n->prev->tok) |
/* |
if (NULL == n->prev->body->child) |
* No vertical space before the first section |
break; |
* and after an empty section. |
/* If the first macro, no vspae. */ |
*/ |
if (NULL == n->prev) |
|
|
do { |
|
n = n->prev; |
|
} while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT); |
|
if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) |
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
term_vspace(p); |
term_vspace(p); |
break; |
break; |