Cache all of `Bd's resolved arguments into mdoc_bd, which is stashed in

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index ddb8b20198bed11c35aebe66534361ef908ca4ed..e103eb980068d028f121a5f7033e2c99acbdbbf7 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.64 2010/05/31 10:28:04 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.67 2010/06/12 11:21:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -948,8 +948,7 @@ pre_offset(PRE_ARGS)
         * stipulated by mdoc.samples. 
         */
 
-       assert(n->args);
-       for (i = 0; i < (int)n->args->argc; i++) {
+       for (i = 0; n->args && i < (int)n->args->argc; i++) {
                if (MDOC_Offset != n->args->argv[i].arg) 
                        continue;
                if (n->args->argv[i].sz)
@@ -969,83 +968,24 @@ pre_offset(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-       int              pos;
-
-       if (MDOC_BLOCK != n->type) {
-               assert(n->parent);
-               assert(MDOC_BLOCK == n->parent->type);
-               assert(MDOC_Bl == n->parent->tok);
-               assert(LIST__NONE != n->parent->data.list);
-               n->data.list = n->parent->data.list;
-               return(1);
-       }
-
-       assert(LIST__NONE == n->data.list);
-
-       for (pos = 0; pos < (int)n->args->argc; pos++) {
-               switch (n->args->argv[pos].arg) {
-               case (MDOC_Bullet):
-                       n->data.list = LIST_bullet;
-                       break;
-               case (MDOC_Dash):
-                       n->data.list = LIST_dash;
-                       break;
-               case (MDOC_Enum):
-                       n->data.list = LIST_enum;
-                       break;
-               case (MDOC_Hyphen):
-                       n->data.list = LIST_hyphen;
-                       break;
-               case (MDOC_Item):
-                       n->data.list = LIST_item;
-                       break;
-               case (MDOC_Tag):
-                       n->data.list = LIST_tag;
-                       break;
-               case (MDOC_Diag):
-                       n->data.list = LIST_diag;
-                       break;
-               case (MDOC_Hang):
-                       n->data.list = LIST_hang;
-                       break;
-               case (MDOC_Ohang):
-                       n->data.list = LIST_ohang;
-                       break;
-               case (MDOC_Inset):
-                       n->data.list = LIST_inset;
-                       break;
-               case (MDOC_Column):
-                       n->data.list = LIST_column;
-                       break;
-               default:
-                       break;
-               }
-               if (LIST__NONE != n->data.list)
-                       break;
-       }
 
-       assert(LIST__NONE != n->data.list);
-       return(pre_offset(m, n));
+       if (MDOC_BLOCK == n->type)
+               return(pre_offset(m, n));
+       return(1);
 }
 
 
 static int
 pre_bd(PRE_ARGS)
 {
-       int              i;
 
-       if (MDOC_BLOCK == n->type)
-               return(pre_offset(m, n));
        if (MDOC_BODY != n->type)
                return(1);
 
-       /* Enter literal context if `Bd -literal' or `-unfilled'. */
-
-       for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
-               if (MDOC_Literal == n->args->argv[i].arg)
-                       m->flags |= MDOC_LITERAL;
-               else if (MDOC_Unfilled == n->args->argv[i].arg)
-                       m->flags |= MDOC_LITERAL;
+       if (DISP_literal == n->data.Bd.type)
+               m->flags |= MDOC_LITERAL;
+       if (DISP_unfilled == n->data.Bd.type)
+               m->flags |= MDOC_LITERAL;
 
        return(1);
 }