diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2017-04-24 23:06:17 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-04-24 23:06:17 +0000 |
commit | 3690be6ec251dbce20a23ecadfcebabd645f874d (patch) | |
tree | 5a3b8871e3ed91a8f886f916529e2e83addd34b3 /man_html.c | |
parent | af17862b1d7e4ad39b12a7e6df025e553d1c1dbe (diff) | |
download | mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.tar.gz mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.tar.zst mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.zip |
Continue parser unification:
* Make enum rofft an internal interface as enum roff_tok in "roff.h".
* Represent mdoc and man macros in enum roff_tok.
* Make TOKEN_NONE a proper enum value and use it throughout.
* Put the prologue macros first in the macro tables.
* Unify mdoc_macroname[] and man_macroname[] into roff_name[].
Diffstat (limited to 'man_html.c')
-rw-r--r-- | man_html.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.135 2017/03/17 12:10:16 schwarze Exp $ */ +/* $Id: man_html.c,v 1.136 2017/04/24 23:06:18 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -71,8 +71,7 @@ static int man_in_pre(MAN_ARGS); static void man_root_post(MAN_ARGS); static void man_root_pre(MAN_ARGS); -static const struct htmlman mans[MAN_MAX] = { - { man_br_pre, NULL }, /* br */ +static const struct htmlman __mans[MAN_MAX - MAN_TH] = { { NULL, NULL }, /* TH */ { man_SH_pre, NULL }, /* SH */ { man_SS_pre, NULL }, /* SS */ @@ -93,6 +92,7 @@ static const struct htmlman mans[MAN_MAX] = { { man_I_pre, NULL }, /* I */ { man_alt_pre, NULL }, /* IR */ { man_alt_pre, NULL }, /* RI */ + { man_br_pre, NULL }, /* br */ { man_br_pre, NULL }, /* sp */ { NULL, NULL }, /* nf */ { NULL, NULL }, /* fi */ @@ -111,6 +111,7 @@ static const struct htmlman mans[MAN_MAX] = { { NULL, NULL }, /* UE */ { man_ign_pre, NULL }, /* ll */ }; +static const struct htmlman *const mans = __mans - MAN_TH; /* |