Specifying both %T and %J in an `Rs' block causes the title to be quoted

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 8e46ff4995c148d3b0932a7e6947c6f90b528336..32d2584e6d034ab55e9f4ac0dc3a424c39f74ba8 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.170 2010/12/16 17:14:48 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.173 2010/12/25 13:50:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -328,6 +328,23 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        p->parent->nchild++;
 
+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */
+
+       switch (p->type) {
+       case (MDOC_BODY):
+               /* FALLTHROUGH */
+       case (MDOC_TAIL):
+               /* FALLTHROUGH */
+       case (MDOC_HEAD):
+               p->norm = p->parent->norm;
+               break;
+       default:
+               break;
+       }
+
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
 
@@ -460,6 +477,21 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
+
+       switch (tok) {
+       case (MDOC_Bd):
+               /* FALLTHROUGH */
+       case (MDOC_Bf):
+               /* FALLTHROUGH */
+       case (MDOC_Bl):
+               /* FALLTHROUGH */
+       case (MDOC_Rs):
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;
+       }
+
        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;
@@ -477,6 +509,15 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        p->args = args;
        if (p->args)
                (args->refcnt)++;
+
+       switch (tok) {
+       case (MDOC_An):
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;
+       }
+
        if ( ! node_append(m, p))
                return(0);
        m->next = MDOC_NEXT_CHILD;
@@ -511,25 +552,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 (MDOC_An == p->tok)
-               if (p->data.An)
-                       free(p->data.An);
-
+       if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)
+               free(p->norm);
        if (p->string)
                free(p->string);
        if (p->args)
@@ -624,7 +648,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->Bl.type) {
                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -633,7 +657,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->Bl.type) {
                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -814,7 +838,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->Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
                        goto err;
@@ -830,7 +854,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->Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;