diff options
| author |   schwarze <schwarze@openbsd.org> | 2018-12-03 21:00:06 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2018-12-03 21:00:06 +0000 |
| commit | 7c539ecbb26b558e22990951d3f92863abc47ab8 (patch) | |
| tree | 58fef690d527c725a0a7aa05b8d2709a138e9868 /usr.bin/mandoc/man_html.c | |
| parent | adapt to the change in mansearch.c rev. 1.62; (diff) | |
| download | wireguard-openbsd-7c539ecbb26b558e22990951d3f92863abc47ab8.tar.xz wireguard-openbsd-7c539ecbb26b558e22990951d3f92863abc47ab8.zip | |
In the validators, translate obsolete macro aliases (Lp, Ot, LP, P)
to the standard forms (Pp, Ft, PP) up front, such that later code
does not need to look for the obsolete versions.
This reduces the risk of incomplete handling.
Diffstat (limited to 'usr.bin/mandoc/man_html.c')
| -rw-r--r-- | usr.bin/mandoc/man_html.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index f23a0bd6f89..bba005d9bd8 100644 --- a/usr.bin/mandoc/man_html.c +++ b/usr.bin/mandoc/man_html.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_html.c,v 1.110 2018/10/23 17:17:54 schwarze Exp $ */ +/* $OpenBSD: man_html.c,v 1.111 2018/12/03 21:00:06 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -61,6 +61,7 @@ static int man_SM_pre(MAN_ARGS); static int man_SS_pre(MAN_ARGS); static int man_SY_pre(MAN_ARGS); static int man_UR_pre(MAN_ARGS); +static int man_abort_pre(MAN_ARGS); static int man_alt_pre(MAN_ARGS); static int man_ign_pre(MAN_ARGS); static int man_in_pre(MAN_ARGS); @@ -75,9 +76,9 @@ static const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = { { man_SS_pre, NULL }, /* SS */ { man_IP_pre, NULL }, /* TP */ { man_IP_pre, NULL }, /* TQ */ - { man_PP_pre, NULL }, /* LP */ + { man_abort_pre, NULL }, /* LP */ { man_PP_pre, NULL }, /* PP */ - { man_PP_pre, NULL }, /* P */ + { man_abort_pre, NULL }, /* P */ { man_IP_pre, NULL }, /* IP */ { man_HP_pre, NULL }, /* HP */ { man_SM_pre, NULL }, /* SM */ @@ -232,10 +233,8 @@ print_man_node(MAN_ARGS) want_fillmode = MAN_fi; /* FALLTHROUGH */ case MAN_PP: /* These have no head. */ - case MAN_LP: /* They will simply */ - case MAN_P: /* reopen .nf in the body. */ - case MAN_RS: - case MAN_UR: + case MAN_RS: /* They will simply */ + case MAN_UR: /* reopen .nf in the body. */ case MAN_MT: fillmode(h, MAN_fi); break; @@ -670,3 +669,9 @@ man_UR_pre(MAN_ARGS) return 0; } + +static int +man_abort_pre(MAN_ARGS) +{ + abort(); +} |