Switch on the `TS' documentation in roff.7. As per off-line discussion,

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 6a65ea6d6efb44e326b2874d2fd3b1dd1cf6fd13..f5ac5be7042e1b163bcc76a1601e3800b720f99c 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.143 2010/12/16 00:57:50 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.150 2011/01/01 12:18:37 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -329,12 +329,19 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
        int              line, pos;
        char            *tp;
 
        int              line, pos;
        char            *tp;
 

-       if (MDOC_TEXT == n->type) {
+       switch (n->type) {
+       case (MDOC_TEXT):

                tp = n->string;
                line = n->line;
                pos = n->pos;
                check_text(mdoc, line, pos, tp);
                tp = n->string;
                line = n->line;
                pos = n->pos;
                check_text(mdoc, line, pos, tp);

+               /* FALLTHROUGH */
+       case (MDOC_TBL):
+               /* FALLTHROUGH */
+       case (MDOC_ROOT):

                return(1);
                return(1);

+       default:
+               break;

        }
 
        check_args(mdoc, n);
        }
 
        check_args(mdoc, n);


@@ -357,10 +364,16 @@ mdoc_valid_post(struct mdoc *mdoc)
                return(1);
        mdoc->last->flags |= MDOC_VALID;
 
                return(1);
        mdoc->last->flags |= MDOC_VALID;
 

-       if (MDOC_TEXT == mdoc->last->type)
+       switch (mdoc->last->type) {
+       case (MDOC_TEXT):
+               /* FALLTHROUGH */
+       case (MDOC_TBL):

                return(1);
                return(1);

-       if (MDOC_ROOT == mdoc->last->type)
+       case (MDOC_ROOT):

                return(post_root(mdoc));
                return(post_root(mdoc));

+       default:
+               break;
+       }

 
        if (NULL == mdoc_valids[mdoc->last->tok].post)
                return(1);
 
        if (NULL == mdoc_valids[mdoc->last->tok].post)
                return(1);


@@ -609,8 +622,6 @@ pre_bl(PRE_ARGS)
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bl == np->tok);
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bl == np->tok);

-               assert(np->data.Bl);
-               n->data.Bl = np->data.Bl;

                return(1);
        }
 
                return(1);
        }
 


@@ -620,9 +631,6 @@ pre_bl(PRE_ARGS)
         * ones.  If we find no list type, we default to LIST_item.
         */
 
         * ones.  If we find no list type, we default to LIST_item.
         */
 

-       assert(NULL == n->data.Bl);
-       n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));
-

        /* LINTED */
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                lt = LIST__NONE;
        /* LINTED */
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                lt = LIST__NONE;


@@ -665,18 +673,18 @@ pre_bl(PRE_ARGS)
                        break;
                /* Set list arguments. */
                case (MDOC_Compact):
                        break;
                /* Set list arguments. */
                case (MDOC_Compact):

-                       dup = n->data.Bl->comp;
+                       dup = n->norm->Bl.comp;

                        comp = 1;
                        break;
                case (MDOC_Width):
                        comp = 1;
                        break;
                case (MDOC_Width):

-                       dup = (NULL != n->data.Bl->width);
+                       dup = (NULL != n->norm->Bl.width);

                        width = n->args->argv[i].value[0];
                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];
                        width = n->args->argv[i].value[0];
                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];

-                               dup = (NULL != n->data.Bl->offs);
+                               dup = (NULL != n->norm->Bl.offs);

                                break;
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                                break;
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);


@@ -691,36 +699,36 @@ pre_bl(PRE_ARGS)
                        mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
 
                if (comp && ! dup)
                        mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
 
                if (comp && ! dup)

-                       n->data.Bl->comp = comp;
+                       n->norm->Bl.comp = comp;

                if (offs && ! dup)
                if (offs && ! dup)

-                       n->data.Bl->offs = offs;
+                       n->norm->Bl.offs = offs;

                if (width && ! dup)
                if (width && ! dup)

-                       n->data.Bl->width = width;
+                       n->norm->Bl.width = width;

 
                /* Check: multiple list types. */
 
 
                /* Check: multiple list types. */
 

-               if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)
+               if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)

                        mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);
 
                /* Assign list type. */
 
                        mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);
 
                /* Assign list type. */
 

-               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
-                       n->data.Bl->type = lt;
+               if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {
+                       n->norm->Bl.type = lt;

                        /* Set column information, too. */
                        if (LIST_column == lt) {
                        /* Set column information, too. */
                        if (LIST_column == lt) {

-                               n->data.Bl->ncols = 
+                               n->norm->Bl.ncols = 

                                        n->args->argv[i].sz;
                                        n->args->argv[i].sz;

-                               n->data.Bl->cols = (const char **)
+                               n->norm->Bl.cols = (const char **)

                                        n->args->argv[i].value;
                        }
                }
 
                /* The list type should come first. */
 
                                        n->args->argv[i].value;
                        }
                }
 
                /* The list type should come first. */
 

-               if (n->data.Bl->type == LIST__NONE)
-                       if (n->data.Bl->width || 
-                                       n->data.Bl->offs || 
-                                       n->data.Bl->comp)
+               if (n->norm->Bl.type == LIST__NONE)
+                       if (n->norm->Bl.width || 
+                                       n->norm->Bl.offs || 
+                                       n->norm->Bl.comp)

                                mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
 
                continue;
                                mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
 
                continue;


@@ -728,9 +736,9 @@ pre_bl(PRE_ARGS)
 
        /* Allow lists to default to LIST_item. */
 
 
        /* Allow lists to default to LIST_item. */
 

-       if (LIST__NONE == n->data.Bl->type) {
+       if (LIST__NONE == n->norm->Bl.type) {

                mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);
                mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);

-               n->data.Bl->type = LIST_item;
+               n->norm->Bl.type = LIST_item;

        }
 
        /* 
        }
 
        /* 


@@ -739,9 +747,9 @@ pre_bl(PRE_ARGS)
         * and must also be warned.
         */
 
         * and must also be warned.
         */
 

-       switch (n->data.Bl->type) {
+       switch (n->norm->Bl.type) {

        case (LIST_tag):
        case (LIST_tag):

-               if (n->data.Bl->width)
+               if (n->norm->Bl.width)

                        break;
                mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
                break;
                        break;
                mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
                break;


@@ -754,7 +762,7 @@ pre_bl(PRE_ARGS)
        case (LIST_inset):
                /* FALLTHROUGH */
        case (LIST_item):
        case (LIST_inset):
                /* FALLTHROUGH */
        case (LIST_item):

-               if (n->data.Bl->width)
+               if (n->norm->Bl.width)

                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                break;
        default:
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                break;
        default:


@@ -783,14 +791,9 @@ pre_bd(PRE_ARGS)
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bd == np->tok);
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bd == np->tok);

-               assert(np->data.Bd);
-               n->data.Bd = np->data.Bd;

                return(1);
        }
 
                return(1);
        }
 

-       assert(NULL == n->data.Bd);
-       n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
-

        /* LINTED */
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                dt = DISP__NONE;
        /* LINTED */
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                dt = DISP__NONE;


@@ -820,14 +823,14 @@ pre_bd(PRE_ARGS)
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];

-                               dup = (NULL != n->data.Bd->offs);
+                               dup = (NULL != n->norm->Bd.offs);

                                break;
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;
                case (MDOC_Compact):
                        comp = 1;
                                break;
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;
                case (MDOC_Compact):
                        comp = 1;

-                       dup = n->data.Bd->comp;
+                       dup = n->norm->Bd.comp;

                        break;
                default:
                        abort();
                        break;
                default:
                        abort();


@@ -842,24 +845,24 @@ pre_bd(PRE_ARGS)
                /* Make our auxiliary assignments. */
 
                if (offs && ! dup)
                /* Make our auxiliary assignments. */
 
                if (offs && ! dup)

-                       n->data.Bd->offs = offs;
+                       n->norm->Bd.offs = offs;

                if (comp && ! dup)
                if (comp && ! dup)

-                       n->data.Bd->comp = comp;
+                       n->norm->Bd.comp = comp;

 
                /* Check whether a type has already been assigned. */
 
 
                /* Check whether a type has already been assigned. */
 

-               if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)
+               if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE)

                        mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);
 
                /* Make our type assignment. */
 
                        mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);
 
                /* Make our type assignment. */
 

-               if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)
-                       n->data.Bd->type = dt;
+               if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)
+                       n->norm->Bd.type = dt;

        }
 
        }
 

-       if (DISP__NONE == n->data.Bd->type) {
+       if (DISP__NONE == n->norm->Bd.type) {

                mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
                mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

-               n->data.Bd->type = DISP_ragged;
+               n->norm->Bd.type = DISP_ragged;

        }
 
        return(1);
        }
 
        return(1);


@@ -912,9 +915,9 @@ pre_an(PRE_ARGS)
                        n->args->argv[i].pos, MANDOCERR_IGNARGV);
 
        if (MDOC_Split == n->args->argv[0].arg)
                        n->args->argv[i].pos, MANDOCERR_IGNARGV);
 
        if (MDOC_Split == n->args->argv[0].arg)

-               n->data.An.auth = AUTH_split;
+               n->norm->An.auth = AUTH_split;

        else if (MDOC_Nosplit == n->args->argv[0].arg)
        else if (MDOC_Nosplit == n->args->argv[0].arg)

-               n->data.An.auth = AUTH_nosplit;
+               n->norm->An.auth = AUTH_nosplit;

        else
                abort();
 
        else
                abort();
 


@@ -996,15 +999,12 @@ post_bf(POST_ARGS)
                assert(np);
                assert(MDOC_HEAD == np->type);
                assert(MDOC_Bf == np->tok);
                assert(np);
                assert(MDOC_HEAD == np->type);
                assert(MDOC_Bf == np->tok);

-               assert(np->data.Bf);
-               mdoc->last->data.Bf = np->data.Bf;

                return(1);
        }
 
        np = mdoc->last;
        assert(MDOC_BLOCK == np->parent->type);
        assert(MDOC_Bf == np->parent->tok);
                return(1);
        }
 
        np = mdoc->last;
        assert(MDOC_BLOCK == np->parent->type);
        assert(MDOC_Bf == np->parent->tok);

-       np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));

 
        /* 
         * Cannot have both argument and parameter.
 
        /* 
         * Cannot have both argument and parameter.


@@ -1024,11 +1024,11 @@ post_bf(POST_ARGS)
        if (np->parent->args) {
                arg = np->parent->args->argv[0].arg;
                if (MDOC_Emphasis == arg)
        if (np->parent->args) {
                arg = np->parent->args->argv[0].arg;
                if (MDOC_Emphasis == arg)

-                       np->data.Bf->font = FONT_Em;
+                       np->norm->Bf.font = FONT_Em;

                else if (MDOC_Literal == arg)
                else if (MDOC_Literal == arg)

-                       np->data.Bf->font = FONT_Li;
+                       np->norm->Bf.font = FONT_Li;

                else if (MDOC_Symbolic == arg)
                else if (MDOC_Symbolic == arg)

-                       np->data.Bf->font = FONT_Sy;
+                       np->norm->Bf.font = FONT_Sy;

                else
                        abort();
                return(1);
                else
                        abort();
                return(1);


@@ -1037,11 +1037,11 @@ post_bf(POST_ARGS)
        /* Extract parameter into data. */
 
        if (0 == strcmp(np->child->string, "Em"))
        /* Extract parameter into data. */
 
        if (0 == strcmp(np->child->string, "Em"))

-               np->data.Bf->font = FONT_Em;
+               np->norm->Bf.font = FONT_Em;

        else if (0 == strcmp(np->child->string, "Li"))
        else if (0 == strcmp(np->child->string, "Li"))

-               np->data.Bf->font = FONT_Li;
+               np->norm->Bf.font = FONT_Li;

        else if (0 == strcmp(np->child->string, "Sy"))
        else if (0 == strcmp(np->child->string, "Sy"))

-               np->data.Bf->font = FONT_Sy;
+               np->norm->Bf.font = FONT_Sy;

        else 
                mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
 
        else 
                mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
 


@@ -1247,14 +1247,14 @@ post_an(POST_ARGS)
        struct mdoc_node *np;
 
        np = mdoc->last;
        struct mdoc_node *np;
 
        np = mdoc->last;

-       if (AUTH__NONE != np->data.An.auth && np->child)
+       if (AUTH__NONE != np->norm->An.auth && np->child)

                return(eerr_eq0(mdoc));
 
        /* 
         * FIXME: make this ewarn and make sure that the front-ends
         * don't print the arguments.
         */
                return(eerr_eq0(mdoc));
 
        /* 
         * FIXME: make this ewarn and make sure that the front-ends
         * don't print the arguments.
         */

-       if (AUTH__NONE != np->data.An.auth || np->child)
+       if (AUTH__NONE != np->norm->An.auth || np->child)

                return(1);
 
        mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);
                return(1);
 
        mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);


@@ -1274,8 +1274,7 @@ post_it(POST_ARGS)
                return(1);
 
        n = mdoc->last->parent->parent;
                return(1);
 
        n = mdoc->last->parent->parent;

-       assert(n->data.Bl);
-       lt = n->data.Bl->type;
+       lt = n->norm->Bl.type;

 
        if (LIST__NONE == lt) {
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
 
        if (LIST__NONE == lt) {
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);


@@ -1314,7 +1313,7 @@ post_it(POST_ARGS)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
                break;
        case (LIST_column):
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
                break;
        case (LIST_column):

-               cols = (int)n->data.Bl->ncols;
+               cols = (int)n->norm->Bl.ncols;

 
                assert(NULL == mdoc->last->head->child);
 
 
                assert(NULL == mdoc->last->head->child);
 


@@ -1358,17 +1357,17 @@ post_bl_block(POST_ARGS)
 
        n = mdoc->last;
 
 
        n = mdoc->last;
 

-       if (LIST_tag == n->data.Bl->type && 
-                       NULL == n->data.Bl->width) {
+       if (LIST_tag == n->norm->Bl.type && 
+                       NULL == n->norm->Bl.width) {

                if ( ! post_bl_block_tag(mdoc))
                        return(0);
                if ( ! post_bl_block_tag(mdoc))
                        return(0);

-       } else if (NULL != n->data.Bl->width) {
+       } else if (NULL != n->norm->Bl.width) {

                if ( ! post_bl_block_width(mdoc))
                        return(0);
        } else 
                return(1);
 
                if ( ! post_bl_block_width(mdoc))
                        return(0);
        } else 
                return(1);
 

-       assert(n->data.Bl->width);
+       assert(n->norm->Bl.width);

        return(1);
 }
 
        return(1);
 }
 


@@ -1392,9 +1391,9 @@ post_bl_block_width(POST_ARGS)
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 

-       if (0 == strcmp(n->data.Bl->width, "Ds"))
+       if (0 == strcmp(n->norm->Bl.width, "Ds"))

                width = 6;
                width = 6;

-       else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))
+       else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))

                return(1);
        else if (0 == (width = mdoc_macro2len(tok)))  {
                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
                return(1);
        else if (0 == (width = mdoc_macro2len(tok)))  {
                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);


@@ -1416,7 +1415,7 @@ post_bl_block_width(POST_ARGS)
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 
        /* Set our width! */
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 
        /* Set our width! */

-       n->data.Bl->width = n->args->argv[i].value[0];
+       n->norm->Bl.width = n->args->argv[i].value[0];

        return(1);
 }
 
        return(1);
 }
 


@@ -1482,7 +1481,7 @@ post_bl_block_tag(POST_ARGS)
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 
        /* Set our width! */
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 
        /* Set our width! */

-       n->data.Bl->width = n->args->argv[i].value[0];
+       n->norm->Bl.width = n->args->argv[i].value[0];

        return(1);
 }
 
        return(1);
 }
 


@@ -1493,7 +1492,7 @@ post_bl_head(POST_ARGS)
        struct mdoc_node *np, *nn, *nnp;
        int               i, j;
 
        struct mdoc_node *np, *nn, *nnp;
        int               i, j;
 

-       if (LIST_column != mdoc->last->data.Bl->type)
+       if (LIST_column != mdoc->last->norm->Bl.type)

                /* FIXME: this should be ERROR class... */
                return(hwarn_eq0(mdoc));
 
                /* FIXME: this should be ERROR class... */
                return(hwarn_eq0(mdoc));
 


@@ -1510,7 +1509,7 @@ post_bl_head(POST_ARGS)
         * lists, but I'll leave that for another day.
         */
 
         * lists, but I'll leave that for another day.
         */
 

-       if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) {
+       if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) {

                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
                return(0);
        } else if (NULL == mdoc->last->child)
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
                return(0);
        } else if (NULL == mdoc->last->child)


@@ -1536,8 +1535,8 @@ post_bl_head(POST_ARGS)
        np->args->argv[j].value = mandoc_malloc
                ((size_t)mdoc->last->nchild * sizeof(char *));
 
        np->args->argv[j].value = mandoc_malloc
                ((size_t)mdoc->last->nchild * sizeof(char *));
 

-       mdoc->last->data.Bl->ncols = np->args->argv[j].sz;
-       mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value;
+       mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
+       mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;

 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;
 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;


@@ -1567,12 +1566,14 @@ post_bl(POST_ARGS)
 
        for (n = mdoc->last->child; n; n = n->next) {
                switch (n->tok) {
 
        for (n = mdoc->last->child; n; n = n->next) {
                switch (n->tok) {

-               case (MDOC_It):
-                       continue;
-               case (MDOC_Sm):
+               case (MDOC_Lp):

                        /* FALLTHROUGH */
                case (MDOC_Pp):
                        mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
                        /* FALLTHROUGH */
                case (MDOC_Pp):
                        mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);

+                       /* FALLTHROUGH */
+               case (MDOC_It):
+                       /* FALLTHROUGH */
+               case (MDOC_Sm):

                        continue;
                default:
                        break;
                        continue;
                default:
                        break;


@@ -1678,6 +1679,8 @@ post_rs(POST_ARGS)
                                break;
 
                if (i < RSORD_MAX) {
                                break;
 
                if (i < RSORD_MAX) {

+                       if (MDOC__J == rsord[i])
+                               mdoc->last->norm->Rs.child_J = nn;

                        next = nn->next;
                        continue;
                }
                        next = nn->next;
                        continue;
                }


@@ -1917,11 +1920,11 @@ pre_par(PRE_ARGS)
 
        if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
                return(1);
 
        if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
                return(1);

-       if (MDOC_Bl == n->tok && n->data.Bl->comp)
+       if (MDOC_Bl == n->tok && n->norm->Bl.comp)

                return(1);
                return(1);

-       if (MDOC_Bd == n->tok && n->data.Bd->comp)
+       if (MDOC_Bd == n->tok && n->norm->Bd.comp)

                return(1);
                return(1);

-       if (MDOC_It == n->tok && n->parent->data.Bl->comp)
+       if (MDOC_It == n->tok && n->parent->norm->Bl.comp)

                return(1);
 
        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
                return(1);
 
        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);


@@ -1946,10 +1949,9 @@ pre_literal(PRE_ARGS)
                mdoc->flags |= MDOC_LITERAL;
                break;
        case (MDOC_Bd):
                mdoc->flags |= MDOC_LITERAL;
                break;
        case (MDOC_Bd):

-               assert(n->data.Bd);
-               if (DISP_literal == n->data.Bd->type)
+               if (DISP_literal == n->norm->Bd.type)

                        mdoc->flags |= MDOC_LITERAL;
                        mdoc->flags |= MDOC_LITERAL;

-               if (DISP_unfilled == n->data.Bd->type)
+               if (DISP_unfilled == n->norm->Bd.type)

                        mdoc->flags |= MDOC_LITERAL;
                break;
        default:
                        mdoc->flags |= MDOC_LITERAL;
                break;
        default: