version 1.183, 2015/04/19 19:44:21 |
version 1.193, 2017/05/04 17:48:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 95 static void post_SS(DECL_ARGS); |
|
Line 95 static void post_SS(DECL_ARGS); |
|
static void post_TP(DECL_ARGS); |
static void post_TP(DECL_ARGS); |
static void post_UR(DECL_ARGS); |
static void post_UR(DECL_ARGS); |
|
|
static const struct termact termacts[MAN_MAX] = { |
static const struct termact __termacts[MAN_MAX - MAN_TH] = { |
{ pre_sp, NULL, MAN_NOTEXT }, /* br */ |
|
{ NULL, NULL, 0 }, /* TH */ |
{ NULL, NULL, 0 }, /* TH */ |
{ pre_SH, post_SH, 0 }, /* SH */ |
{ pre_SH, post_SH, 0 }, /* SH */ |
{ pre_SS, post_SS, 0 }, /* SS */ |
{ pre_SS, post_SS, 0 }, /* SS */ |
Line 135 static const struct termact termacts[MAN_MAX] = { |
|
Line 134 static const struct termact termacts[MAN_MAX] = { |
|
{ NULL, NULL, 0 }, /* UE */ |
{ NULL, NULL, 0 }, /* UE */ |
{ pre_ll, NULL, MAN_NOTEXT }, /* ll */ |
{ pre_ll, NULL, MAN_NOTEXT }, /* ll */ |
}; |
}; |
|
static const struct termact *termacts = __termacts - MAN_TH; |
|
|
|
|
void |
void |
Line 143 terminal_man(void *arg, const struct roff_man *man) |
|
Line 143 terminal_man(void *arg, const struct roff_man *man) |
|
struct termp *p; |
struct termp *p; |
struct roff_node *n; |
struct roff_node *n; |
struct mtermp mt; |
struct mtermp mt; |
|
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
p->overstep = 0; |
p->overstep = 0; |
Line 170 terminal_man(void *arg, const struct roff_man *man) |
|
Line 171 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) |
if (p->defindent == 0) |
p->defindent = 7; |
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); |
Line 177 terminal_man(void *arg, const struct roff_man *man) |
|
Line 179 terminal_man(void *arg, const struct roff_man *man) |
|
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; |
} |
} |
} |
} |
|
|
|
|
pre_ign(DECL_ARGS) |
pre_ign(DECL_ARGS) |
{ |
{ |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
pre_ll(DECL_ARGS) |
pre_ll(DECL_ARGS) |
{ |
{ |
|
|
term_setwidth(p, n->nchild ? n->child->string : NULL); |
term_setwidth(p, n->child != NULL ? n->child->string : NULL); |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 228 pre_I(DECL_ARGS) |
|
Line 231 pre_I(DECL_ARGS) |
|
{ |
{ |
|
|
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 255 pre_literal(DECL_ARGS) |
|
Line 258 pre_literal(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 266 pre_PD(DECL_ARGS) |
|
Line 269 pre_PD(DECL_ARGS) |
|
n = n->child; |
n = n->child; |
if (n == NULL) { |
if (n == NULL) { |
mt->pardist = 1; |
mt->pardist = 1; |
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)) |
mt->pardist = term_vspan(p, &su); |
mt->pardist = term_vspan(p, &su); |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 319 pre_alternate(DECL_ARGS) |
|
Line 322 pre_alternate(DECL_ARGS) |
|
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
assert(nn->type == ROFFT_TEXT); |
assert(nn->type == ROFFT_TEXT); |
term_word(p, nn->string); |
term_word(p, nn->string); |
if (nn->flags & MAN_EOS) |
if (nn->flags & NODE_EOS) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
if (nn->next) |
if (nn->next) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 333 pre_B(DECL_ARGS) |
|
Line 336 pre_B(DECL_ARGS) |
|
{ |
{ |
|
|
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 355 pre_OP(DECL_ARGS) |
|
Line 358 pre_OP(DECL_ARGS) |
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "]"); |
term_word(p, "]"); |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 365 pre_ft(DECL_ARGS) |
|
Line 368 pre_ft(DECL_ARGS) |
|
|
|
if (NULL == n->child) { |
if (NULL == n->child) { |
term_fontlast(p); |
term_fontlast(p); |
return(0); |
return 0; |
} |
} |
|
|
cp = n->child->string; |
cp = n->child->string; |
switch (*cp) { |
switch (*cp) { |
case '4': |
case '4': |
/* FALLTHROUGH */ |
|
case '3': |
case '3': |
/* FALLTHROUGH */ |
|
case 'B': |
case 'B': |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
break; |
break; |
case '2': |
case '2': |
/* FALLTHROUGH */ |
|
case 'I': |
case 'I': |
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
break; |
break; |
Line 386 pre_ft(DECL_ARGS) |
|
Line 386 pre_ft(DECL_ARGS) |
|
term_fontlast(p); |
term_fontlast(p); |
break; |
break; |
case '1': |
case '1': |
/* FALLTHROUGH */ |
|
case 'C': |
case 'C': |
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 410 pre_in(DECL_ARGS) |
|
Line 408 pre_in(DECL_ARGS) |
|
|
|
if (NULL == n->child) { |
if (NULL == n->child) { |
p->offset = mt->offset; |
p->offset = mt->offset; |
return(0); |
return 0; |
} |
} |
|
|
cp = n->child->string; |
cp = n->child->string; |
Line 424 pre_in(DECL_ARGS) |
|
Line 422 pre_in(DECL_ARGS) |
|
cp--; |
cp--; |
|
|
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
return(0); |
return 0; |
|
|
v = (term_hspan(p, &su) + 11) / 24; |
v = (term_hspan(p, &su) + 11) / 24; |
|
|
Line 437 pre_in(DECL_ARGS) |
|
Line 435 pre_in(DECL_ARGS) |
|
if (p->offset > SHRT_MAX) |
if (p->offset > SHRT_MAX) |
p->offset = term_len(p, p->defindent); |
p->offset = term_len(p, p->defindent); |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 449 pre_sp(DECL_ARGS) |
|
Line 447 pre_sp(DECL_ARGS) |
|
if ((NULL == n->prev && n->parent)) { |
if ((NULL == n->prev && n->parent)) { |
switch (n->parent->tok) { |
switch (n->parent->tok) { |
case MAN_SH: |
case MAN_SH: |
/* FALLTHROUGH */ |
|
case MAN_SS: |
case MAN_SS: |
/* FALLTHROUGH */ |
|
case MAN_PP: |
case MAN_PP: |
/* FALLTHROUGH */ |
|
case MAN_LP: |
case MAN_LP: |
/* FALLTHROUGH */ |
|
case MAN_P: |
case MAN_P: |
/* FALLTHROUGH */ |
return 0; |
return(0); |
|
default: |
default: |
break; |
break; |
} |
} |
} |
} |
|
|
if (n->tok == MAN_br) |
if (n->tok == ROFF_br) |
len = 0; |
len = 0; |
else if (n->child == NULL) |
else if (n->child == NULL) |
len = 1; |
len = 1; |
Line 493 pre_sp(DECL_ARGS) |
|
Line 486 pre_sp(DECL_ARGS) |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
} |
} |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 506 pre_HP(DECL_ARGS) |
|
Line 499 pre_HP(DECL_ARGS) |
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
return(1); |
return 1; |
case ROFFT_BODY: |
case ROFFT_BODY: |
break; |
break; |
default: |
default: |
return(0); |
return 0; |
} |
} |
|
|
if ( ! (MANT_LITERAL & mt->fl)) { |
if ( ! (MANT_LITERAL & mt->fl)) { |
Line 533 pre_HP(DECL_ARGS) |
|
Line 526 pre_HP(DECL_ARGS) |
|
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = mt->offset + len; |
p->rmargin = mt->offset + len; |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 578 pre_PP(DECL_ARGS) |
|
Line 571 pre_PP(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(n->type != ROFFT_HEAD); |
return n->type != ROFFT_HEAD; |
} |
} |
|
|
static int |
static int |
Line 600 pre_IP(DECL_ARGS) |
|
Line 593 pre_IP(DECL_ARGS) |
|
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
return(1); |
return 1; |
} |
} |
|
|
/* Calculate the offset from the optional second argument. */ |
/* Calculate the offset from the optional second argument. */ |
Line 630 pre_IP(DECL_ARGS) |
|
Line 623 pre_IP(DECL_ARGS) |
|
if (savelit) |
if (savelit) |
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
|
|
return(0); |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
Line 639 pre_IP(DECL_ARGS) |
|
Line 632 pre_IP(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 671 pre_TP(DECL_ARGS) |
|
Line 664 pre_TP(DECL_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK | TERMP_BRTRSP; |
p->trailspace = 1; |
p->trailspace = 1; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 681 pre_TP(DECL_ARGS) |
|
Line 674 pre_TP(DECL_ARGS) |
|
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
return(1); |
return 1; |
} |
} |
|
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
if ((nn = n->parent->head->child) != NULL && |
if ((nn = n->parent->head->child) != NULL && |
nn->string != NULL && ! (MAN_LINE & nn->flags) && |
nn->string != NULL && ! (NODE_LINE & nn->flags) && |
a2roffsu(nn->string, &su, SCALE_EN)) { |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = term_hspan(p, &su) / 24; |
len = term_hspan(p, &su) / 24; |
if (len < 0 && (size_t)(-len) > mt->offset) |
if (len < 0 && (size_t)(-len) > mt->offset) |
Line 708 pre_TP(DECL_ARGS) |
|
Line 701 pre_TP(DECL_ARGS) |
|
|
|
/* Don't print same-line elements. */ |
/* Don't print same-line elements. */ |
nn = n->child; |
nn = n->child; |
while (NULL != nn && 0 == (MAN_LINE & nn->flags)) |
while (NULL != nn && 0 == (NODE_LINE & nn->flags)) |
nn = nn->next; |
nn = nn->next; |
|
|
while (NULL != nn) { |
while (NULL != nn) { |
Line 718 pre_TP(DECL_ARGS) |
|
Line 711 pre_TP(DECL_ARGS) |
|
|
|
if (savelit) |
if (savelit) |
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
return(0); |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->trailspace = 0; |
p->trailspace = 0; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 792 pre_SS(DECL_ARGS) |
|
Line 785 pre_SS(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 829 pre_SH(DECL_ARGS) |
|
Line 822 pre_SH(DECL_ARGS) |
|
|
|
do { |
do { |
n = n->prev; |
n = n->prev; |
} while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT); |
} while (n != NULL && n->tok != TOKEN_NONE && |
|
termacts[n->tok].flags & MAN_NOTEXT); |
if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) |
if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) |
break; |
break; |
|
|
Line 853 pre_SH(DECL_ARGS) |
|
Line 847 pre_SH(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 880 pre_RS(DECL_ARGS) |
|
Line 874 pre_RS(DECL_ARGS) |
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
term_newln(p); |
term_newln(p); |
return(1); |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return(0); |
return 0; |
default: |
default: |
break; |
break; |
} |
} |
Line 906 pre_RS(DECL_ARGS) |
|
Line 900 pre_RS(DECL_ARGS) |
|
mt->lmargincur = mt->lmarginsz; |
mt->lmargincur = mt->lmarginsz; |
|
|
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
|
|
pre_UR(DECL_ARGS) |
pre_UR(DECL_ARGS) |
{ |
{ |
|
|
return (n->type != ROFFT_HEAD); |
return n->type != ROFFT_HEAD; |
} |
} |
|
|
static void |
static void |
Line 970 print_man_node(DECL_ARGS) |
|
Line 964 print_man_node(DECL_ARGS) |
|
if ('\0' == *n->string) { |
if ('\0' == *n->string) { |
term_vspace(p); |
term_vspace(p); |
return; |
return; |
} else if (' ' == *n->string && MAN_LINE & n->flags) |
} else if (' ' == *n->string && NODE_LINE & n->flags) |
term_newln(p); |
term_newln(p); |
|
|
term_word(p, n->string); |
term_word(p, n->string); |
goto out; |
goto out; |
|
|
case ROFFT_EQN: |
case ROFFT_EQN: |
if ( ! (n->flags & MAN_LINE)) |
if ( ! (n->flags & NODE_LINE)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_eqn(p, n->eqn); |
term_eqn(p, n->eqn); |
if (n->next != NULL && ! (n->next->flags & MAN_LINE)) |
if (n->next != NULL && ! (n->next->flags & NODE_LINE)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return; |
return; |
case ROFFT_TBL: |
case ROFFT_TBL: |
Line 992 print_man_node(DECL_ARGS) |
|
Line 986 print_man_node(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
if (n->tok < ROFF_MAX) { |
|
switch (n->tok) { |
|
case ROFF_br: |
|
pre_sp(p, mt, n, meta); |
|
break; |
|
default: |
|
abort(); |
|
} |
|
return; |
|
} |
|
|
|
assert(n->tok >= MAN_TH && n->tok <= MAN_MAX); |
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
|
|
|
|
*/ |
*/ |
if (mt->fl & MANT_LITERAL && |
if (mt->fl & MANT_LITERAL && |
! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) && |
! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) && |
(n->next == NULL || n->next->flags & MAN_LINE)) { |
(n->next == NULL || n->next->flags & NODE_LINE)) { |
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
} |
} |
if (MAN_EOS & n->flags) |
if (NODE_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
} |
} |
|
|