Revert IGNPAR to a warning after clue-stick applied by schwarze@:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 103a8a884c7489056c9bd94fc0d58b0d9aa2466a..a2cd83f1b4ab7b9fc3900a78ee5c7589353b7d62 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.165 2010/09/27 23:03:44 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.171 2010/12/22 11:15:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -286,6 +286,8 @@ mdoc_macro(MACRO_PROT_ARGS)
                        ! (MDOC_PBODY & m->flags)) {
                if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
                        return(0);
+               if (NULL == m->meta.msec)
+                       m->meta.msec = mandoc_strdup("1");
                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");
                if (NULL == m->meta.vol)
@@ -328,8 +330,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);
 
        switch (p->type) {
        case (MDOC_HEAD):
@@ -356,8 +356,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
                break;
        default:
                break;
@@ -513,21 +511,8 @@ static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
-       /*
-        * XXX: if these end up being problematic in terms of memory
-        * management and dereferencing freed blocks, then make them
-        * into reference-counted double-pointers.
-        */
-
-       if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bd)
-                       free(p->data.Bd);
-       if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bl)
-                       free(p->data.Bl);
-       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
-               if (p->data.Bf)
-                       free(p->data.Bf);
+       if (p->norm && 0 == --(p->norm->refcnt))
+               free(p->norm);
 
        if (p->string)
                free(p->string);
@@ -554,6 +539,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
                n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->prev ? n->prev : n->next;
+               if (n->parent->last == n)
+                       n->parent->last = n->prev ? n->prev : NULL;
        }
 
        /* Adjust parse point, if applicable. */
@@ -621,7 +608,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
+                       LIST_column == n->norm->d.Bl.type) {
                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -630,7 +617,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
+                       LIST_column == n->parent->norm->d.Bl.type) {
                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -768,9 +755,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
        if (MDOC_MAX == tok) {
-               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, 
-                   "unknown macro: %s%s", 
-                   buf, strlen(buf) > 3 ? "..." : "");
+               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
                return(1);
        }
 
@@ -813,7 +798,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
+                       LIST_column == n->norm->d.Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
                        goto err;
@@ -829,7 +814,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
+                       LIST_column == n->parent->norm->d.Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;