Fixed a goddamn subtle error causing MDOC_LITERAL to remain set after a

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index eae406b3960827337d596f9ddc1193454bd05cf5..6c0ff01c763b954957ee2a952cba62767b1f3cff 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,50 +1,52 @@
-/* $Id: tree.c,v 1.11 2009/04/03 11:08:39 kristaps Exp $ */
+/*     $Id: tree.c,v 1.24 2010/07/07 15:04:54 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "mdoc.h"
 #include "man.h"
+#include "main.h"
 
 static void    print_mdoc(const struct mdoc_node *, int);
 static void    print_man(const struct man_node *, int);
 
 
 /* ARGSUSED */
-int
+void
 tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 
        print_mdoc(mdoc_node(mdoc), 0);
-       return(1);
 }
 
 
 /* ARGSUSED */
-int
+void
 tree_man(void *arg, const struct man *man)
 {
 
        print_man(man_node(man), 0);
-       return(1);
 }
 
 
@@ -72,7 +74,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
                t = "block-head";
                break;
        case (MDOC_BODY):
-               t = "block-body";
+               if (n->end)
+                       t = "body-end";
+               else
+                       t = "block-body";
                break;
        case (MDOC_TAIL):
                t = "block-tail";
@@ -165,6 +170,15 @@ print_man(const struct man_node *n, int indent)
        case (MAN_TEXT):
                t = "text";
                break;
+       case (MAN_BLOCK):
+               t = "block";
+               break;
+       case (MAN_HEAD):
+               t = "block-head";
+               break;
+       case (MAN_BODY):
+               t = "block-body";
+               break;
        default:
                abort();
                /* NOTREACHED */
@@ -175,6 +189,12 @@ print_man(const struct man_node *n, int indent)
                p = n->string;
                break;
        case (MAN_ELEM):
+               /* FALLTHROUGH */
+       case (MAN_BLOCK):
+               /* FALLTHROUGH */
+       case (MAN_HEAD):
+               /* FALLTHROUGH */
+       case (MAN_BODY):
                p = man_macronames[n->tok];
                break;
        case (MAN_ROOT):