If a tbl(7) column contains both text cells and numeric cells,

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index d7cd037b3b87a296be3ba5dbbbf62c97a6653dd5..416253f7ab62e3559c576049f5c67c396b753976 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,7 +1,7 @@
-/*     $Id: tree.c,v 1.64 2015/04/02 22:48:18 schwarze Exp $ */
+/*     $Id: tree.c,v 1.79 2018/08/14 01:27:48 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -33,22 +33,46 @@
 
 static void    print_box(const struct eqn_box *, int);
 static void    print_man(const struct roff_node *, int);
+static void    print_meta(const struct roff_meta *);
 static void    print_mdoc(const struct roff_node *, int);
 static void    print_span(const struct tbl_span *, int);
 
 
 void
-tree_mdoc(void *arg, const struct mdoc *mdoc)
+tree_mdoc(void *arg, const struct roff_man *mdoc)
 {
-
-       print_mdoc(mdoc_node(mdoc)->child, 0);
+       print_meta(&mdoc->meta);
+       putchar('\n');
+       print_mdoc(mdoc->first->child, 0);
 }
 
 void
-tree_man(void *arg, const struct man *man)
+tree_man(void *arg, const struct roff_man *man)
 {
+       print_meta(&man->meta);
+       if (man->meta.hasbody == 0)
+               puts("body  = empty");
+       putchar('\n');
+       print_man(man->first->child, 0);
+}
 
-       print_man(man_node(man)->child, 0);
+static void
+print_meta(const struct roff_meta *meta)
+{
+       if (meta->title != NULL)
+               printf("title = \"%s\"\n", meta->title);
+       if (meta->name != NULL)
+               printf("name  = \"%s\"\n", meta->name);
+       if (meta->msec != NULL)
+               printf("sec   = \"%s\"\n", meta->msec);
+       if (meta->vol != NULL)
+               printf("vol   = \"%s\"\n", meta->vol);
+       if (meta->arch != NULL)
+               printf("arch  = \"%s\"\n", meta->arch);
+       if (meta->os != NULL)
+               printf("os    = \"%s\"\n", meta->os);
+       if (meta->date != NULL)
+               printf("date  = \"%s\"\n", meta->date);
 }
 
 static void
@@ -74,16 +98,16 @@ print_mdoc(const struct roff_node *n, int indent)
                t = "block";
                break;
        case ROFFT_HEAD:
-               t = "block-head";
+               t = "head";
                break;
        case ROFFT_BODY:
                if (n->end)
                        t = "body-end";
                else
-                       t = "block-body";
+                       t = "body";
                break;
        case ROFFT_TAIL:
-               t = "block-tail";
+               t = "tail";
                break;
        case ROFFT_ELEM:
                t = "elem";
@@ -91,6 +115,9 @@ print_mdoc(const struct roff_node *n, int indent)
        case ROFFT_TEXT:
                t = "text";
                break;
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
        case ROFFT_TBL:
                break;
        case ROFFT_EQN:
@@ -98,31 +125,31 @@ print_mdoc(const struct roff_node *n, int indent)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        switch (n->type) {
        case ROFFT_TEXT:
+       case ROFFT_COMMENT:
                p = n->string;
                break;
        case ROFFT_BODY:
-               p = mdoc_macronames[n->tok];
+               p = roff_name[n->tok];
                break;
        case ROFFT_HEAD:
-               p = mdoc_macronames[n->tok];
+               p = roff_name[n->tok];
                break;
        case ROFFT_TAIL:
-               p = mdoc_macronames[n->tok];
+               p = roff_name[n->tok];
                break;
        case ROFFT_ELEM:
-               p = mdoc_macronames[n->tok];
+               p = roff_name[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;
        case ROFFT_BLOCK:
-               p = mdoc_macronames[n->tok];
+               p = roff_name[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
@@ -138,7 +165,6 @@ print_mdoc(const struct roff_node *n, int indent)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        if (n->span) {
@@ -161,13 +187,26 @@ print_mdoc(const struct roff_node *n, int indent)
                }
 
                putchar(' ');
-               if (MDOC_LINE & n->flags)
+               if (NODE_DELIMO & n->flags)
+                       putchar('(');
+               if (NODE_LINE & n->flags)
                        putchar('*');
-               printf("%d:%d\n", n->line, n->pos + 1);
+               printf("%d:%d", n->line, n->pos + 1);
+               if (NODE_DELIMC & n->flags)
+                       putchar(')');
+               if (NODE_EOS & n->flags)
+                       putchar('.');
+               if (NODE_BROKEN & n->flags)
+                       printf(" BROKEN");
+               if (NODE_NOSRC & n->flags)
+                       printf(" NOSRC");
+               if (NODE_NOPRT & n->flags)
+                       printf(" NOPRT");
+               putchar('\n');
        }
 
        if (n->eqn)
-               print_box(n->eqn->root->first, indent + 4);
+               print_box(n->eqn->first, indent + 4);
        if (n->child)
                print_mdoc(n->child, indent +
                    (n->type == ROFFT_BLOCK ? 2 : 4));
@@ -196,14 +235,17 @@ print_man(const struct roff_node *n, int indent)
        case ROFFT_TEXT:
                t = "text";
                break;
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
        case ROFFT_BLOCK:
                t = "block";
                break;
        case ROFFT_HEAD:
-               t = "block-head";
+               t = "head";
                break;
        case ROFFT_BODY:
-               t = "block-body";
+               t = "body";
                break;
        case ROFFT_TBL:
                break;
@@ -212,21 +254,18 @@ print_man(const struct roff_node *n, int indent)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        switch (n->type) {
        case ROFFT_TEXT:
+       case ROFFT_COMMENT:
                p = n->string;
                break;
        case ROFFT_ELEM:
-               /* FALLTHROUGH */
        case ROFFT_BLOCK:
-               /* FALLTHROUGH */
        case ROFFT_HEAD:
-               /* FALLTHROUGH */
        case ROFFT_BODY:
-               p = man_macronames[n->tok];
+               p = roff_name[n->tok];
                break;
        case ROFFT_ROOT:
                p = "root";
@@ -238,7 +277,6 @@ print_man(const struct roff_node *n, int indent)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        if (n->span) {
@@ -248,13 +286,18 @@ print_man(const struct roff_node *n, int indent)
                for (i = 0; i < indent; i++)
                        putchar(' ');
                printf("%s (%s) ", p, t);
-               if (MAN_LINE & n->flags)
+               if (NODE_LINE & n->flags)
                        putchar('*');
-               printf("%d:%d\n", n->line, n->pos + 1);
+               printf("%d:%d", n->line, n->pos + 1);
+               if (NODE_DELIMC & n->flags)
+                       putchar(')');
+               if (NODE_EOS & n->flags)
+                       putchar('.');
+               putchar('\n');
        }
 
        if (n->eqn)
-               print_box(n->eqn->root->first, indent + 4);
+               print_box(n->eqn->first, indent + 4);
        if (n->child)
                print_man(n->child, indent +
                    (n->type == ROFFT_BLOCK ? 2 : 4));
@@ -280,10 +323,6 @@ print_box(const struct eqn_box *ep, int indent)
 
        t = NULL;
        switch (ep->type) {
-       case EQN_ROOT:
-               t = "eqn-root";
-               break;
-       case EQN_LISTONE:
        case EQN_LIST:
                t = "eqn-list";
                break;
@@ -351,12 +390,10 @@ print_span(const struct tbl_span *sp, int indent)
        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;