add missing HISTORY information

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index c08037728523433d144d4e4c19863568ce2ac64f..966ed9d53dd91099bb01325c46e99fc0b5c62ffc 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.279 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: roff.c,v 1.288 2017/01/12 18:02:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -33,9 +33,6 @@
 #include "roff_int.h"
 #include "libroff.h"
 
-/* Maximum number of nested if-else conditionals. */
-#define        RSTACK_MAX      128
-
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 
@@ -994,11 +991,11 @@ roff_node_alloc(struct roff_man *man, int line, int pos,
        n->sec = man->lastsec;
 
        if (man->flags & MDOC_SYNOPSIS)
-               n->flags |= MDOC_SYNPRETTY;
+               n->flags |= NODE_SYNPRETTY;
        else
-               n->flags &= ~MDOC_SYNPRETTY;
+               n->flags &= ~NODE_SYNPRETTY;
        if (man->flags & MDOC_NEWLINE)
-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;
        man->flags &= ~MDOC_NEWLINE;
 
        return n;
@@ -1010,60 +1007,52 @@ roff_node_append(struct roff_man *man, struct roff_node *n)
 
        switch (man->next) {
        case ROFF_NEXT_SIBLING:
+               if (man->last->next != NULL) {
+                       n->next = man->last->next;
+                       man->last->next->prev = n;
+               } else
+                       man->last->parent->last = n;
                man->last->next = n;
                n->prev = man->last;
                n->parent = man->last->parent;
                break;
        case ROFF_NEXT_CHILD:
+               if (man->last->child != NULL) {
+                       n->next = man->last->child;
+                       man->last->child->prev = n;
+               } else
+                       man->last->last = n;
                man->last->child = n;
                n->parent = man->last;
                break;
        default:
                abort();
        }
-       n->parent->nchild++;
-       n->parent->last = n;
-
-       /*
-        * Copy over the normalised-data pointer of our parent.  Not
-        * everybody has one, but copying a null pointer is fine.
-        */
-
-       switch (n->type) {
-       case ROFFT_BODY:
-               if (n->end != ENDBODY_NOT)
-                       break;
-               /* FALLTHROUGH */
-       case ROFFT_TAIL:
-       case ROFFT_HEAD:
-               n->norm = n->parent->norm;
-               break;
-       default:
-               break;
-       }
-
-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_pre(man, n);
+       man->last = n;
 
        switch (n->type) {
        case ROFFT_HEAD:
-               assert(n->parent->type == ROFFT_BLOCK);
                n->parent->head = n;
                break;
        case ROFFT_BODY:
-               if (n->end)
-                       break;
-               assert(n->parent->type == ROFFT_BLOCK);
+               if (n->end != ENDBODY_NOT)
+                       return;
                n->parent->body = n;
                break;
        case ROFFT_TAIL:
-               assert(n->parent->type == ROFFT_BLOCK);
                n->parent->tail = n;
                break;
        default:
-               break;
+               return;
        }
-       man->last = n;
+
+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */
+
+       n->norm = n->parent->norm;
+       assert(n->parent->type == ROFFT_BLOCK);
 }
 
 void
@@ -1074,10 +1063,7 @@ roff_word_alloc(struct roff_man *man, int line, int pos, const char *word)
        n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
        n->string = roff_strdup(man->roff, word);
        roff_node_append(man, n);
-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_post(man);
-       else
-               man_valid_post(man);
+       n->flags |= NODE_VALID | NODE_ENDED;
        man->next = ROFF_NEXT_SIBLING;
 }
 
@@ -1147,7 +1133,7 @@ roff_addeqn(struct roff_man *man, const struct eqn *eqn)
        n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
        n->eqn = eqn;
        if (eqn->ln > man->last->line)
-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;
        roff_node_append(man, n);
        man->next = ROFF_NEXT_SIBLING;
 }
@@ -1162,10 +1148,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
        n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
        n->span = tbl;
        roff_node_append(man, n);
-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_post(man);
-       else
-               man_valid_post(man);
+       n->flags |= NODE_VALID | NODE_ENDED;
        man->next = ROFF_NEXT_SIBLING;
 }
 
@@ -1183,7 +1166,6 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)
        /* Adjust parent. */
 
        if (n->parent != NULL) {
-               n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->next;
                if (n->parent->last == n)
@@ -1225,7 +1207,6 @@ roff_node_delete(struct roff_man *man, struct roff_node *n)
 
        while (n->child != NULL)
                roff_node_delete(man, n->child);
-       assert(n->nchild == 0);
        roff_node_unlink(man, n);
        roff_node_free(n);
 }
@@ -1242,16 +1223,12 @@ deroff(char **dest, const struct roff_node *n)
                return;
        }
 
-       /* Skip leading whitespace and escape sequences. */
+       /* Skip leading whitespace. */
 
-       cp = n->string;
-       while (*cp != '\0') {
-               if ('\\' == *cp) {
-                       cp++;
-                       mandoc_escape((const char **)&cp, NULL, NULL);
-               } else if (isspace((unsigned char)*cp))
+       for (cp = n->string; *cp != '\0'; cp++) {
+               if (cp[0] == '\\' && strchr(" %&0^|~", cp[1]) != NULL)
                        cp++;
-               else
+               else if ( ! isspace((unsigned char)*cp))
                        break;
        }