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 5a237df1afae675ac55c331816fcaeee738aa8a2..6c0ff01c763b954957ee2a952cba62767b1f3cff 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,6 @@
-/*     $Id: tree.c,v 1.13 2009/06/10 20:18:44 kristaps Exp $ */
+/*     $Id: tree.c,v 1.24 2010/07/07 15:04:54 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,35 +14,39 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <assert.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <time.h>

 
 

+#include "mandoc.h"

 #include "mdoc.h"
 #include "man.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 */
 
 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);
 tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 
        print_mdoc(mdoc_node(mdoc), 0);

-       return(1);

 }
 
 
 /* ARGSUSED */
 }
 
 
 /* ARGSUSED */

-int
+void

 tree_man(void *arg, const struct man *man)
 {
 
        print_man(man_node(man), 0);
 tree_man(void *arg, const struct man *man)
 {
 
        print_man(man_node(man), 0);

-       return(1);

 }
 
 
 }
 
 


@@ -70,7 +74,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
                t = "block-head";
                break;
        case (MDOC_BODY):
                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";
                break;
        case (MDOC_TAIL):
                t = "block-tail";


@@ -163,6 +170,15 @@ print_man(const struct man_node *n, int indent)
        case (MAN_TEXT):
                t = "text";
                break;
        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 */
        default:
                abort();
                /* NOTREACHED */


@@ -173,6 +189,12 @@ print_man(const struct man_node *n, int indent)
                p = n->string;
                break;
        case (MAN_ELEM):
                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):
                p = man_macronames[n->tok];
                break;
        case (MAN_ROOT):