Allow -man to process EQN as well. Also fix a segfault in missing case

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 6c0ff01c763b954957ee2a952cba62767b1f3cff..21bd8dafd8df310ddce1c7ed7882e411e4dc7dad 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*     $Id: tree.c,v 1.24 2010/07/07 15:04:54 kristaps Exp $ */
+/*     $Id: tree.c,v 1.36 2011/02/09 09:18:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,6 +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 *, int);
 
 
 /* ARGSUSED */
@@ -88,11 +89,19 @@ print_mdoc(const struct mdoc_node *n, int indent)
        case (MDOC_TEXT):
                t = "text";
                break;
+       case (MDOC_TBL):
+               t = "tbl";
+               break;
+       case (MDOC_EQN):
+               t = "eqn";
+               break;
        default:
                abort();
                /* NOTREACHED */
        }
 
+       p = NULL;
+
        switch (n->type) {
        case (MDOC_TEXT):
                p = n->string;
@@ -120,6 +129,11 @@ print_mdoc(const struct mdoc_node *n, int indent)
                        argc = n->args->argc;
                }
                break;
+       case (MDOC_TBL):
+               break;
+       case (MDOC_EQN):
+               p = n->eqn->data;
+               break;
        case (MDOC_ROOT):
                p = "root";
                break;
@@ -128,24 +142,32 @@ print_mdoc(const struct mdoc_node *n, int indent)
                /* NOTREACHED */
        }
 
-       for (i = 0; i < indent; i++)
-               (void)printf("    ");
-       (void)printf("%s (%s)", p, t);
-
-       for (i = 0; i < (int)argc; i++) {
-               (void)printf(" -%s", mdoc_argnames[argv[i].arg]);
-               if (argv[i].sz > 0)
-                       (void)printf(" [");
-               for (j = 0; j < (int)argv[i].sz; j++)
-                       (void)printf(" [%s]", argv[i].value[j]);
-               if (argv[i].sz > 0)
-                       (void)printf(" ]");
-       }
+       if (n->span) {
+               assert(NULL == p);
+               print_span(n->span, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
 
-       for (i = 0; i < (int)sz; i++)
-               (void)printf(" [%s]", params[i]);
+               printf("%s (%s)", p, t);
 
-       (void)printf(" %d:%d\n", n->line, n->pos);
+               for (i = 0; i < (int)argc; i++) {
+                       printf(" -%s", mdoc_argnames[argv[i].arg]);
+                       if (argv[i].sz > 0)
+                               printf(" [");
+                       for (j = 0; j < (int)argv[i].sz; j++)
+                               printf(" [%s]", argv[i].value[j]);
+                       if (argv[i].sz > 0)
+                               printf(" ]");
+               }
+               
+               for (i = 0; i < (int)sz; i++)
+                       printf(" [%s]", params[i]);
+
+               printf(" %d:%d", n->line, n->pos);
+       }
+
+       putchar('\n');
 
        if (n->child)
                print_mdoc(n->child, indent + 1);
@@ -179,11 +201,19 @@ print_man(const struct man_node *n, int indent)
        case (MAN_BODY):
                t = "block-body";
                break;
+       case (MAN_TBL):
+               t = "tbl";
+               break;
+       case (MAN_EQN):
+               t = "eqn";
+               break;
        default:
                abort();
                /* NOTREACHED */
        }
 
+       p = NULL;
+
        switch (n->type) {
        case (MAN_TEXT):
                p = n->string;
@@ -200,17 +230,76 @@ print_man(const struct man_node *n, int indent)
        case (MAN_ROOT):
                p = "root";
                break;
+       case (MAN_TBL):
+               break;
+       case (MAN_EQN):
+               p = n->eqn->data;
+               break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       for (i = 0; i < indent; i++)
-               (void)printf("    ");
-       (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+       if (n->span) {
+               assert(NULL == p);
+               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');
 
        if (n->child)
                print_man(n->child, indent + 1);
        if (n->next)
                print_man(n->next, indent);
 }
+
+static void
+print_span(const struct tbl_span *sp, int indent)
+{
+       const struct tbl_dat *dp;
+       int              i;
+
+       for (i = 0; i < indent; i++)
+               putchar('\t');
+
+       switch (sp->pos) {
+       case (TBL_SPAN_HORIZ):
+               putchar('-');
+               return;
+       case (TBL_SPAN_DHORIZ):
+               putchar('=');
+               return;
+       default:
+               break;
+       }
+
+       for (dp = sp->first; dp; dp = dp->next) {
+               switch (dp->pos) {
+               case (TBL_DATA_HORIZ):
+                       /* FALLTHROUGH */
+               case (TBL_DATA_NHORIZ):
+                       putchar('-');
+                       continue;
+               case (TBL_DATA_DHORIZ):
+                       /* FALLTHROUGH */
+               case (TBL_DATA_NDHORIZ):
+                       putchar('=');
+                       continue;
+               default:
+                       break;
+               }
+               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);
+}