===================================================================
RCS file: /cvs/mandoc/mdoc_state.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- mandoc/mdoc_state.c	2015/10/20 02:01:32	1.1
+++ mandoc/mdoc_state.c	2017/05/04 17:48:29	1.6
@@ -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.6 2017/05/04 17:48:29 schwarze Exp $ */
 /*
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017 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
@@ -16,6 +16,7 @@
  */
 #include <sys/types.h>
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -30,12 +31,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 +47,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,12 +155,12 @@ static	const state_handler state_handlers[MDOC_MAX] = 
 	NULL,		/* En */
 	NULL,		/* Dx */
 	NULL,		/* %Q */
-	NULL,		/* br */
 	NULL,		/* sp */
 	NULL,		/* %U */
 	NULL,		/* Ta */
 	NULL,		/* ll */
 };
+static const state_handler *const state_handlers = __state_handlers - MDOC_Dd;
 
 
 void
@@ -166,9 +168,10 @@ 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;
 
+	assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
 	if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE))
 		mdoc->flags |= MDOC_PBODY;
 
@@ -194,6 +197,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 +208,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)
 {
 
@@ -226,7 +251,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);