Explicitly account for \*(Ba when checking for delims. Noted by Jason McIntyre via...

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index dcf3d32d02a32422bac60611145edd15e5ef5976..b9b95f997ae4b826baa4d8c322bc29866634847a 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.52 2010/04/05 09:03:12 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.54 2010/05/08 07:30:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -44,7 +44,7 @@ struct        actions {
 
 static int       concat(struct mdoc *, char *,
                        const struct mdoc_node *, size_t);
-static inline int order_rs(int);
+static inline int order_rs(enum mdoct);
 
 static int       post_ar(POST_ARGS);
 static int       post_at(POST_ARGS);
@@ -196,7 +196,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
 
 #define        RSORD_MAX 14
 
-static const int rsord[RSORD_MAX] = {
+static const enum mdoct rsord[RSORD_MAX] = {
        MDOC__A,
        MDOC__T,
        MDOC__B,
@@ -729,7 +729,7 @@ post_bl_head(POST_ARGS)
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;
-               mdoc_node_free(nnp);
+               mdoc_node_delete(NULL, nnp);
        }
 
        n->nchild = 0;
@@ -854,29 +854,10 @@ post_dd(POST_ARGS)
 static int
 post_prol(POST_ARGS)
 {
-       struct mdoc_node *np;
-
-       if (n->parent->child == n)
-               n->parent->child = n->prev;
-       if (n->prev)
-               n->prev->next = NULL;
-
-       np = n;
-       assert(NULL == n->next);
-
-       if (n->prev) {
-               m->last = n->prev;
-               m->next = MDOC_NEXT_SIBLING;
-       } else {
-               m->last = n->parent;
-               m->next = MDOC_NEXT_CHILD;
-       }
-
-       mdoc_node_freelist(np);
 
+       mdoc_node_delete(m, n);
        if (m->meta.title && m->meta.date && m->meta.os)
                m->flags |= MDOC_PBODY;
-
        return(1);
 }
 
@@ -964,11 +945,11 @@ post_display(POST_ARGS)
 
 
 static inline int
-order_rs(int t)
+order_rs(enum mdoct t)
 {
        int             i;
 
-       for (i = 0; i < RSORD_MAX; i++)
+       for (i = 0; i < (int)RSORD_MAX; i++)
                if (rsord[i] == t)
                        return(i);