version 1.174, 2015/04/04 11:44:43 |
version 1.176, 2015/04/04 18:52:51 |
Line 427 pre_in(DECL_ARGS) |
|
Line 427 pre_in(DECL_ARGS) |
|
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
return(0); |
return(0); |
|
|
v = term_hspan(p, &su); |
v = (term_hspan(p, &su) + 11) / 24; |
|
|
if (less < 0) |
if (less < 0) |
p->offset -= p->offset > v ? v : p->offset; |
p->offset -= p->offset > v ? v : p->offset; |
Line 512 pre_HP(DECL_ARGS) |
|
Line 512 pre_HP(DECL_ARGS) |
|
|
|
if ((nn = n->parent->head->child) != NULL && |
if ((nn = n->parent->head->child) != NULL && |
a2roffsu(nn->string, &su, SCALE_EN)) { |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = term_hspan(p, &su); |
len = term_hspan(p, &su) / 24; |
if (len < 0 && (size_t)(-len) > mt->offset) |
if (len < 0 && (size_t)(-len) > mt->offset) |
len = -mt->offset; |
len = -mt->offset; |
else if (len > SHRT_MAX) |
else if (len > SHRT_MAX) |
Line 597 pre_IP(DECL_ARGS) |
|
Line 597 pre_IP(DECL_ARGS) |
|
if ((nn = n->parent->head->child) != NULL && |
if ((nn = n->parent->head->child) != NULL && |
(nn = nn->next) != NULL && |
(nn = nn->next) != NULL && |
a2roffsu(nn->string, &su, SCALE_EN)) { |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = term_hspan(p, &su); |
len = term_hspan(p, &su) / 24; |
if (len < 0 && (size_t)(-len) > mt->offset) |
if (len < 0 && (size_t)(-len) > mt->offset) |
len = -mt->offset; |
len = -mt->offset; |
else if (len > SHRT_MAX) |
else if (len > SHRT_MAX) |
Line 679 pre_TP(DECL_ARGS) |
|
Line 679 pre_TP(DECL_ARGS) |
|
if ((nn = n->parent->head->child) != NULL && |
if ((nn = n->parent->head->child) != NULL && |
nn->string != NULL && ! (MAN_LINE & nn->flags) && |
nn->string != NULL && ! (MAN_LINE & nn->flags) && |
a2roffsu(nn->string, &su, SCALE_EN)) { |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = term_hspan(p, &su); |
len = term_hspan(p, &su) / 24; |
if (len < 0 && (size_t)(-len) > mt->offset) |
if (len < 0 && (size_t)(-len) > mt->offset) |
len = -mt->offset; |
len = -mt->offset; |
else if (len > SHRT_MAX) |
else if (len > SHRT_MAX) |
Line 768 pre_SS(DECL_ARGS) |
|
Line 768 pre_SS(DECL_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
p->offset = term_len(p, 3); |
p->offset = term_len(p, 3); |
|
p->rmargin = mt->offset; |
|
p->trailspace = mt->offset; |
|
p->flags |= TERMP_NOBREAK | TERMP_BRIND; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = mt->offset; |
p->offset = mt->offset; |
|
p->rmargin = p->maxrmargin; |
|
p->trailspace = 0; |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 823 pre_SH(DECL_ARGS) |
|
Line 829 pre_SH(DECL_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
p->offset = 0; |
p->offset = 0; |
|
p->rmargin = mt->offset; |
|
p->trailspace = mt->offset; |
|
p->flags |= TERMP_NOBREAK | TERMP_BRIND; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = mt->offset; |
p->offset = mt->offset; |
|
p->rmargin = p->maxrmargin; |
|
p->trailspace = 0; |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 868 pre_RS(DECL_ARGS) |
|
Line 880 pre_RS(DECL_ARGS) |
|
n = n->parent->head; |
n = n->parent->head; |
n->aux = SHRT_MAX + 1; |
n->aux = SHRT_MAX + 1; |
if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EN)) |
if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EN)) |
n->aux = term_hspan(p, &su); |
n->aux = term_hspan(p, &su) / 24; |
if (n->aux < 0 && (size_t)(-n->aux) > mt->offset) |
if (n->aux < 0 && (size_t)(-n->aux) > mt->offset) |
n->aux = -mt->offset; |
n->aux = -mt->offset; |
else if (n->aux > SHRT_MAX) |
else if (n->aux > SHRT_MAX) |