Bugfix:

[mandoc.git] / mdoc_state.c

diff --git a/mdoc_state.c b/mdoc_state.c
index 4e376ef07347ea9f7b45f70be68d96d8b17447df..22a3d268d6eae2b92ce0bb841820fb7ecbd1ede4 100644 (file)
--- a/mdoc_state.c
+++ b/mdoc_state.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_state.c,v 1.4 2017/01/10 13:47:00 schwarze Exp $ */
+/*     $Id: mdoc_state.c,v 1.11 2018/12/14 01:18:26 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,8 @@
  */
 #include <sys/types.h>
 
+#include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,8 +37,7 @@ 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 */
@@ -52,6 +53,7 @@ static        const state_handler state_handlers[MDOC_MAX] = {
        NULL,           /* It */
        NULL,           /* Ad */
        NULL,           /* An */
+       NULL,           /* Ap */
        NULL,           /* Ar */
        NULL,           /* Cd */
        NULL,           /* Cm */
@@ -154,11 +156,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 */
 };
 
 
@@ -167,13 +166,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);
 }
@@ -208,19 +208,24 @@ 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;
 
-       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;
+       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;
+               }
        }
 }