diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2019-01-01 07:42:04 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-01-01 07:42:04 +0000 |
| commit | 2fd178dd414bc5241e3bfcc62b303d84f58bb147 (patch) | |
| tree | 4187ab4a60894ec5219556473df4b1e2af8d690c /mdoc_state.c | |
| parent | e622f2f088e1e43491b5e037c6d38b5cdece150e (diff) | |
| download | mandoc-2fd178dd414bc5241e3bfcc62b303d84f58bb147.tar.gz mandoc-2fd178dd414bc5241e3bfcc62b303d84f58bb147.tar.zst mandoc-2fd178dd414bc5241e3bfcc62b303d84f58bb147.zip | |
Correctly set the ROFF_NOFILL parser flag for .Bd .Ed .Sh, such
that children and later siblings get correct NODE_NOFILL assignments.
This doesn't change rendering yet but prepares for future rendering
improvements.
Diffstat (limited to 'mdoc_state.c')
| -rw-r--r-- | mdoc_state.c | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/mdoc_state.c b/mdoc_state.c index c0f3c430..f9a585e7 100644 --- a/mdoc_state.c +++ b/mdoc_state.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_state.c,v 1.14 2018/12/31 07:46:07 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.15 2019/01/01 07:42:04 schwarze Exp $ */ /* * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -32,9 +32,7 @@ typedef void (*state_handler)(STATE_ARGS); -static void state_bd(STATE_ARGS); static void state_bl(STATE_ARGS); -static void state_dl(STATE_ARGS); static void state_sh(STATE_ARGS); static void state_sm(STATE_ARGS); @@ -46,8 +44,8 @@ static const state_handler state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* Ss */ NULL, /* Pp */ NULL, /* D1 */ - state_dl, /* Dl */ - state_bd, /* Bd */ + NULL, /* Dl */ + NULL, /* Bd */ NULL, /* Ed */ state_bl, /* Bl */ NULL, /* El */ @@ -180,25 +178,6 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n) } static void -state_bd(STATE_ARGS) -{ - enum mdocargt arg; - - if (n->type != ROFFT_HEAD && - (n->type != ROFFT_BODY || n->end != ENDBODY_NOT)) - return; - - if (n->parent->args == NULL) - return; - - arg = n->parent->args->argv[0].arg; - if (arg != MDOC_Literal && arg != MDOC_Unfilled) - return; - - state_dl(mdoc, n); -} - -static void state_bl(STATE_ARGS) { struct mdoc_arg *args; @@ -223,22 +202,6 @@ state_bl(STATE_ARGS) } static void -state_dl(STATE_ARGS) -{ - - switch (n->type) { - case ROFFT_HEAD: - mdoc->flags |= ROFF_NOFILL; - break; - case ROFFT_BODY: - mdoc->flags &= ~ROFF_NOFILL; - break; - default: - break; - } -} - -static void state_sh(STATE_ARGS) { struct roff_node *nch; |