version 1.353, 2017/05/05 02:06:19 |
version 1.358, 2017/05/30 16:31:29 |
Line 106 static int termp_ft_pre(DECL_ARGS); |
|
Line 106 static int termp_ft_pre(DECL_ARGS); |
|
static int termp_in_pre(DECL_ARGS); |
static int termp_in_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_li_pre(DECL_ARGS); |
static int termp_li_pre(DECL_ARGS); |
static int termp_ll_pre(DECL_ARGS); |
|
static int termp_lk_pre(DECL_ARGS); |
static int termp_lk_pre(DECL_ARGS); |
static int termp_nd_pre(DECL_ARGS); |
static int termp_nd_pre(DECL_ARGS); |
static int termp_nm_pre(DECL_ARGS); |
static int termp_nm_pre(DECL_ARGS); |
Line 116 static int termp_rs_pre(DECL_ARGS); |
|
Line 115 static int termp_rs_pre(DECL_ARGS); |
|
static int termp_sh_pre(DECL_ARGS); |
static int termp_sh_pre(DECL_ARGS); |
static int termp_skip_pre(DECL_ARGS); |
static int termp_skip_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sp_pre(DECL_ARGS); |
static int termp_pp_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_sy_pre(DECL_ARGS); |
static int termp_sy_pre(DECL_ARGS); |
static int termp_tag_pre(DECL_ARGS); |
static int termp_tag_pre(DECL_ARGS); |
Line 131 static const struct termact __termacts[MDOC_MAX - MDOC |
|
Line 130 static const struct termact __termacts[MDOC_MAX - MDOC |
|
{ NULL, NULL }, /* Os */ |
{ NULL, NULL }, /* Os */ |
{ termp_sh_pre, termp_sh_post }, /* Sh */ |
{ termp_sh_pre, termp_sh_post }, /* Sh */ |
{ termp_ss_pre, termp_ss_post }, /* Ss */ |
{ termp_ss_pre, termp_ss_post }, /* Ss */ |
{ termp_sp_pre, NULL }, /* Pp */ |
{ termp_pp_pre, NULL }, /* Pp */ |
{ termp_d1_pre, termp_bl_post }, /* D1 */ |
{ termp_d1_pre, termp_bl_post }, /* D1 */ |
{ termp_d1_pre, termp_bl_post }, /* Dl */ |
{ termp_d1_pre, termp_bl_post }, /* Dl */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
Line 233 static const struct termact __termacts[MDOC_MAX - MDOC |
|
Line 232 static const struct termact __termacts[MDOC_MAX - MDOC |
|
{ termp_under_pre, NULL }, /* Fr */ |
{ termp_under_pre, NULL }, /* Fr */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, termp_lb_post }, /* Lb */ |
{ NULL, termp_lb_post }, /* Lb */ |
{ termp_sp_pre, NULL }, /* Lp */ |
{ termp_pp_pre, NULL }, /* Lp */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_under_pre, NULL }, /* Mt */ |
{ termp_under_pre, NULL }, /* Mt */ |
{ termp_quote_pre, termp_quote_post }, /* Brq */ |
{ termp_quote_pre, termp_quote_post }, /* Brq */ |
Line 244 static const struct termact __termacts[MDOC_MAX - MDOC |
|
Line 243 static const struct termact __termacts[MDOC_MAX - MDOC |
|
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_xx_pre, termp_xx_post }, /* Dx */ |
{ termp_xx_pre, termp_xx_post }, /* Dx */ |
{ NULL, termp____post }, /* %Q */ |
{ NULL, termp____post }, /* %Q */ |
{ termp_sp_pre, NULL }, /* sp */ |
|
{ NULL, termp____post }, /* %U */ |
{ NULL, termp____post }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
{ termp_ll_pre, NULL }, /* ll */ |
|
}; |
}; |
static const struct termact *const termacts = __termacts - MDOC_Dd; |
static const struct termact *const termacts = __termacts - MDOC_Dd; |
|
|
Line 264 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 261 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
p->overstep = 0; |
p->overstep = 0; |
p->rmargin = p->maxrmargin = p->defrmargin; |
p->rmargin = p->maxrmargin = p->defrmargin; |
p->tabwidth = term_len(p, 5); |
term_tab_set(p, NULL); |
|
term_tab_set(p, "T"); |
|
term_tab_set(p, ".5i"); |
|
|
n = mdoc->first->child; |
n = mdoc->first->child; |
if (p->synopsisonly) { |
if (p->synopsisonly) { |
Line 343 print_mdoc_node(DECL_ARGS) |
|
Line 342 print_mdoc_node(DECL_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (' ' == *n->string && NODE_LINE & n->flags) |
if (*n->string == ' ' && n->flags & NODE_LINE && |
|
(p->flags & TERMP_NONEWLINE) == 0) |
term_newln(p); |
term_newln(p); |
if (NODE_DELIMC & n->flags) |
if (NODE_DELIMC & n->flags) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 366 print_mdoc_node(DECL_ARGS) |
|
Line 366 print_mdoc_node(DECL_ARGS) |
|
default: |
default: |
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
roff_term_pre(p, n); |
roff_term_pre(p, n); |
chld = 0; |
return; |
break; |
|
} |
} |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
if (termacts[n->tok].pre != NULL && |
if (termacts[n->tok].pre != NULL && |
Line 391 print_mdoc_node(DECL_ARGS) |
|
Line 390 print_mdoc_node(DECL_ARGS) |
|
case ROFFT_EQN: |
case ROFFT_EQN: |
break; |
break; |
default: |
default: |
if (n->tok < ROFF_MAX || |
if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED) |
termacts[n->tok].post == NULL || |
|
n->flags & NODE_ENDED) |
|
break; |
break; |
(void)(*termacts[n->tok].post)(p, &npair, meta, n); |
(void)(*termacts[n->tok].post)(p, &npair, meta, n); |
|
|
Line 410 print_mdoc_node(DECL_ARGS) |
|
Line 407 print_mdoc_node(DECL_ARGS) |
|
if (NODE_EOS & n->flags) |
if (NODE_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
|
|
if (MDOC_ll != n->tok) { |
p->offset = offset; |
p->offset = offset; |
p->rmargin = rmargin; |
p->rmargin = rmargin; |
|
} |
|
} |
} |
|
|
static void |
static void |
Line 605 print_bvspace(struct termp *p, |
|
Line 600 print_bvspace(struct termp *p, |
|
|
|
|
|
static int |
static int |
termp_ll_pre(DECL_ARGS) |
|
{ |
|
|
|
term_setwidth(p, n->child != NULL ? n->child->string : NULL); |
|
return 0; |
|
} |
|
|
|
static int |
|
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
termp_bl_post(DECL_ARGS) |
termp_bl_post(DECL_ARGS) |
{ |
{ |
|
|
if (n->type == ROFFT_BLOCK) |
if (n->type != ROFFT_BLOCK) |
term_newln(p); |
return; |
|
term_newln(p); |
|
if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column) |
|
return; |
|
term_tab_set(p, NULL); |
|
term_tab_set(p, "T"); |
|
term_tab_set(p, ".5i"); |
} |
} |
|
|
static int |
static int |
Line 1288 termp_sh_pre(DECL_ARGS) |
|
Line 1281 termp_sh_pre(DECL_ARGS) |
|
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = term_len(p, p->defindent); |
p->offset = term_len(p, p->defindent); |
|
term_tab_set(p, NULL); |
|
term_tab_set(p, "T"); |
|
term_tab_set(p, ".5i"); |
switch (n->sec) { |
switch (n->sec) { |
case SEC_DESCRIPTION: |
case SEC_DESCRIPTION: |
fn_prio = 0; |
fn_prio = 0; |
Line 1338 termp_d1_pre(DECL_ARGS) |
|
Line 1334 termp_d1_pre(DECL_ARGS) |
|
return 1; |
return 1; |
term_newln(p); |
term_newln(p); |
p->offset += term_len(p, p->defindent + 1); |
p->offset += term_len(p, p->defindent + 1); |
|
term_tab_set(p, NULL); |
|
term_tab_set(p, "T"); |
|
term_tab_set(p, ".5i"); |
return 1; |
return 1; |
} |
} |
|
|
Line 1443 termp_fa_pre(DECL_ARGS) |
|
Line 1442 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
size_t tabwidth, lm, len, rm, rmax; |
size_t lm, len, rm, rmax; |
struct roff_node *nn; |
struct roff_node *nn; |
int offset; |
int offset; |
|
|
Line 1483 termp_bd_pre(DECL_ARGS) |
|
Line 1482 termp_bd_pre(DECL_ARGS) |
|
DISP_centered != n->norm->Bd.type) |
DISP_centered != n->norm->Bd.type) |
return 1; |
return 1; |
|
|
tabwidth = p->tabwidth; |
if (n->norm->Bd.type == DISP_literal) { |
if (DISP_literal == n->norm->Bd.type) |
term_tab_set(p, NULL); |
p->tabwidth = term_len(p, 8); |
term_tab_set(p, "T"); |
|
term_tab_set(p, "8n"); |
|
} |
|
|
lm = p->offset; |
lm = p->offset; |
rm = p->rmargin; |
rm = p->rmargin; |
Line 1509 termp_bd_pre(DECL_ARGS) |
|
Line 1510 termp_bd_pre(DECL_ARGS) |
|
* notion of selective eoln whitespace is pretty dumb |
* notion of selective eoln whitespace is pretty dumb |
* anyway, so don't sweat it. |
* anyway, so don't sweat it. |
*/ |
*/ |
|
if (nn->tok < ROFF_MAX) |
|
continue; |
switch (nn->tok) { |
switch (nn->tok) { |
case MDOC_Sm: |
case MDOC_Sm: |
case ROFF_br: |
|
case MDOC_sp: |
|
case MDOC_Bl: |
case MDOC_Bl: |
case MDOC_D1: |
case MDOC_D1: |
case MDOC_Dl: |
case MDOC_Dl: |
Line 1529 termp_bd_pre(DECL_ARGS) |
|
Line 1530 termp_bd_pre(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
p->tabwidth = tabwidth; |
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
return 0; |
return 0; |
Line 1600 termp_ss_pre(DECL_ARGS) |
|
Line 1600 termp_ss_pre(DECL_ARGS) |
|
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->offset = term_len(p, p->defindent); |
p->offset = term_len(p, p->defindent); |
|
term_tab_set(p, NULL); |
|
term_tab_set(p, "T"); |
|
term_tab_set(p, ".5i"); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 1659 termp_in_post(DECL_ARGS) |
|
Line 1662 termp_in_post(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_sp_pre(DECL_ARGS) |
termp_pp_pre(DECL_ARGS) |
{ |
{ |
struct roffsu su; |
fn_prio = 0; |
int i, len; |
term_vspace(p); |
|
|
switch (n->tok) { |
|
case MDOC_sp: |
|
if (n->child) { |
|
if ( ! a2roffsu(n->child->string, &su, SCALE_VS)) |
|
su.scale = 1.0; |
|
len = term_vspan(p, &su); |
|
} else |
|
len = 1; |
|
break; |
|
case ROFF_br: |
|
len = 0; |
|
break; |
|
default: |
|
len = 1; |
|
fn_prio = 0; |
|
break; |
|
} |
|
|
|
if (0 == len) |
|
term_newln(p); |
|
else if (len < 0) |
|
p->skipvsp -= len; |
|
else |
|
for (i = 0; i < len; i++) |
|
term_vspace(p); |
|
|
|
return 0; |
return 0; |
} |
} |
|
|
Line 2001 termp_li_pre(DECL_ARGS) |
|
Line 1977 termp_li_pre(DECL_ARGS) |
|
static int |
static int |
termp_lk_pre(DECL_ARGS) |
termp_lk_pre(DECL_ARGS) |
{ |
{ |
const struct roff_node *link, *descr; |
const struct roff_node *link, *descr, *punct; |
int display; |
int display; |
|
|
if ((link = n->child) == NULL) |
if ((link = n->child) == NULL) |
return 0; |
return 0; |
|
|
|
/* Find beginning of trailing punctuation. */ |
|
punct = n->last; |
|
while (punct != link && punct->flags & NODE_DELIMC) |
|
punct = punct->prev; |
|
punct = punct->next; |
|
|
/* Link text. */ |
/* Link text. */ |
if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) { |
if ((descr = link->next) != NULL && descr != punct) { |
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
while (descr != NULL && !(descr->flags & NODE_DELIMC)) { |
while (descr != punct) { |
|
if (descr->flags & (NODE_DELIMC | NODE_DELIMO)) |
|
p->flags |= TERMP_NOSPACE; |
term_word(p, descr->string); |
term_word(p, descr->string); |
descr = descr->next; |
descr = descr->next; |
} |
} |
Line 2030 termp_lk_pre(DECL_ARGS) |
|
Line 2014 termp_lk_pre(DECL_ARGS) |
|
term_fontpop(p); |
term_fontpop(p); |
|
|
/* Trailing punctuation. */ |
/* Trailing punctuation. */ |
while (descr != NULL) { |
while (punct != NULL) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, descr->string); |
term_word(p, punct->string); |
descr = descr->next; |
punct = punct->next; |
} |
} |
if (display) |
if (display) |
term_newln(p); |
term_newln(p); |