diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2019-01-04 03:17:36 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-01-04 03:17:36 +0000 |
| commit | e513db850fd979df72529ff1e74db44e82704e92 (patch) | |
| tree | dd7acfd76add8568214e74f0394a528e914318bb | |
| parent | 6cf23e79eacb40b38dccfa2e1d89e593de735ea1 (diff) | |
| download | mandoc-e513db850fd979df72529ff1e74db44e82704e92.tar.gz mandoc-e513db850fd979df72529ff1e74db44e82704e92.tar.zst mandoc-e513db850fd979df72529ff1e74db44e82704e92.zip | |
Oops, i forgot to adjust this file to the changes in roff.h rev. 1.67.
Provide a handler for the new .nf and .fi roff(7) request nodes,
avoiding a potential crash, and correctly restore the former fill
more at .Ed even when there was .nf or .fi inside the block.
| -rw-r--r-- | mdoc_man.c | 43 |
1 files changed, 33 insertions, 10 deletions
@@ -1,6 +1,6 @@ -/* $Id: mdoc_man.c,v 1.131 2018/12/30 00:49:55 schwarze Exp $ */ +/* $Id: mdoc_man.c,v 1.132 2019/01/04 03:17:36 schwarze Exp $ */ /* - * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -104,6 +104,7 @@ static int pre_lk(DECL_ARGS); static int pre_li(DECL_ARGS); static int pre_nm(DECL_ARGS); static int pre_no(DECL_ARGS); +static void pre_noarg(DECL_ARGS); static int pre_ns(DECL_ARGS); static void pre_onearg(DECL_ARGS); static int pre_pp(DECL_ARGS); @@ -128,9 +129,11 @@ static void print_node(DECL_ARGS); static const void_fp roff_man_acts[ROFF_MAX] = { pre_br, /* br */ pre_onearg, /* ce */ + pre_noarg, /* fi */ pre_ft, /* ft */ pre_onearg, /* ll */ pre_onearg, /* mc */ + pre_noarg, /* nf */ pre_onearg, /* po */ pre_onearg, /* rj */ pre_sp, /* sp */ @@ -936,7 +939,6 @@ post_aq(DECL_ARGS) static int pre_bd(DECL_ARGS) { - outflags &= ~(MMAN_PP | MMAN_sp | MMAN_br); if (DISP_unfilled == n->norm->Bd.type || @@ -951,12 +953,27 @@ pre_bd(DECL_ARGS) static void post_bd(DECL_ARGS) { + enum roff_tok bef, now; /* Close out this display. */ print_line(".RE", MMAN_nl); - if (DISP_unfilled == n->norm->Bd.type || - DISP_literal == n->norm->Bd.type) - print_line(".fi", MMAN_nl); + bef = n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi; + if (n->last == NULL) + now = n->norm->Bd.type == DISP_unfilled || + n->norm->Bd.type == DISP_literal ? ROFF_nf : ROFF_fi; + else if (n->last->tok == ROFF_nf) + now = ROFF_nf; + else if (n->last->tok == ROFF_fi) + now = ROFF_fi; + else + now = n->last->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi; + if (bef != now) { + outflags |= MMAN_nl; + print_word("."); + outflags &= ~MMAN_spc; + print_word(roff_name[bef]); + outflags |= MMAN_nl; + } /* Maybe we are inside an enclosing list? */ if (NULL != n->parent->next) @@ -1607,7 +1624,6 @@ pre_onearg(DECL_ARGS) static int pre_li(DECL_ARGS) { - font_push('R'); return 1; } @@ -1640,7 +1656,6 @@ pre_nm(DECL_ARGS) static void post_nm(DECL_ARGS) { - switch (n->type) { case ROFFT_BLOCK: outflags &= ~MMAN_Bk; @@ -1658,15 +1673,23 @@ post_nm(DECL_ARGS) static int pre_no(DECL_ARGS) { - outflags |= MMAN_spc_force; return 1; } +static void +pre_noarg(DECL_ARGS) +{ + outflags |= MMAN_nl; + print_word("."); + outflags &= ~MMAN_spc; + print_word(roff_name[n->tok]); + outflags |= MMAN_nl; +} + static int pre_ns(DECL_ARGS) { - outflags &= ~MMAN_spc; return 0; } |