=================================================================== RCS file: /cvs/mandoc/mdoc_state.c,v retrieving revision 1.1 retrieving revision 1.12 diff -u -p -r1.1 -r1.12 --- mandoc/mdoc_state.c 2015/10/20 02:01:32 1.1 +++ mandoc/mdoc_state.c 2018/12/30 00:49:55 1.12 @@ -1,6 +1,6 @@ -/* $Id: mdoc_state.c,v 1.1 2015/10/20 02:01:32 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.12 2018/12/30 00:49:55 schwarze Exp $ */ /* - * Copyright (c) 2014, 2015 Ingo Schwarze + * Copyright (c) 2014, 2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,6 +16,8 @@ */ #include +#include +#include #include #include @@ -23,6 +25,7 @@ #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 @@ -30,12 +33,12 @@ 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); -static const state_handler state_handlers[MDOC_MAX] = { - NULL, /* Ap */ +static const state_handler state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* Dd */ NULL, /* Dt */ NULL, /* Os */ @@ -46,11 +49,12 @@ 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 */ NULL, /* An */ + NULL, /* Ap */ NULL, /* Ar */ NULL, /* Cd */ NULL, /* Cm */ @@ -153,11 +157,8 @@ static const state_handler state_handlers[MDOC_MAX] = NULL, /* En */ NULL, /* Dx */ NULL, /* %Q */ - NULL, /* br */ - NULL, /* sp */ NULL, /* %U */ NULL, /* Ta */ - NULL, /* ll */ }; @@ -166,13 +167,14 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n) { state_handler handler; - if (n->tok == TOKEN_NONE) + if (n->tok == TOKEN_NONE || n->tok < ROFF_MAX) return; - if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE)) + assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); + if ((mdoc_macro(n->tok)->flags & MDOC_PROLOGUE) == 0) mdoc->flags |= MDOC_PBODY; - handler = state_handlers[n->tok]; + handler = state_handlers[n->tok - MDOC_Dd]; if (*handler) (*handler)(mdoc, n); } @@ -194,6 +196,9 @@ state_bd(STATE_ARGS) (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; @@ -202,6 +207,30 @@ state_bd(STATE_ARGS) } static void +state_bl(STATE_ARGS) +{ + struct mdoc_arg *args; + size_t i; + + if (n->type != ROFFT_HEAD || n->parent->args == NULL) + return; + + args = n->parent->args; + for (i = 0; i < args->argc; i++) { + switch(args->argv[i].arg) { + case MDOC_Diag: + n->norm->Bl.type = LIST_diag; + return; + case MDOC_Column: + n->norm->Bl.type = LIST_column; + return; + default: + break; + } + } +} + +static void state_dl(STATE_ARGS) { @@ -226,7 +255,7 @@ state_sh(STATE_ARGS) if (n->type != ROFFT_HEAD) return; - if ( ! (n->flags & MDOC_VALID)) { + if ( ! (n->flags & NODE_VALID)) { secname = NULL; deroff(&secname, n);