Put tbl_alloc function right into the addspan() one, as this is the only

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index d56eeaf662ebb13b8cbb70b8bd7893f6e101f9ad..65652adb2111bc3e4775b598cc0cbbf0d9067d64 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*     $Id: tree.c,v 1.28 2011/01/01 17:10:20 kristaps Exp $ */
+/*     $Id: tree.c,v 1.34 2011/02/06 22:02:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,7 +30,7 @@
 
 static void    print_mdoc(const struct mdoc_node *, int);
 static void    print_man(const struct man_node *, int);
-static void    print_span(const struct tbl_span *);
+static void    print_span(const struct tbl_span *, int);
 
 
 /* ARGSUSED */
@@ -92,6 +92,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
        case (MDOC_TBL):
                t = "tbl";
                break;
+       case (MDOC_EQN):
+               t = "eqn";
+               break;
        default:
                abort();
                /* NOTREACHED */
@@ -128,6 +131,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
                break;
        case (MDOC_TBL):
                break;
+       case (MDOC_EQN):
+               p = "eqn";
+               break;
        case (MDOC_ROOT):
                p = "root";
                break;
@@ -136,13 +142,13 @@ print_mdoc(const struct mdoc_node *n, int indent)
                /* NOTREACHED */
        }
 
-       for (i = 0; i < indent; i++)
-               putchar('\t');
-
        if (n->span) {
                assert(NULL == p);
-               print_span(n->span);
+               print_span(n->span, indent);
        } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
+
                printf("%s (%s)", p, t);
 
                for (i = 0; i < (int)argc; i++) {
@@ -198,6 +204,9 @@ print_man(const struct man_node *n, int indent)
        case (MAN_TBL):
                t = "tbl";
                break;
+       case (MAN_EQN):
+               t = "eqn";
+               break;
        default:
                abort();
                /* NOTREACHED */
@@ -223,19 +232,22 @@ print_man(const struct man_node *n, int indent)
                break;
        case (MAN_TBL):
                break;
+       case (MAN_EQN):
+               p = "eqn";
+               break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       for (i = 0; i < indent; i++)
-               putchar('\t');
-
        if (n->span) {
                assert(NULL == p);
-               print_span(n->span);
-       } else
+               print_span(n->span, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
                printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+       }
 
        putchar('\n');
 
@@ -246,11 +258,13 @@ print_man(const struct man_node *n, int indent)
 }
 
 static void
-print_span(const struct tbl_span *sp)
+print_span(const struct tbl_span *sp, int indent)
 {
        const struct tbl_dat *dp;
+       int              i;
 
-       printf("tbl: ");
+       for (i = 0; i < indent; i++)
+               putchar('\t');
 
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
@@ -278,8 +292,14 @@ print_span(const struct tbl_span *sp)
                default:
                        break;
                }
-               printf("[%s]", dp->string);
-               if (dp->next)
-                       putchar(' ');
+               printf("[\"%s\"", dp->string ? dp->string : "");
+               if (dp->spans)
+                       printf("(%d)", dp->spans);
+               if (NULL == dp->layout)
+                       putchar('*');
+               putchar(']');
+               putchar(' ');
        }
+
+       printf("(tbl) %d:1", sp->line);
 }