version 1.329, 2015/10/12 00:08:16 |
version 1.355, 2017/05/05 15:17:32 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 80 static void termp_pf_post(DECL_ARGS); |
|
Line 80 static void termp_pf_post(DECL_ARGS); |
|
static void termp_quote_post(DECL_ARGS); |
static void termp_quote_post(DECL_ARGS); |
static void termp_sh_post(DECL_ARGS); |
static void termp_sh_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
|
static void termp_xx_post(DECL_ARGS); |
|
|
static int termp__a_pre(DECL_ARGS); |
static int termp__a_pre(DECL_ARGS); |
static int termp__t_pre(DECL_ARGS); |
static int termp__t_pre(DECL_ARGS); |
Line 90 static int termp_bf_pre(DECL_ARGS); |
|
Line 91 static int termp_bf_pre(DECL_ARGS); |
|
static int termp_bk_pre(DECL_ARGS); |
static int termp_bk_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bt_pre(DECL_ARGS); |
|
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 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); |
static int termp_ns_pre(DECL_ARGS); |
static int termp_ns_pre(DECL_ARGS); |
static int termp_quote_pre(DECL_ARGS); |
static int termp_quote_pre(DECL_ARGS); |
static int termp_rs_pre(DECL_ARGS); |
static int termp_rs_pre(DECL_ARGS); |
static int termp_rv_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_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_vt_pre(DECL_ARGS); |
static int termp_vt_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
|
|
static const struct termact termacts[MDOC_MAX] = { |
static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = { |
{ termp_ap_pre, NULL }, /* Ap */ |
|
{ NULL, NULL }, /* Dd */ |
{ NULL, NULL }, /* Dd */ |
{ NULL, NULL }, /* Dt */ |
{ NULL, NULL }, /* Dt */ |
{ 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 143 static const struct termact termacts[MDOC_MAX] = { |
|
Line 140 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_it_pre, termp_it_post }, /* It */ |
{ termp_it_pre, termp_it_post }, /* It */ |
{ termp_under_pre, NULL }, /* Ad */ |
{ termp_under_pre, NULL }, /* Ad */ |
{ termp_an_pre, NULL }, /* An */ |
{ termp_an_pre, NULL }, /* An */ |
|
{ termp_ap_pre, NULL }, /* Ap */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_cd_pre, NULL }, /* Cd */ |
{ termp_cd_pre, NULL }, /* Cd */ |
{ termp_bold_pre, NULL }, /* Cm */ |
{ termp_bold_pre, NULL }, /* Cm */ |
Line 163 static const struct termact termacts[MDOC_MAX] = { |
|
Line 161 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Op */ |
{ termp_quote_pre, termp_quote_post }, /* Op */ |
{ termp_ft_pre, NULL }, /* Ot */ |
{ termp_ft_pre, NULL }, /* Ot */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_ex_pre, NULL }, /* Rv */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_vt_pre, NULL }, /* Vt */ |
Line 187 static const struct termact termacts[MDOC_MAX] = { |
|
Line 185 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_quote_pre, termp_quote_post }, /* Bo */ |
{ termp_quote_pre, termp_quote_post }, /* Bo */ |
{ termp_quote_pre, termp_quote_post }, /* Bq */ |
{ termp_quote_pre, termp_quote_post }, /* Bq */ |
{ termp_xx_pre, NULL }, /* Bsx */ |
{ termp_xx_pre, termp_xx_post }, /* Bsx */ |
{ termp_bx_pre, NULL }, /* Bx */ |
{ NULL, NULL }, /* Bx */ |
{ termp_skip_pre, NULL }, /* Db */ |
{ termp_skip_pre, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ termp_quote_pre, termp_quote_post }, /* Do */ |
{ termp_quote_pre, termp_quote_post }, /* Do */ |
{ 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, termp_xx_post }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_li_pre, NULL }, /* No */ |
{ termp_li_pre, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, termp_xx_post }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Ox */ |
{ termp_xx_pre, termp_xx_post }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, termp_pf_post }, /* Pf */ |
{ NULL, termp_pf_post }, /* Pf */ |
{ termp_quote_pre, termp_quote_post }, /* Po */ |
{ termp_quote_pre, termp_quote_post }, /* Po */ |
Line 218 static const struct termact termacts[MDOC_MAX] = { |
|
Line 216 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, termp_xx_post }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xo */ |
{ NULL, NULL }, /* Xo */ |
{ termp_fo_pre, termp_fo_post }, /* Fo */ |
{ termp_fo_pre, termp_fo_post }, /* Fo */ |
Line 229 static const struct termact termacts[MDOC_MAX] = { |
|
Line 227 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Oc */ |
{ termp_bk_pre, termp_bk_post }, /* Bk */ |
{ termp_bk_pre, termp_bk_post }, /* Bk */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ termp_bt_pre, NULL }, /* Bt */ |
{ NULL, NULL }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ termp_under_pre, NULL }, /* Fr */ |
{ termp_under_pre, NULL }, /* Fr */ |
{ termp_ud_pre, 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 243 static const struct termact termacts[MDOC_MAX] = { |
|
Line 241 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, termp____post }, /* %C */ |
{ NULL, termp____post }, /* %C */ |
{ termp_skip_pre, NULL }, /* Es */ |
{ termp_skip_pre, NULL }, /* Es */ |
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ termp_xx_pre, termp_xx_post }, /* Dx */ |
{ NULL, termp____post }, /* %Q */ |
{ NULL, termp____post }, /* %Q */ |
{ termp_sp_pre, NULL }, /* br */ |
|
{ 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 int fn_prio; |
static int fn_prio; |
|
|
|
|
void |
void |
terminal_mdoc(void *arg, const struct roff_man *mdoc) |
terminal_mdoc(void *arg, const struct roff_man *mdoc) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
struct termp *p; |
struct termp *p; |
|
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
p->overstep = 0; |
p->overstep = 0; |
Line 279 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 277 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
n = n->next; |
n = n->next; |
} |
} |
} else { |
} else { |
|
save_defindent = p->defindent; |
if (p->defindent == 0) |
if (p->defindent == 0) |
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); |
print_mdoc_nodelist(p, NULL, &mdoc->meta, n); |
print_mdoc_nodelist(p, NULL, &mdoc->meta, n); |
} |
} |
term_end(p); |
term_end(p); |
|
p->defindent = save_defindent; |
} |
} |
} |
} |
|
|
Line 309 print_mdoc_node(DECL_ARGS) |
|
Line 311 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; |
n->flags &= ~MDOC_ENDED; |
n->flags &= ~NODE_ENDED; |
n->prev_font = p->fonti; |
n->prev_font = p->fonti; |
|
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
Line 323 print_mdoc_node(DECL_ARGS) |
|
Line 328 print_mdoc_node(DECL_ARGS) |
|
* invoked in a prior line, revert it to PREKEEP. |
* invoked in a prior line, revert it to PREKEEP. |
*/ |
*/ |
|
|
if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) { |
if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) { |
p->flags &= ~TERMP_KEEP; |
p->flags &= ~TERMP_KEEP; |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
} |
} |
Line 335 print_mdoc_node(DECL_ARGS) |
|
Line 340 print_mdoc_node(DECL_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (' ' == *n->string && MDOC_LINE & n->flags) |
if (' ' == *n->string && NODE_LINE & n->flags) |
term_newln(p); |
term_newln(p); |
if (MDOC_DELIMC & n->flags) |
if (NODE_DELIMC & n->flags) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, n->string); |
term_word(p, n->string); |
if (MDOC_DELIMO & n->flags) |
if (NODE_DELIMO & n->flags) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
if ( ! (n->flags & MDOC_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 & MDOC_LINE)) |
if (n->next != NULL && ! (n->next->flags & NODE_LINE)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case ROFFT_TBL: |
case ROFFT_TBL: |
Line 356 print_mdoc_node(DECL_ARGS) |
|
Line 361 print_mdoc_node(DECL_ARGS) |
|
term_tbl(p, n->span); |
term_tbl(p, n->span); |
break; |
break; |
default: |
default: |
if (termacts[n->tok].pre && |
if (n->tok < ROFF_MAX) { |
(n->end == ENDBODY_NOT || n->nchild)) |
roff_term_pre(p, n); |
|
return; |
|
} |
|
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
|
if (termacts[n->tok].pre != NULL && |
|
(n->end == ENDBODY_NOT || n->child != NULL)) |
chld = (*termacts[n->tok].pre) |
chld = (*termacts[n->tok].pre) |
(p, &npair, meta, n); |
(p, &npair, meta, n); |
break; |
break; |
Line 377 print_mdoc_node(DECL_ARGS) |
|
Line 387 print_mdoc_node(DECL_ARGS) |
|
case ROFFT_EQN: |
case ROFFT_EQN: |
break; |
break; |
default: |
default: |
if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags) |
if (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 387 print_mdoc_node(DECL_ARGS) |
|
Line 397 print_mdoc_node(DECL_ARGS) |
|
* that it must not call the post handler again. |
* that it must not call the post handler again. |
*/ |
*/ |
if (ENDBODY_NOT != n->end) |
if (ENDBODY_NOT != n->end) |
n->body->flags |= MDOC_ENDED; |
n->body->flags |= NODE_ENDED; |
|
|
/* |
|
* End of line terminating an implicit block |
|
* while an explicit block is still open. |
|
* Continue the explicit block without spacing. |
|
*/ |
|
if (ENDBODY_NOSPACE == n->end) |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
break; |
} |
} |
|
|
if (MDOC_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 562 print_bvspace(struct termp *p, |
|
Line 562 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 595 print_bvspace(struct termp *p, |
|
Line 597 print_bvspace(struct termp *p, |
|
|
|
|
|
static int |
static int |
termp_ll_pre(DECL_ARGS) |
|
{ |
|
|
|
term_setwidth(p, n->nchild ? n->child->string : NULL); |
|
return 0; |
|
} |
|
|
|
static int |
|
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
char buf[24]; |
char buf[24]; |
const struct roff_node *bl, *nn; |
const struct roff_node *bl, *nn; |
size_t ncols, dcol; |
size_t ncols, dcol; |
Line 631 termp_it_pre(DECL_ARGS) |
|
Line 626 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 682 termp_it_pre(DECL_ARGS) |
|
Line 677 termp_it_pre(DECL_ARGS) |
|
|
|
for (i = 0, nn = n->prev; |
for (i = 0, nn = n->prev; |
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) { |
offset += dcol + a2width(p, |
SCALE_HS_INIT(&su, |
bl->norm->Bl.cols[i]); |
term_strlen(p, bl->norm->Bl.cols[i])); |
|
su.scale /= term_strlen(p, "0"); |
|
offset += term_hspan(p, &su) / 24 + dcol; |
|
} |
|
|
/* |
/* |
* When exceeding the declared number of columns, leave |
* When exceeding the declared number of columns, leave |
Line 699 termp_it_pre(DECL_ARGS) |
|
Line 697 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
width = a2width(p, bl->norm->Bl.cols[i]) + dcol; |
SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i])); |
|
su.scale /= term_strlen(p, "0"); |
|
width = term_hspan(p, &su) / 24 + dcol; |
break; |
break; |
default: |
default: |
if (NULL == bl->norm->Bl.width) |
if (NULL == bl->norm->Bl.width) |
Line 731 termp_it_pre(DECL_ARGS) |
|
Line 731 termp_it_pre(DECL_ARGS) |
|
term_word(p, "\\ \\ "); |
term_word(p, "\\ \\ "); |
break; |
break; |
case LIST_inset: |
case LIST_inset: |
if (n->type == ROFFT_BODY && n->parent->head->nchild) |
if (n->type == ROFFT_BODY && n->parent->head->child != NULL) |
term_word(p, "\\ "); |
term_word(p, "\\ "); |
break; |
break; |
default: |
default: |
Line 887 termp_it_pre(DECL_ARGS) |
|
Line 887 termp_it_pre(DECL_ARGS) |
|
case LIST_dash: |
case LIST_dash: |
case LIST_hyphen: |
case LIST_hyphen: |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\(hy"); |
term_word(p, "-"); |
term_fontpop(p); |
term_fontpop(p); |
break; |
break; |
case LIST_enum: |
case LIST_enum: |
Line 987 termp_nm_pre(DECL_ARGS) |
|
Line 987 termp_nm_pre(DECL_ARGS) |
|
return 1; |
return 1; |
} |
} |
|
|
if (NULL == n->child && NULL == meta->name) |
if (n->child == NULL) |
return 0; |
return 0; |
|
|
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
Line 1011 termp_nm_pre(DECL_ARGS) |
|
Line 1011 termp_nm_pre(DECL_ARGS) |
|
} |
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
if (NULL == n->child) |
|
term_word(p, meta->name); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1039 termp_fl_pre(DECL_ARGS) |
|
Line 1037 termp_fl_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
|
|
if ( ! (n->nchild == 0 && |
if (!(n->child == NULL && |
(n->next == NULL || |
(n->next == NULL || |
n->next->type == ROFFT_TEXT || |
n->next->type == ROFFT_TEXT || |
n->next->flags & MDOC_LINE))) |
n->next->flags & NODE_LINE))) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
return 1; |
return 1; |
|
|
termp_ns_pre(DECL_ARGS) |
termp_ns_pre(DECL_ARGS) |
{ |
{ |
|
|
if ( ! (MDOC_LINE & n->flags)) |
if ( ! (NODE_LINE & n->flags)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return 1; |
return 1; |
} |
} |
Line 1104 termp_rs_pre(DECL_ARGS) |
|
Line 1102 termp_rs_pre(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_rv_pre(DECL_ARGS) |
|
{ |
|
int nchild; |
|
|
|
term_newln(p); |
|
|
|
nchild = n->nchild; |
|
if (nchild > 0) { |
|
term_word(p, "The"); |
|
|
|
for (n = n->child; n; n = n->next) { |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, n->string); |
|
term_fontpop(p); |
|
|
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, "()"); |
|
|
|
if (n->next == NULL) |
|
continue; |
|
|
|
if (nchild > 2) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
if (n->next->next == NULL) |
|
term_word(p, "and"); |
|
} |
|
|
|
if (nchild > 1) |
|
term_word(p, "functions return"); |
|
else |
|
term_word(p, "function returns"); |
|
|
|
term_word(p, "the value\\~0 if successful;"); |
|
} else |
|
term_word(p, "Upon successful completion," |
|
" the value\\~0 is returned;"); |
|
|
|
term_word(p, "otherwise the value\\~\\-1 is returned" |
|
" and the global variable"); |
|
|
|
term_fontpush(p, TERMFONT_UNDER); |
|
term_word(p, "errno"); |
|
term_fontpop(p); |
|
|
|
term_word(p, "is set to indicate the error."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
|
return 0; |
|
} |
|
|
|
static int |
|
termp_ex_pre(DECL_ARGS) |
termp_ex_pre(DECL_ARGS) |
{ |
{ |
int nchild; |
|
|
|
term_newln(p); |
term_newln(p); |
term_word(p, "The"); |
return 1; |
|
|
nchild = n->nchild; |
|
for (n = n->child; n; n = n->next) { |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, n->string); |
|
term_fontpop(p); |
|
|
|
if (nchild > 2 && n->next) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
|
|
if (n->next && NULL == n->next->next) |
|
term_word(p, "and"); |
|
} |
|
|
|
if (nchild > 1) |
|
term_word(p, "utilities exit\\~0"); |
|
else |
|
term_word(p, "utility exits\\~0"); |
|
|
|
term_word(p, "on success, and\\~>0 if an error occurs."); |
|
|
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
} |
|
|
static int |
static int |
Line 1252 synopsis_pre(struct termp *p, const struct roff_node * |
|
Line 1170 synopsis_pre(struct termp *p, const struct roff_node * |
|
* Obviously, if we're not in a SYNOPSIS or no prior macros |
* Obviously, if we're not in a SYNOPSIS or no prior macros |
* exist, do nothing. |
* exist, do nothing. |
*/ |
*/ |
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags)) |
return; |
return; |
|
|
/* |
/* |
Line 1388 termp_sh_post(DECL_ARGS) |
|
Line 1306 termp_sh_post(DECL_ARGS) |
|
} |
} |
} |
} |
|
|
static int |
|
termp_bt_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "is currently in beta test."); |
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
|
|
|
static void |
static void |
termp_lb_post(DECL_ARGS) |
termp_lb_post(DECL_ARGS) |
{ |
{ |
|
|
if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags) |
if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags) |
term_newln(p); |
term_newln(p); |
} |
} |
|
|
static int |
static int |
termp_ud_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "currently under development."); |
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
|
|
|
static int |
|
termp_d1_pre(DECL_ARGS) |
termp_d1_pre(DECL_ARGS) |
{ |
{ |
|
|
|
|
termp_ft_pre(DECL_ARGS) |
termp_ft_pre(DECL_ARGS) |
{ |
{ |
|
|
/* NB: MDOC_LINE does not effect this! */ |
/* NB: NODE_LINE does not effect this! */ |
synopsis_pre(p, n); |
synopsis_pre(p, n); |
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
return 1; |
return 1; |
Line 1441 termp_fn_pre(DECL_ARGS) |
|
Line 1341 termp_fn_pre(DECL_ARGS) |
|
size_t rmargin = 0; |
size_t rmargin = 0; |
int pretty; |
int pretty; |
|
|
pretty = MDOC_SYNPRETTY & n->flags; |
pretty = NODE_SYNPRETTY & n->flags; |
|
|
synopsis_pre(p, n); |
synopsis_pre(p, n); |
|
|
Line 1459 termp_fn_pre(DECL_ARGS) |
|
Line 1359 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 1594 termp_bd_pre(DECL_ARGS) |
|
Line 1494 termp_bd_pre(DECL_ARGS) |
|
* anyway, so don't sweat it. |
* anyway, so don't sweat it. |
*/ |
*/ |
switch (nn->tok) { |
switch (nn->tok) { |
|
case ROFF_br: |
|
case ROFF_sp: |
case MDOC_Sm: |
case MDOC_Sm: |
case MDOC_br: |
|
case MDOC_sp: |
|
case MDOC_Bl: |
case MDOC_Bl: |
case MDOC_D1: |
case MDOC_D1: |
case MDOC_Dl: |
case MDOC_Dl: |
Line 1607 termp_bd_pre(DECL_ARGS) |
|
Line 1507 termp_bd_pre(DECL_ARGS) |
|
break; |
break; |
} |
} |
if (p->flags & TERMP_NONEWLINE || |
if (p->flags & TERMP_NONEWLINE || |
(nn->next && ! (nn->next->flags & MDOC_LINE))) |
(nn->next && ! (nn->next->flags & NODE_LINE))) |
continue; |
continue; |
term_flushln(p); |
term_flushln(p); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1642 termp_bd_post(DECL_ARGS) |
|
Line 1542 termp_bd_post(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_bx_pre(DECL_ARGS) |
termp_xx_pre(DECL_ARGS) |
{ |
{ |
|
if ((n->aux = p->flags & TERMP_PREKEEP) == 0) |
if (NULL != (n = n->child)) { |
p->flags |= TERMP_PREKEEP; |
term_word(p, n->string); |
return 1; |
p->flags |= TERMP_NOSPACE; |
|
term_word(p, "BSD"); |
|
} else { |
|
term_word(p, "BSD"); |
|
return 0; |
|
} |
|
|
|
if (NULL != (n = n->next)) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, "-"); |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, n->string); |
|
} |
|
|
|
return 0; |
|
} |
} |
|
|
static int |
static void |
termp_xx_pre(DECL_ARGS) |
termp_xx_post(DECL_ARGS) |
{ |
{ |
const char *pp; |
if (n->aux == 0) |
int flags; |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
|
pp = NULL; |
|
switch (n->tok) { |
|
case MDOC_Bsx: |
|
pp = "BSD/OS"; |
|
break; |
|
case MDOC_Dx: |
|
pp = "DragonFly"; |
|
break; |
|
case MDOC_Fx: |
|
pp = "FreeBSD"; |
|
break; |
|
case MDOC_Nx: |
|
pp = "NetBSD"; |
|
break; |
|
case MDOC_Ox: |
|
pp = "OpenBSD"; |
|
break; |
|
case MDOC_Ux: |
|
pp = "UNIX"; |
|
break; |
|
default: |
|
abort(); |
|
} |
|
|
|
term_word(p, pp); |
|
if (n->child) { |
|
flags = p->flags; |
|
p->flags |= TERMP_KEEP; |
|
term_word(p, n->child->string); |
|
p->flags = flags; |
|
} |
|
return 0; |
|
} |
} |
|
|
static void |
static void |
termp_pf_post(DECL_ARGS) |
termp_pf_post(DECL_ARGS) |
{ |
{ |
|
|
if ( ! (n->next == NULL || n->next->flags & MDOC_LINE)) |
if ( ! (n->next == NULL || n->next->flags & NODE_LINE)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
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: |
Line 1759 termp_in_pre(DECL_ARGS) |
|
Line 1615 termp_in_pre(DECL_ARGS) |
|
|
|
synopsis_pre(p, n); |
synopsis_pre(p, n); |
|
|
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) { |
if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) { |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "#include"); |
term_word(p, "#include"); |
term_word(p, "<"); |
term_word(p, "<"); |
|
|
termp_in_post(DECL_ARGS) |
termp_in_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_SYNPRETTY & n->flags) |
if (NODE_SYNPRETTY & n->flags) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
|
|
if (MDOC_SYNPRETTY & n->flags) |
if (NODE_SYNPRETTY & n->flags) |
term_fontpop(p); |
term_fontpop(p); |
} |
} |
|
|
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 MDOC_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 1838 termp_quote_pre(DECL_ARGS) |
|
Line 1667 termp_quote_pre(DECL_ARGS) |
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Ao: |
case MDOC_Ao: |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->nchild == 1 && |
term_word(p, n->child != NULL && n->child->next == NULL && |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
Line 1851 termp_quote_pre(DECL_ARGS) |
|
Line 1680 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "["); |
term_word(p, "["); |
break; |
break; |
|
case MDOC__T: |
|
/* FALLTHROUGH */ |
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Lq"); |
term_word(p, "\\(Lq"); |
Line 1865 termp_quote_pre(DECL_ARGS) |
|
Line 1696 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, "("); |
term_word(p, "("); |
break; |
break; |
case MDOC__T: |
|
case MDOC_Qo: |
case MDOC_Qo: |
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
Line 1895 termp_quote_post(DECL_ARGS) |
|
Line 1725 termp_quote_post(DECL_ARGS) |
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Ao: |
case MDOC_Ao: |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->nchild == 1 && |
term_word(p, n->child != NULL && n->child->next == NULL && |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
Line 1908 termp_quote_post(DECL_ARGS) |
|
Line 1738 termp_quote_post(DECL_ARGS) |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "]"); |
term_word(p, "]"); |
break; |
break; |
|
case MDOC__T: |
|
/* FALLTHROUGH */ |
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Rq"); |
term_word(p, "\\(Rq"); |
Line 1924 termp_quote_post(DECL_ARGS) |
|
Line 1756 termp_quote_post(DECL_ARGS) |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, ")"); |
term_word(p, ")"); |
break; |
break; |
case MDOC__T: |
|
case MDOC_Qo: |
case MDOC_Qo: |
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
Line 1989 termp_fo_pre(DECL_ARGS) |
|
Line 1820 termp_fo_pre(DECL_ARGS) |
|
size_t rmargin = 0; |
size_t rmargin = 0; |
int pretty; |
int pretty; |
|
|
pretty = MDOC_SYNPRETTY & n->flags; |
pretty = NODE_SYNPRETTY & n->flags; |
|
|
if (n->type == ROFFT_BLOCK) { |
if (n->type == ROFFT_BLOCK) { |
synopsis_pre(p, n); |
synopsis_pre(p, n); |
Line 2035 termp_fo_post(DECL_ARGS) |
|
Line 1866 termp_fo_post(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ")"); |
term_word(p, ")"); |
|
|
if (MDOC_SYNPRETTY & n->flags) { |
if (NODE_SYNPRETTY & n->flags) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ";"); |
term_word(p, ";"); |
term_flushln(p); |
term_flushln(p); |
|
|
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; |
} |
} |
|
|
termp_lk_pre(DECL_ARGS) |
termp_lk_pre(DECL_ARGS) |
{ |
{ |
const struct roff_node *link, *descr; |
const struct roff_node *link, *descr; |
|
int display; |
|
|
if (NULL == (link = n->child)) |
if ((link = n->child) == NULL) |
return 0; |
return 0; |
|
|
if (NULL != (descr = link->next)) { |
/* Link text. */ |
|
if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) { |
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
while (NULL != descr) { |
while (descr != NULL && !(descr->flags & NODE_DELIMC)) { |
term_word(p, descr->string); |
term_word(p, descr->string); |
descr = descr->next; |
descr = descr->next; |
} |
} |
|
term_fontpop(p); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ":"); |
term_word(p, ":"); |
term_fontpop(p); |
|
} |
} |
|
|
|
/* Link target. */ |
|
display = term_strlen(p, link->string) >= 26; |
|
if (display) { |
|
term_newln(p); |
|
p->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); |
term_fontpop(p); |
term_fontpop(p); |
|
|
|
/* Trailing punctuation. */ |
|
while (descr != NULL) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, descr->string); |
|
descr = descr->next; |
|
} |
|
if (display) |
|
term_newln(p); |
return 0; |
return 0; |
} |
} |
|
|
Line 2159 termp_bk_pre(DECL_ARGS) |
|
Line 2007 termp_bk_pre(DECL_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->parent->args || 0 == n->prev->nchild) |
if (n->parent->args != NULL || n->prev->child == NULL) |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
break; |
break; |
default: |
default: |
Line 2217 termp_under_pre(DECL_ARGS) |
|
Line 2065 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 2234 termp_tag_pre(DECL_ARGS) |
|
Line 2102 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 && |