=================================================================== RCS file: /cvs/mandoc/mdoc_state.c,v retrieving revision 1.11 retrieving revision 1.17 diff -u -p -r1.11 -r1.17 --- mandoc/mdoc_state.c 2018/12/14 01:18:26 1.11 +++ mandoc/mdoc_state.c 2020/06/22 19:20:40 1.17 @@ -1,4 +1,4 @@ -/* $Id: mdoc_state.c,v 1.11 2018/12/14 01:18:26 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.17 2020/06/22 19:20:40 schwarze Exp $ */ /* * Copyright (c) 2014, 2015, 2017 Ingo Schwarze * @@ -14,6 +14,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + #include #include @@ -25,15 +27,14 @@ #include "roff.h" #include "mdoc.h" #include "libmandoc.h" +#include "roff_int.h" #include "libmdoc.h" #define STATE_ARGS struct roff_man *mdoc, struct roff_node *n 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); @@ -45,8 +46,8 @@ static const state_handler state_handlers[MDOC_MAX - M NULL, /* Ss */ NULL, /* Pp */ NULL, /* D1 */ - state_dl, /* Dl */ - state_bd, /* Bd */ + NULL, /* Dl */ + NULL, /* Bd */ NULL, /* Ed */ state_bl, /* Bl */ NULL, /* El */ @@ -158,6 +159,7 @@ static const state_handler state_handlers[MDOC_MAX - M NULL, /* %Q */ NULL, /* %U */ NULL, /* Ta */ + NULL, /* Tg */ }; @@ -178,34 +180,7 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n) (*handler)(mdoc, n); } -void -mdoc_state_reset(struct roff_man *mdoc) -{ - - roff_setreg(mdoc->roff, "nS", 0, '='); - mdoc->flags = 0; -} - 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; @@ -226,22 +201,6 @@ state_bl(STATE_ARGS) default: break; } - } -} - -static void -state_dl(STATE_ARGS) -{ - - switch (n->type) { - case ROFFT_HEAD: - mdoc->flags |= MDOC_LITERAL; - break; - case ROFFT_BODY: - mdoc->flags &= ~MDOC_LITERAL; - break; - default: - break; } }