.Bl -column phrases ignore spacing rules for trailing punctuation

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 0d8835fba1165b3a4e700c848adeb9d0c877221a..6c0ff01c763b954957ee2a952cba62767b1f3cff 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,49 +1,57 @@
-/* $Id: tree.c,v 1.10 2009/03/23 15:20:51 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
  *
  * 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 <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);

 
 

-static void    tree_mdoc(const struct mdoc_node *, int);
-static void    tree_man(const struct man_node *, int);
+
+/* ARGSUSED */
+void
+tree_mdoc(void *arg, const struct mdoc *mdoc)
+{
+
+       print_mdoc(mdoc_node(mdoc), 0);
+}

 
 
 /* ARGSUSED */
 
 
 /* ARGSUSED */

-int
-tree_run(void *arg, const struct man *man,
-               const struct mdoc *mdoc)
+void
+tree_man(void *arg, const struct man *man)

 {
 
 {
 

-       if (man)
-               tree_man(man_node(man), 0);
-       if (mdoc)
-               tree_mdoc(mdoc_node(mdoc), 0);
-       return(1);
+       print_man(man_node(man), 0);

 }
 
 
 static void
 }
 
 
 static void

-tree_mdoc(const struct mdoc_node *n, int indent)
+print_mdoc(const struct mdoc_node *n, int indent)

 {
        const char       *p, *t;
        int               i, j;
 {
        const char       *p, *t;
        int               i, j;


@@ -66,7 +74,10 @@ tree_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";


@@ -137,14 +148,14 @@ tree_mdoc(const struct mdoc_node *n, int indent)
        (void)printf(" %d:%d\n", n->line, n->pos);
 
        if (n->child)
        (void)printf(" %d:%d\n", n->line, n->pos);
 
        if (n->child)

-               tree_mdoc(n->child, indent + 1);
+               print_mdoc(n->child, indent + 1);

        if (n->next)
        if (n->next)

-               tree_mdoc(n->next, indent);
+               print_mdoc(n->next, indent);

 }
 
 
 static void
 }
 
 
 static void

-tree_man(const struct man_node *n, int indent)
+print_man(const struct man_node *n, int indent)

 {
        const char       *p, *t;
        int               i;
 {
        const char       *p, *t;
        int               i;


@@ -159,6 +170,15 @@ tree_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 */


@@ -169,6 +189,12 @@ tree_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):


@@ -184,7 +210,7 @@ tree_man(const struct man_node *n, int indent)
        (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
 
        if (n->child)
        (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
 
        if (n->child)

-               tree_man(n->child, indent + 1);
+               print_man(n->child, indent + 1);

        if (n->next)
        if (n->next)

-               tree_man(n->next, indent);
+               print_man(n->next, indent);

 }
 }