version 1.361, 2017/06/04 22:44:15 |
version 1.362, 2017/06/07 17:38:26 |
Line 259 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 259 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
size_t save_defindent; |
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
p->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"); |
term_tab_set(p, ".5i"); |
term_tab_set(p, ".5i"); |
Line 316 print_mdoc_node(DECL_ARGS) |
|
Line 316 print_mdoc_node(DECL_ARGS) |
|
return; |
return; |
|
|
chld = 1; |
chld = 1; |
offset = p->offset; |
offset = p->tcol->offset; |
rmargin = p->rmargin; |
rmargin = p->tcol->rmargin; |
n->flags &= ~NODE_ENDED; |
n->flags &= ~NODE_ENDED; |
n->prev_font = p->fonti; |
n->prev_font = p->fonti; |
|
|
Line 407 print_mdoc_node(DECL_ARGS) |
|
Line 407 print_mdoc_node(DECL_ARGS) |
|
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
|
|
if (n->type != ROFFT_TEXT) |
if (n->type != ROFFT_TEXT) |
p->offset = offset; |
p->tcol->offset = offset; |
p->rmargin = rmargin; |
p->tcol->rmargin = rmargin; |
} |
} |
|
|
static void |
static void |
Line 428 print_mdoc_foot(struct termp *p, const struct roff_met |
|
Line 428 print_mdoc_foot(struct termp *p, const struct roff_met |
|
|
|
term_vspace(p); |
term_vspace(p); |
|
|
p->offset = 0; |
p->tcol->offset = 0; |
sz = term_strlen(p, meta->date); |
sz = term_strlen(p, meta->date); |
p->rmargin = p->maxrmargin > sz ? |
p->tcol->rmargin = p->maxrmargin > sz ? |
(p->maxrmargin + term_len(p, 1) - sz) / 2 : 0; |
(p->maxrmargin + term_len(p, 1) - sz) / 2 : 0; |
p->trailspace = 1; |
p->trailspace = 1; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
Line 438 print_mdoc_foot(struct termp *p, const struct roff_met |
|
Line 438 print_mdoc_foot(struct termp *p, const struct roff_met |
|
term_word(p, meta->os); |
term_word(p, meta->os); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
sz = term_strlen(p, meta->os); |
sz = term_strlen(p, meta->os); |
p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0; |
p->tcol->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, meta->date); |
term_word(p, meta->date); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
p->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
p->trailspace = 0; |
p->trailspace = 0; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 455 print_mdoc_foot(struct termp *p, const struct roff_met |
|
Line 455 print_mdoc_foot(struct termp *p, const struct roff_met |
|
term_word(p, meta->os); |
term_word(p, meta->os); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = 0; |
p->tcol->offset = 0; |
p->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
p->flags = 0; |
p->flags = 0; |
} |
} |
|
|
Line 496 print_mdoc_head(struct termp *p, const struct roff_met |
|
Line 496 print_mdoc_head(struct termp *p, const struct roff_met |
|
|
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->trailspace = 1; |
p->trailspace = 1; |
p->offset = 0; |
p->tcol->offset = 0; |
p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
vollen < p->maxrmargin ? p->maxrmargin - vollen : 0; |
vollen < p->maxrmargin ? p->maxrmargin - vollen : 0; |
|
|
Line 505 print_mdoc_head(struct termp *p, const struct roff_met |
|
Line 505 print_mdoc_head(struct termp *p, const struct roff_met |
|
term_flushln(p); |
term_flushln(p); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
p->rmargin = p->offset + vollen + titlen < p->maxrmargin ? |
p->tcol->rmargin = p->tcol->offset + vollen + titlen < |
p->maxrmargin - titlen : p->maxrmargin; |
p->maxrmargin ? p->maxrmargin - titlen : p->maxrmargin; |
|
|
term_word(p, volume); |
term_word(p, volume); |
term_flushln(p); |
term_flushln(p); |
|
|
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->trailspace = 0; |
p->trailspace = 0; |
if (p->rmargin + titlen <= p->maxrmargin) { |
if (p->tcol->rmargin + titlen <= p->maxrmargin) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
p->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
p->offset = 0; |
p->tcol->offset = 0; |
p->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
free(title); |
free(title); |
free(volume); |
free(volume); |
} |
} |
Line 649 termp_it_pre(DECL_ARGS) |
|
Line 649 termp_it_pre(DECL_ARGS) |
|
|
|
if (bl->norm->Bl.offs != NULL) { |
if (bl->norm->Bl.offs != NULL) { |
offset = a2width(p, bl->norm->Bl.offs); |
offset = a2width(p, bl->norm->Bl.offs); |
if (offset < 0 && (size_t)(-offset) > p->offset) |
if (offset < 0 && (size_t)(-offset) > p->tcol->offset) |
offset = -p->offset; |
offset = -p->tcol->offset; |
else if (offset > SHRT_MAX) |
else if (offset > SHRT_MAX) |
offset = 0; |
offset = 0; |
} |
} |
Line 714 termp_it_pre(DECL_ARGS) |
|
Line 714 termp_it_pre(DECL_ARGS) |
|
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
if (width < 0 && (size_t)(-width) > p->offset) |
if (width < 0 && (size_t)(-width) > p->tcol->offset) |
width = -p->offset; |
width = -p->tcol->offset; |
else if (width > SHRT_MAX) |
else if (width > SHRT_MAX) |
width = 0; |
width = 0; |
break; |
break; |
Line 815 termp_it_pre(DECL_ARGS) |
|
Line 815 termp_it_pre(DECL_ARGS) |
|
* necessarily lengthened. Everybody gets the offset. |
* necessarily lengthened. Everybody gets the offset. |
*/ |
*/ |
|
|
p->offset += offset; |
p->tcol->offset += offset; |
|
|
switch (type) { |
switch (type) { |
case LIST_bullet: |
case LIST_bullet: |
Line 825 termp_it_pre(DECL_ARGS) |
|
Line 825 termp_it_pre(DECL_ARGS) |
|
case LIST_hang: |
case LIST_hang: |
case LIST_tag: |
case LIST_tag: |
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
p->rmargin = p->offset + width; |
p->tcol->rmargin = p->tcol->offset + width; |
else |
else |
p->offset += width; |
p->tcol->offset += width; |
break; |
break; |
case LIST_column: |
case LIST_column: |
assert(width); |
assert(width); |
p->rmargin = p->offset + width; |
p->tcol->rmargin = p->tcol->offset + width; |
/* |
/* |
* XXX - this behaviour is not documented: the |
* XXX - this behaviour is not documented: the |
* right-most column is filled to the right margin. |
* right-most column is filled to the right margin. |
*/ |
*/ |
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
break; |
break; |
if (NULL == n->next && p->rmargin < p->maxrmargin) |
if (n->next == NULL && p->tcol->rmargin < p->maxrmargin) |
p->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
break; |
break; |
default: |
default: |
break; |
break; |
Line 945 termp_nm_pre(DECL_ARGS) |
|
Line 945 termp_nm_pre(DECL_ARGS) |
|
} |
} |
|
|
if (n->type == ROFFT_BODY) { |
if (n->type == ROFFT_BODY) { |
if (NULL == n->child) |
if (n->child == NULL) |
return 0; |
return 0; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
cp = NULL; |
cp = NULL; |
Line 954 termp_nm_pre(DECL_ARGS) |
|
Line 954 termp_nm_pre(DECL_ARGS) |
|
if (cp == NULL) |
if (cp == NULL) |
cp = meta->name; |
cp = meta->name; |
if (cp == NULL) |
if (cp == NULL) |
p->offset += term_len(p, 6); |
p->tcol->offset += term_len(p, 6); |
else |
else |
p->offset += term_len(p, 1) + term_strlen(p, cp); |
p->tcol->offset += term_len(p, 1) + |
|
term_strlen(p, cp); |
return 1; |
return 1; |
} |
} |
|
|
Line 967 termp_nm_pre(DECL_ARGS) |
|
Line 968 termp_nm_pre(DECL_ARGS) |
|
synopsis_pre(p, n->parent); |
synopsis_pre(p, n->parent); |
|
|
if (n->type == ROFFT_HEAD && |
if (n->type == ROFFT_HEAD && |
NULL != n->next && NULL != n->next->child) { |
n->next != NULL && n->next->child != NULL) { |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->trailspace = 1; |
p->trailspace = 1; |
p->rmargin = p->offset + term_len(p, 1); |
p->tcol->rmargin = p->tcol->offset + term_len(p, 1); |
if (NULL == n->child) { |
if (n->child == NULL) |
p->rmargin += term_strlen(p, meta->name); |
p->tcol->rmargin += term_strlen(p, meta->name); |
} else if (n->child->type == ROFFT_TEXT) { |
else if (n->child->type == ROFFT_TEXT) { |
p->rmargin += term_strlen(p, n->child->string); |
p->tcol->rmargin += term_strlen(p, n->child->string); |
if (n->child->next) |
if (n->child->next != NULL) |
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
} else { |
} else { |
p->rmargin += term_len(p, 5); |
p->tcol->rmargin += term_len(p, 5); |
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
} |
} |
} |
} |
Line 1250 termp_sh_pre(DECL_ARGS) |
|
Line 1251 termp_sh_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = term_len(p, p->defindent); |
p->tcol->offset = term_len(p, p->defindent); |
term_tab_set(p, NULL); |
term_tab_set(p, NULL); |
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
term_tab_set(p, ".5i"); |
term_tab_set(p, ".5i"); |
Line 1281 termp_sh_post(DECL_ARGS) |
|
Line 1282 termp_sh_post(DECL_ARGS) |
|
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
term_newln(p); |
term_newln(p); |
p->offset = 0; |
p->tcol->offset = 0; |
break; |
break; |
default: |
default: |
break; |
break; |
Line 1303 termp_d1_pre(DECL_ARGS) |
|
Line 1304 termp_d1_pre(DECL_ARGS) |
|
if (n->type != ROFFT_BLOCK) |
if (n->type != ROFFT_BLOCK) |
return 1; |
return 1; |
term_newln(p); |
term_newln(p); |
p->offset += term_len(p, p->defindent + 1); |
p->tcol->offset += term_len(p, p->defindent + 1); |
term_tab_set(p, NULL); |
term_tab_set(p, NULL); |
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
term_tab_set(p, ".5i"); |
term_tab_set(p, ".5i"); |
Line 1334 termp_fn_pre(DECL_ARGS) |
|
Line 1335 termp_fn_pre(DECL_ARGS) |
|
return 0; |
return 0; |
|
|
if (pretty) { |
if (pretty) { |
rmargin = p->rmargin; |
rmargin = p->tcol->rmargin; |
p->rmargin = p->offset + term_len(p, 4); |
p->tcol->rmargin = p->tcol->offset + term_len(p, 4); |
p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; |
p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; |
} |
} |
|
|
Line 1351 termp_fn_pre(DECL_ARGS) |
|
Line 1352 termp_fn_pre(DECL_ARGS) |
|
term_flushln(p); |
term_flushln(p); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->flags |= TERMP_NOPAD; |
p->flags |= TERMP_NOPAD; |
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
p->rmargin = rmargin; |
p->tcol->rmargin = rmargin; |
} |
} |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1429 termp_bd_pre(DECL_ARGS) |
|
Line 1430 termp_bd_pre(DECL_ARGS) |
|
! strcmp(n->norm->Bd.offs, "left")) |
! strcmp(n->norm->Bd.offs, "left")) |
/* nothing */; |
/* nothing */; |
else if ( ! strcmp(n->norm->Bd.offs, "indent")) |
else if ( ! strcmp(n->norm->Bd.offs, "indent")) |
p->offset += term_len(p, p->defindent + 1); |
p->tcol->offset += term_len(p, p->defindent + 1); |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
p->offset += term_len(p, (p->defindent + 1) * 2); |
p->tcol->offset += term_len(p, (p->defindent + 1) * 2); |
else { |
else { |
offset = a2width(p, n->norm->Bd.offs); |
offset = a2width(p, n->norm->Bd.offs); |
if (offset < 0 && (size_t)(-offset) > p->offset) |
if (offset < 0 && (size_t)(-offset) > p->tcol->offset) |
p->offset = 0; |
p->tcol->offset = 0; |
else if (offset < SHRT_MAX) |
else if (offset < SHRT_MAX) |
p->offset += offset; |
p->tcol->offset += offset; |
} |
} |
|
|
/* |
/* |
Line 1448 termp_bd_pre(DECL_ARGS) |
|
Line 1449 termp_bd_pre(DECL_ARGS) |
|
* lines are allowed. |
* lines are allowed. |
*/ |
*/ |
|
|
if (DISP_literal != n->norm->Bd.type && |
if (n->norm->Bd.type != DISP_literal && |
DISP_unfilled != n->norm->Bd.type && |
n->norm->Bd.type != DISP_unfilled && |
DISP_centered != n->norm->Bd.type) |
n->norm->Bd.type != DISP_centered) |
return 1; |
return 1; |
|
|
if (n->norm->Bd.type == DISP_literal) { |
if (n->norm->Bd.type == DISP_literal) { |
Line 1459 termp_bd_pre(DECL_ARGS) |
|
Line 1460 termp_bd_pre(DECL_ARGS) |
|
term_tab_set(p, "8n"); |
term_tab_set(p, "8n"); |
} |
} |
|
|
lm = p->offset; |
lm = p->tcol->offset; |
p->flags |= TERMP_BRNEVER; |
p->flags |= TERMP_BRNEVER; |
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn != NULL; nn = nn->next) { |
if (DISP_centered == n->norm->Bd.type) { |
if (n->norm->Bd.type == DISP_centered) { |
if (nn->type == ROFFT_TEXT) { |
if (nn->type == ROFFT_TEXT) { |
len = term_strlen(p, nn->string); |
len = term_strlen(p, nn->string); |
p->offset = len >= p->rmargin ? 0 : |
p->tcol->offset = len >= p->tcol->rmargin ? |
lm + len >= p->rmargin ? p->rmargin - len : |
0 : lm + len >= p->tcol->rmargin ? |
(lm + p->rmargin - len) / 2; |
p->tcol->rmargin - len : |
|
(lm + p->tcol->rmargin - len) / 2; |
} else |
} else |
p->offset = lm; |
p->tcol->offset = lm; |
} |
} |
print_mdoc_node(p, pair, meta, nn); |
print_mdoc_node(p, pair, meta, nn); |
/* |
/* |
Line 1553 termp_ss_pre(DECL_ARGS) |
|
Line 1555 termp_ss_pre(DECL_ARGS) |
|
break; |
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
p->offset = term_len(p, (p->defindent+1)/2); |
p->tcol->offset = term_len(p, (p->defindent+1)/2); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = term_len(p, p->defindent); |
p->tcol->offset = term_len(p, p->defindent); |
term_tab_set(p, NULL); |
term_tab_set(p, NULL); |
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
term_tab_set(p, ".5i"); |
term_tab_set(p, ".5i"); |
Line 1803 termp_fo_pre(DECL_ARGS) |
|
Line 1805 termp_fo_pre(DECL_ARGS) |
|
return 1; |
return 1; |
} else if (n->type == ROFFT_BODY) { |
} else if (n->type == ROFFT_BODY) { |
if (pretty) { |
if (pretty) { |
rmargin = p->rmargin; |
rmargin = p->tcol->rmargin; |
p->rmargin = p->offset + term_len(p, 4); |
p->tcol->rmargin = p->tcol->offset + term_len(p, 4); |
p->flags |= TERMP_NOBREAK | TERMP_BRIND | |
p->flags |= TERMP_NOBREAK | TERMP_BRIND | |
TERMP_HANG; |
TERMP_HANG; |
} |
} |
Line 1816 termp_fo_pre(DECL_ARGS) |
|
Line 1818 termp_fo_pre(DECL_ARGS) |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | |
TERMP_HANG); |
TERMP_HANG); |
p->flags |= TERMP_NOPAD; |
p->flags |= TERMP_NOPAD; |
p->offset = p->rmargin; |
p->tcol->offset = p->tcol->rmargin; |
p->rmargin = rmargin; |
p->tcol->rmargin = rmargin; |
} |
} |
return 1; |
return 1; |
} |
} |
Line 1965 termp_lk_pre(DECL_ARGS) |
|
Line 1967 termp_lk_pre(DECL_ARGS) |
|
display = term_strlen(p, link->string) >= 26; |
display = term_strlen(p, link->string) >= 26; |
if (display) { |
if (display) { |
term_newln(p); |
term_newln(p); |
p->offset += term_len(p, p->defindent + 1); |
p->tcol->offset += term_len(p, p->defindent + 1); |
} |
} |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, link->string); |
term_word(p, link->string); |