version 1.333, 2016/11/08 16:04:57 |
version 1.339, 2017/01/10 21:59:47 |
|
|
/* $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-2016 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 95 static int termp_bx_pre(DECL_ARGS); |
|
Line 96 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 121 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 187 static const struct termact termacts[MDOC_MAX] = { |
|
Line 190 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 */ |
{ termp_bx_pre, NULL }, /* Bx */ |
{ termp_skip_pre, NULL }, /* Db */ |
{ termp_skip_pre, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
Line 195 static const struct termact termacts[MDOC_MAX] = { |
|
Line 198 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, 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 221 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 243 static const struct termact termacts[MDOC_MAX] = { |
|
Line 246 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 }, /* br */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_sp_pre, NULL }, /* sp */ |
Line 283 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 286 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 314 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 331 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 343 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 377 print_mdoc_node(DECL_ARGS) |
|
Line 385 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 || NODE_ENDED & n->flags) |
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 395 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 |
* End of line terminating an implicit block |
Line 399 print_mdoc_node(DECL_ARGS) |
|
Line 407 print_mdoc_node(DECL_ARGS) |
|
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) { |
if (MDOC_ll != n->tok) { |
Line 562 print_bvspace(struct termp *p, |
|
Line 570 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 1042 termp_fl_pre(DECL_ARGS) |
|
Line 1052 termp_fl_pre(DECL_ARGS) |
|
if (!(n->child == NULL && |
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 1253 synopsis_pre(struct termp *p, const struct roff_node * |
|
Line 1263 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; |
|
|
/* |
/* |
|
|
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); |
} |
} |
|
|
|
|
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 1442 termp_fn_pre(DECL_ARGS) |
|
Line 1452 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 1460 termp_fn_pre(DECL_ARGS) |
|
Line 1470 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 1608 termp_bd_pre(DECL_ARGS) |
|
Line 1618 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 1668 termp_bx_pre(DECL_ARGS) |
|
Line 1678 termp_bx_pre(DECL_ARGS) |
|
static int |
static int |
termp_xx_pre(DECL_ARGS) |
termp_xx_pre(DECL_ARGS) |
{ |
{ |
const char *pp; |
if ((n->aux = p->flags & TERMP_PREKEEP) == 0) |
int flags; |
p->flags |= TERMP_PREKEEP; |
|
return 1; |
|
} |
|
|
pp = NULL; |
static void |
switch (n->tok) { |
termp_xx_post(DECL_ARGS) |
case MDOC_Bsx: |
{ |
pp = "BSD/OS"; |
if (n->aux == 0) |
break; |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
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 1760 termp_in_pre(DECL_ARGS) |
|
Line 1749 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); |
} |
} |
|
|
Line 1990 termp_fo_pre(DECL_ARGS) |
|
Line 1979 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 2036 termp_fo_post(DECL_ARGS) |
|
Line 2025 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; |
} |
} |
Line 2214 termp_under_pre(DECL_ARGS) |
|
Line 2204 termp_under_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
|
return 1; |
|
} |
|
|
|
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; |
return 1; |
} |
} |
|
|