diff options
Diffstat (limited to 'man_term.c')
| -rw-r--r-- | man_term.c | 36 |
1 files changed, 22 insertions, 14 deletions
@@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.213 2018/08/16 23:43:37 schwarze Exp $ */ +/* $Id: man_term.c,v 1.214 2018/08/17 20:33:37 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -51,7 +51,7 @@ struct mtermp { struct roff_node *n, \ const struct roff_meta *meta -struct termact { +struct man_term_act { int (*pre)(DECL_ARGS); void (*post)(DECL_ARGS); int flags; @@ -93,7 +93,7 @@ static void post_SS(DECL_ARGS); static void post_TP(DECL_ARGS); static void post_UR(DECL_ARGS); -static const struct termact __termacts[MAN_MAX - MAN_TH] = { +static const struct man_term_act man_term_acts[MAN_MAX - MAN_TH] = { { NULL, NULL, 0 }, /* TH */ { pre_SH, post_SH, 0 }, /* SH */ { pre_SS, post_SS, 0 }, /* SS */ @@ -132,9 +132,16 @@ static const struct termact __termacts[MAN_MAX - MAN_TH] = { { pre_UR, post_UR, 0 }, /* MT */ { NULL, NULL, 0 }, /* ME */ }; -static const struct termact *termacts = __termacts - MAN_TH; +static const struct man_term_act *man_term_act(enum roff_tok); +static const struct man_term_act * +man_term_act(enum roff_tok tok) +{ + assert(tok >= MAN_TH && tok <= MAN_MAX); + return man_term_acts + (tok - MAN_TH); +} + void terminal_man(void *arg, const struct roff_man *man) { @@ -676,7 +683,7 @@ pre_SS(DECL_ARGS) do { n = n->prev; } while (n != NULL && n->tok >= MAN_TH && - termacts[n->tok].flags & MAN_NOTEXT); + man_term_act(n->tok)->flags & MAN_NOTEXT); if (n == NULL || n->type == ROFFT_COMMENT || (n->tok == MAN_SS && n->body->child == NULL)) break; @@ -739,7 +746,7 @@ pre_SH(DECL_ARGS) do { n = n->prev; } while (n != NULL && n->tok >= MAN_TH && - termacts[n->tok].flags & MAN_NOTEXT); + man_term_act(n->tok)->flags & MAN_NOTEXT); if (n == NULL || n->type == ROFFT_COMMENT || (n->tok == MAN_SH && n->body->child == NULL)) break; @@ -868,7 +875,8 @@ post_UR(DECL_ARGS) static void print_man_node(DECL_ARGS) { - int c; + const struct man_term_act *act; + int c; switch (n->type) { case ROFFT_TEXT: @@ -914,20 +922,20 @@ print_man_node(DECL_ARGS) return; } - assert(n->tok >= MAN_TH && n->tok <= MAN_MAX); - if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) + act = man_term_act(n->tok); + if ((act->flags & MAN_NOTEXT) == 0) term_fontrepl(p, TERMFONT_NONE); c = 1; - if (termacts[n->tok].pre) - c = (*termacts[n->tok].pre)(p, mt, n, meta); + if (act->pre != NULL) + c = (*act->pre)(p, mt, n, meta); if (c && n->child) print_man_nodelist(p, mt, n->child, meta); - if (termacts[n->tok].post) - (*termacts[n->tok].post)(p, mt, n, meta); - if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) + if (act->post != NULL) + (*act->post)(p, mt, n, meta); + if ((act->flags & MAN_NOTEXT) == 0) term_fontrepl(p, TERMFONT_NONE); out: |