version 1.332, 2016/10/09 18:16:56 |
version 1.335, 2016/11/08 16:29:44 |
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 */ |
|
|
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 2221 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 2258 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 && |