diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-10-21 23:51:11 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-10-21 23:51:11 +0000 |
| commit | 56bf7e8b9228994f0a7e6486d7dc6ce9ff9fb51d (patch) | |
| tree | 9dd41221182398bcca78ba639f0743bf6520d448 /mdoc_state.c | |
| parent | 8a6d6ac9ce00755e9537a67b9a9dd8f4c4e76d09 (diff) | |
| download | mandoc-56bf7e8b9228994f0a7e6486d7dc6ce9ff9fb51d.tar.gz mandoc-56bf7e8b9228994f0a7e6486d7dc6ce9ff9fb51d.tar.zst mandoc-56bf7e8b9228994f0a7e6486d7dc6ce9ff9fb51d.zip | |
Move all mdoc(7) node validation done before child parsing
to the new separate validation pass, except for a tiny bit
needed by the parser which goes to the new mdoc_state() module;
cleaner, simpler, and surprisingly also shorter by 15 lines.
Diffstat (limited to 'mdoc_state.c')
| -rw-r--r-- | mdoc_state.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/mdoc_state.c b/mdoc_state.c index 061092ce..7fc76dcb 100644 --- a/mdoc_state.c +++ b/mdoc_state.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_state.c,v 1.1 2015/10/20 02:01:32 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.2 2015/10/21 23:51:11 schwarze Exp $ */ /* * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> * @@ -30,6 +30,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,7 +47,7 @@ static const state_handler state_handlers[MDOC_MAX] = { state_dl, /* Dl */ state_bd, /* Bd */ NULL, /* Ed */ - NULL, /* Bl */ + state_bl, /* Bl */ NULL, /* El */ NULL, /* It */ NULL, /* Ad */ @@ -202,6 +203,25 @@ state_bd(STATE_ARGS) } static void +state_bl(STATE_ARGS) +{ + + if (n->type != ROFFT_HEAD || n->parent->args == NULL) + return; + + switch(n->parent->args->argv[0].arg) { + case MDOC_Diag: + n->norm->Bl.type = LIST_diag; + break; + case MDOC_Column: + n->norm->Bl.type = LIST_column; + break; + default: + break; + } +} + +static void state_dl(STATE_ARGS) { |