version 1.331, 2016/01/08 17:48:09 |
version 1.337, 2017/01/10 12:53:07 |
Line 95 static int termp_bx_pre(DECL_ARGS); |
|
Line 95 static int termp_bx_pre(DECL_ARGS); |
|
static int termp_cd_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_eo_pre(DECL_ARGS); |
static int termp_eo_pre(DECL_ARGS); |
|
static int termp_em_pre(DECL_ARGS); |
static int termp_er_pre(DECL_ARGS); |
static int termp_er_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
Line 119 static int termp_skip_pre(DECL_ARGS); |
|
Line 120 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_sp_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_tag_pre(DECL_ARGS); |
static int termp_tag_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
Line 195 static const struct termact termacts[MDOC_MAX] = { |
|
Line 197 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ termp_under_pre, NULL }, /* Em */ |
{ termp_em_pre, NULL }, /* Em */ |
{ termp_eo_pre, termp_eo_post }, /* Eo */ |
{ termp_eo_pre, termp_eo_post }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
Line 218 static const struct termact termacts[MDOC_MAX] = { |
|
Line 220 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Sq */ |
{ termp_quote_pre, termp_quote_post }, /* Sq */ |
{ termp_sm_pre, NULL }, /* Sm */ |
{ termp_sm_pre, NULL }, /* Sm */ |
{ termp_under_pre, NULL }, /* Sx */ |
{ termp_under_pre, NULL }, /* Sx */ |
{ termp_bold_pre, NULL }, /* Sy */ |
{ termp_sy_pre, NULL }, /* Sy */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ termp_xx_pre, NULL }, /* Ux */ |
{ termp_xx_pre, NULL }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
Line 283 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 285 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
p->defindent = 5; |
p->defindent = 5; |
term_begin(p, print_mdoc_head, print_mdoc_foot, |
term_begin(p, print_mdoc_head, print_mdoc_foot, |
&mdoc->meta); |
&mdoc->meta); |
|
while (n != NULL && n->flags & NODE_NOPRT) |
|
n = n->next; |
if (n != NULL) { |
if (n != NULL) { |
if (n->tok != MDOC_Sh) |
if (n->tok != MDOC_Sh) |
term_vspace(p); |
term_vspace(p); |
Line 309 print_mdoc_node(DECL_ARGS) |
|
Line 313 print_mdoc_node(DECL_ARGS) |
|
struct termpair npair; |
struct termpair npair; |
size_t offset, rmargin; |
size_t offset, rmargin; |
|
|
|
if (n->flags & NODE_NOPRT) |
|
return; |
|
|
chld = 1; |
chld = 1; |
offset = p->offset; |
offset = p->offset; |
rmargin = p->rmargin; |
rmargin = p->rmargin; |
Line 562 print_bvspace(struct termp *p, |
|
Line 569 print_bvspace(struct termp *p, |
|
/* Do not vspace directly after Ss/Sh. */ |
/* Do not vspace directly after Ss/Sh. */ |
|
|
nn = n; |
nn = n; |
|
while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT) |
|
nn = nn->prev; |
while (nn->prev == NULL) { |
while (nn->prev == NULL) { |
do { |
do { |
nn = nn->parent; |
nn = nn->parent; |
Line 631 termp_it_pre(DECL_ARGS) |
|
Line 640 termp_it_pre(DECL_ARGS) |
|
width = term_len(p, 2); |
width = term_len(p, 2); |
break; |
break; |
case LIST_hang: |
case LIST_hang: |
|
case LIST_tag: |
width = term_len(p, 8); |
width = term_len(p, 8); |
break; |
break; |
case LIST_column: |
case LIST_column: |
case LIST_tag: |
|
width = term_len(p, 10); |
width = term_len(p, 10); |
break; |
break; |
default: |
default: |
Line 1460 termp_fn_pre(DECL_ARGS) |
|
Line 1469 termp_fn_pre(DECL_ARGS) |
|
term_word(p, n->string); |
term_word(p, n->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
if (n->sec == SEC_DESCRIPTION) |
if (n->sec == SEC_DESCRIPTION || n->sec == SEC_CUSTOM) |
tag_put(n->string, ++fn_prio, p->line); |
tag_put(n->string, ++fn_prio, p->line); |
|
|
if (pretty) { |
if (pretty) { |
Line 1716 termp_pf_post(DECL_ARGS) |
|
Line 1725 termp_pf_post(DECL_ARGS) |
|
static int |
static int |
termp_ss_pre(DECL_ARGS) |
termp_ss_pre(DECL_ARGS) |
{ |
{ |
|
struct roff_node *nn; |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
term_newln(p); |
term_newln(p); |
if (n->prev) |
for (nn = n->prev; nn != NULL; nn = nn->prev) |
|
if ((nn->flags & NODE_NOPRT) == 0) |
|
break; |
|
if (nn != NULL) |
term_vspace(p); |
term_vspace(p); |
break; |
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
|
|
termp_li_pre(DECL_ARGS) |
termp_li_pre(DECL_ARGS) |
{ |
{ |
|
|
|
termp_tag_pre(p, pair, meta, n); |
term_fontpush(p, TERMFONT_NONE); |
term_fontpush(p, TERMFONT_NONE); |
return 1; |
return 1; |
} |
} |
Line 2218 termp_under_pre(DECL_ARGS) |
|
Line 2232 termp_under_pre(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
termp_em_pre(DECL_ARGS) |
|
{ |
|
if (n->child != NULL && |
|
n->child->type == ROFFT_TEXT) |
|
tag_put(n->child->string, 0, p->line); |
|
term_fontpush(p, TERMFONT_UNDER); |
|
return 1; |
|
} |
|
|
|
static int |
|
termp_sy_pre(DECL_ARGS) |
|
{ |
|
if (n->child != NULL && |
|
n->child->type == ROFFT_TEXT) |
|
tag_put(n->child->string, 0, p->line); |
|
term_fontpush(p, TERMFONT_BOLD); |
|
return 1; |
|
} |
|
|
|
static int |
termp_er_pre(DECL_ARGS) |
termp_er_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 2235 termp_tag_pre(DECL_ARGS) |
|
Line 2269 termp_tag_pre(DECL_ARGS) |
|
|
|
if (n->child != NULL && |
if (n->child != NULL && |
n->child->type == ROFFT_TEXT && |
n->child->type == ROFFT_TEXT && |
n->prev == NULL && |
(n->prev == NULL || |
|
(n->prev->type == ROFFT_TEXT && |
|
strcmp(n->prev->string, "|") == 0)) && |
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_Xo && |
(n->parent->tok == MDOC_Xo && |
n->parent->parent->prev == NULL && |
n->parent->parent->prev == NULL && |