version 1.203, 2017/06/07 17:38:26 |
version 1.206, 2017/06/17 01:27:05 |
Line 141 terminal_man(void *arg, const struct roff_man *man) |
|
Line 141 terminal_man(void *arg, const struct roff_man *man) |
|
size_t save_defindent; |
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
|
save_defindent = p->defindent; |
|
if (p->synopsisonly == 0 && p->defindent == 0) |
|
p->defindent = 7; |
p->tcol->rmargin = p->maxrmargin = p->defrmargin; |
p->tcol->rmargin = p->maxrmargin = p->defrmargin; |
term_tab_set(p, NULL); |
term_tab_set(p, NULL); |
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
Line 167 terminal_man(void *arg, const struct roff_man *man) |
|
Line 170 terminal_man(void *arg, const struct roff_man *man) |
|
n = n->next; |
n = n->next; |
} |
} |
} else { |
} else { |
save_defindent = p->defindent; |
|
if (p->defindent == 0) |
|
p->defindent = 7; |
|
term_begin(p, print_man_head, print_man_foot, &man->meta); |
term_begin(p, print_man_head, print_man_foot, &man->meta); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (n != NULL) |
if (n != NULL) |
print_man_nodelist(p, &mt, n, &man->meta); |
print_man_nodelist(p, &mt, n, &man->meta); |
term_end(p); |
term_end(p); |
p->defindent = save_defindent; |
|
} |
} |
|
p->defindent = save_defindent; |
} |
} |
|
|
/* |
/* |
Line 260 pre_PD(DECL_ARGS) |
|
Line 260 pre_PD(DECL_ARGS) |
|
return 0; |
return 0; |
} |
} |
assert(n->type == ROFFT_TEXT); |
assert(n->type == ROFFT_TEXT); |
if (a2roffsu(n->string, &su, SCALE_VS)) |
if (a2roffsu(n->string, &su, SCALE_VS) != NULL) |
mt->pardist = term_vspan(p, &su); |
mt->pardist = term_vspan(p, &su); |
return 0; |
return 0; |
} |
} |
Line 374 pre_in(DECL_ARGS) |
|
Line 374 pre_in(DECL_ARGS) |
|
else |
else |
cp--; |
cp--; |
|
|
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
if (a2roffsu(++cp, &su, SCALE_EN) == NULL) |
return 0; |
return 0; |
|
|
v = (term_hspan(p, &su) + 11) / 24; |
v = term_hen(p, &su); |
|
|
if (less < 0) |
if (less < 0) |
p->tcol->offset -= p->tcol->offset > v ? v : p->tcol->offset; |
p->tcol->offset -= p->tcol->offset > v ? v : p->tcol->offset; |
Line 425 pre_HP(DECL_ARGS) |
|
Line 425 pre_HP(DECL_ARGS) |
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
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) != NULL) { |
len = term_hspan(p, &su) / 24; |
len = term_hen(p, &su); |
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 510 pre_IP(DECL_ARGS) |
|
Line 510 pre_IP(DECL_ARGS) |
|
/* Calculate the offset from the optional second argument. */ |
/* Calculate the offset from the optional second argument. */ |
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) != NULL) { |
len = term_hspan(p, &su) / 24; |
len = term_hen(p, &su); |
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 592 pre_TP(DECL_ARGS) |
|
Line 592 pre_TP(DECL_ARGS) |
|
|
|
if ((nn = n->parent->head->child) != NULL && |
if ((nn = n->parent->head->child) != NULL && |
nn->string != NULL && ! (NODE_LINE & nn->flags) && |
nn->string != NULL && ! (NODE_LINE & nn->flags) && |
a2roffsu(nn->string, &su, SCALE_EN)) { |
a2roffsu(nn->string, &su, SCALE_EN) != NULL) { |
len = term_hspan(p, &su) / 24; |
len = term_hen(p, &su); |
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 796 pre_RS(DECL_ARGS) |
|
Line 796 pre_RS(DECL_ARGS) |
|
n->aux = SHRT_MAX + 1; |
n->aux = SHRT_MAX + 1; |
if (n->child == NULL) |
if (n->child == NULL) |
n->aux = mt->lmargin[mt->lmargincur]; |
n->aux = mt->lmargin[mt->lmargincur]; |
else if (a2roffsu(n->child->string, &su, SCALE_EN)) |
else if (a2roffsu(n->child->string, &su, SCALE_EN) != NULL) |
n->aux = term_hspan(p, &su) / 24; |
n->aux = term_hen(p, &su); |
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) |