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 a446fb14a4763612ffee076c7cd1907f2c08b696..416253f7ab62e3559c576049f5c67c396b753976 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,153 +1,178 @@
-/*     $Id: tree.c,v 1.38 2011/07/21 11:34:53 kristaps Exp $ */
+/*     $Id: tree.c,v 1.79 2018/08/14 01:27:48 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * 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.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS 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.
  */
  * 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"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 
 #include <assert.h>

+#include <limits.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
 #include "mandoc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
 #include "mandoc.h"

+#include "roff.h"

 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 
 static void    print_box(const struct eqn_box *, int);
 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 
 static void    print_box(const struct eqn_box *, int);

-static void    print_man(const struct man_node *, int);
-static void    print_mdoc(const struct mdoc_node *, 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);
 
 
 static void    print_span(const struct tbl_span *, int);
 
 

-/* ARGSUSED */

 void
 void

-tree_mdoc(void *arg, const struct mdoc *mdoc)
+tree_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-
-       print_mdoc(mdoc_node(mdoc), 0);
+       print_meta(&mdoc->meta);
+       putchar('\n');
+       print_mdoc(mdoc->first->child, 0);

 }
 
 }
 

-
-/* ARGSUSED */

 void
 void

-tree_man(void *arg, const struct man *man)
+tree_man(void *arg, const struct roff_man *man)

 {
 {

-
-       print_man(man_node(man), 0);
+       print_meta(&man->meta);
+       if (man->meta.hasbody == 0)
+               puts("body  = empty");
+       putchar('\n');
+       print_man(man->first->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
 
 static void

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

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

-       size_t            argc, sz;
-       char            **params;
+       size_t            argc;

        struct mdoc_argv *argv;
 
        struct mdoc_argv *argv;
 

+       if (n == NULL)
+               return;
+

        argv = NULL;
        argv = NULL;

-       argc = sz = 0;
-       params = NULL;
+       argc = 0;

        t = p = NULL;
 
        switch (n->type) {
        t = p = NULL;
 
        switch (n->type) {

-       case (MDOC_ROOT):
+       case ROFFT_ROOT:

                t = "root";
                break;
                t = "root";
                break;

-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:

                t = "block";
                break;
                t = "block";
                break;

-       case (MDOC_HEAD):
-               t = "block-head";
+       case ROFFT_HEAD:
+               t = "head";

                break;
                break;

-       case (MDOC_BODY):
+       case ROFFT_BODY:

                if (n->end)
                        t = "body-end";
                else
                if (n->end)
                        t = "body-end";
                else

-                       t = "block-body";
+                       t = "body";

                break;
                break;

-       case (MDOC_TAIL):
-               t = "block-tail";
+       case ROFFT_TAIL:
+               t = "tail";

                break;
                break;

-       case (MDOC_ELEM):
+       case ROFFT_ELEM:

                t = "elem";
                break;
                t = "elem";
                break;

-       case (MDOC_TEXT):
+       case ROFFT_TEXT:

                t = "text";
                break;
                t = "text";
                break;

-       case (MDOC_TBL):
-               /* FALLTHROUGH */
-       case (MDOC_EQN):
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
+       case ROFFT_TBL:
+               break;
+       case ROFFT_EQN:
+               t = "eqn";

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        switch (n->type) {
        }
 
        switch (n->type) {

-       case (MDOC_TEXT):
+       case ROFFT_TEXT:
+       case ROFFT_COMMENT:

                p = n->string;
                break;
                p = n->string;
                break;

-       case (MDOC_BODY):
-               p = mdoc_macronames[n->tok];
+       case ROFFT_BODY:
+               p = roff_name[n->tok];

                break;
                break;

-       case (MDOC_HEAD):
-               p = mdoc_macronames[n->tok];
+       case ROFFT_HEAD:
+               p = roff_name[n->tok];

                break;
                break;

-       case (MDOC_TAIL):
-               p = mdoc_macronames[n->tok];
+       case ROFFT_TAIL:
+               p = roff_name[n->tok];

                break;
                break;

-       case (MDOC_ELEM):
-               p = mdoc_macronames[n->tok];
+       case ROFFT_ELEM:
+               p = roff_name[n->tok];

                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;

-       case (MDOC_BLOCK):
-               p = mdoc_macronames[n->tok];
+       case ROFFT_BLOCK:
+               p = roff_name[n->tok];

                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;

-       case (MDOC_TBL):
-               /* FALLTHROUGH */
-       case (MDOC_EQN):
+       case ROFFT_TBL:

                break;
                break;

-       case (MDOC_ROOT):
+       case ROFFT_EQN:
+               p = "EQ";
+               break;
+       case ROFFT_ROOT:

                p = "root";
                break;
        default:
                abort();
                p = "root";
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        if (n->span) {
                assert(NULL == p && NULL == t);
                print_span(n->span, indent);
        }
 
        if (n->span) {
                assert(NULL == p && NULL == t);
                print_span(n->span, indent);

-       } else if (n->eqn) {
-               assert(NULL == p && NULL == t);
-               print_box(n->eqn->root, indent);

        } else {
                for (i = 0; i < indent; i++)
        } else {
                for (i = 0; i < indent; i++)

-                       putchar('\t');
+                       putchar(' ');

 
                printf("%s (%s)", p, t);
 
 
                printf("%s (%s)", p, t);
 


@@ -160,100 +185,122 @@ print_mdoc(const struct mdoc_node *n, int indent)
                        if (argv[i].sz > 0)
                                printf(" ]");
                }
                        if (argv[i].sz > 0)
                                printf(" ]");
                }

-               
-               for (i = 0; i < (int)sz; i++)
-                       printf(" [%s]", params[i]);

 
 

-               printf(" %d:%d\n", n->line, n->pos);
+               putchar(' ');
+               if (NODE_DELIMO & n->flags)
+                       putchar('(');
+               if (NODE_LINE & n->flags)
+                       putchar('*');
+               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->first, indent + 4);

        if (n->child)
        if (n->child)

-               print_mdoc(n->child, indent + 1);
+               print_mdoc(n->child, indent +
+                   (n->type == ROFFT_BLOCK ? 2 : 4));

        if (n->next)
                print_mdoc(n->next, indent);
 }
 
        if (n->next)
                print_mdoc(n->next, indent);
 }
 

-

 static void
 static void

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

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

+       if (n == NULL)
+               return;
+

        t = p = NULL;
 
        switch (n->type) {
        t = p = NULL;
 
        switch (n->type) {

-       case (MAN_ROOT):
+       case ROFFT_ROOT:

                t = "root";
                break;
                t = "root";
                break;

-       case (MAN_ELEM):
+       case ROFFT_ELEM:

                t = "elem";
                break;
                t = "elem";
                break;

-       case (MAN_TEXT):
+       case ROFFT_TEXT:

                t = "text";
                break;
                t = "text";
                break;

-       case (MAN_BLOCK):
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
+       case ROFFT_BLOCK:

                t = "block";
                break;
                t = "block";
                break;

-       case (MAN_HEAD):
-               t = "block-head";
+       case ROFFT_HEAD:
+               t = "head";

                break;
                break;

-       case (MAN_BODY):
-               t = "block-body";
+       case ROFFT_BODY:
+               t = "body";

                break;
                break;

-       case (MAN_TAIL):
-               t = "block-tail";
+       case ROFFT_TBL:

                break;
                break;

-       case (MAN_TBL):
-               /* FALLTHROUGH */
-       case (MAN_EQN):
+       case ROFFT_EQN:
+               t = "eqn";

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        switch (n->type) {
        }
 
        switch (n->type) {

-       case (MAN_TEXT):
+       case ROFFT_TEXT:
+       case ROFFT_COMMENT:

                p = n->string;
                break;
                p = n->string;
                break;

-       case (MAN_ELEM):
-               /* FALLTHROUGH */
-       case (MAN_BLOCK):
-               /* FALLTHROUGH */
-       case (MAN_HEAD):
-               /* FALLTHROUGH */
-       case (MAN_TAIL):
-               /* FALLTHROUGH */
-       case (MAN_BODY):
-               p = man_macronames[n->tok];
-               break;
-       case (MAN_ROOT):
+       case ROFFT_ELEM:
+       case ROFFT_BLOCK:
+       case ROFFT_HEAD:
+       case ROFFT_BODY:
+               p = roff_name[n->tok];
+               break;
+       case ROFFT_ROOT:

                p = "root";
                break;
                p = "root";
                break;

-       case (MAN_TBL):
-               /* FALLTHROUGH */
-       case (MAN_EQN):
+       case ROFFT_TBL:
+               break;
+       case ROFFT_EQN:
+               p = "EQ";

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        if (n->span) {
                assert(NULL == p && NULL == t);
                print_span(n->span, indent);
        }
 
        if (n->span) {
                assert(NULL == p && NULL == t);
                print_span(n->span, indent);

-       } else if (n->eqn) {
-               assert(NULL == p && NULL == t);
-               print_box(n->eqn->root, indent);

        } else {
                for (i = 0; i < indent; i++)
        } else {
                for (i = 0; i < indent; i++)

-                       putchar('\t');
-               printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+                       putchar(' ');
+               printf("%s (%s) ", p, t);
+               if (NODE_LINE & n->flags)
+                       putchar('*');
+               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->first, indent + 4);

        if (n->child)
        if (n->child)

-               print_man(n->child, indent + 1);
+               print_man(n->child, indent +
+                   (n->type == ROFFT_BLOCK ? 2 : 4));

        if (n->next)
                print_man(n->next, indent);
 }
        if (n->next)
                print_man(n->next, indent);
 }


@@ -262,24 +309,62 @@ static void
 print_box(const struct eqn_box *ep, int indent)
 {
        int              i;
 print_box(const struct eqn_box *ep, int indent)
 {
        int              i;

+       const char      *t;
+
+       static const char *posnames[] = {
+           NULL, "sup", "subsup", "sub",
+           "to", "from", "fromto",
+           "over", "sqrt", NULL };

 
        if (NULL == ep)
                return;
        for (i = 0; i < indent; i++)
 
        if (NULL == ep)
                return;
        for (i = 0; i < indent; i++)

-               putchar('\t');
+               putchar(' ');

 
 

+       t = NULL;

        switch (ep->type) {
        switch (ep->type) {

-       case (EQN_ROOT):
-               puts("eqn-root");
-               print_box(ep->child, indent + 1);
-               return;
-       case (EQN_TEXT):
-               printf("eqn-text: [%s]\n", ep->text);
-               print_box(ep->next, indent);
-               return;
-       default:
+       case EQN_LIST:
+               t = "eqn-list";
+               break;
+       case EQN_SUBEXPR:
+               t = "eqn-expr";
+               break;
+       case EQN_TEXT:
+               t = "eqn-text";
+               break;
+       case EQN_PILE:
+               t = "eqn-pile";
+               break;
+       case EQN_MATRIX:
+               t = "eqn-matrix";

                break;
        }
                break;
        }

+
+       fputs(t, stdout);
+       if (ep->pos)
+               printf(" pos=%s", posnames[ep->pos]);
+       if (ep->left)
+               printf(" left=\"%s\"", ep->left);
+       if (ep->right)
+               printf(" right=\"%s\"", ep->right);
+       if (ep->top)
+               printf(" top=\"%s\"", ep->top);
+       if (ep->bottom)
+               printf(" bottom=\"%s\"", ep->bottom);
+       if (ep->text)
+               printf(" text=\"%s\"", ep->text);
+       if (ep->font)
+               printf(" font=%d", ep->font);
+       if (ep->size != EQN_DEFSIZE)
+               printf(" size=%d", ep->size);
+       if (ep->expectargs != UINT_MAX && ep->expectargs != ep->args)
+               printf(" badargs=%zu(%zu)", ep->args, ep->expectargs);
+       else if (ep->args)
+               printf(" args=%zu", ep->args);
+       putchar('\n');
+
+       print_box(ep->first, indent + 4);
+       print_box(ep->next, indent);

 }
 
 static void
 }
 
 static void


@@ -289,13 +374,13 @@ print_span(const struct tbl_span *sp, int indent)
        int              i;
 
        for (i = 0; i < indent; i++)
        int              i;
 
        for (i = 0; i < indent; i++)

-               putchar('\t');
+               putchar(' ');

 
        switch (sp->pos) {
 
        switch (sp->pos) {

-       case (TBL_SPAN_HORIZ):
+       case TBL_SPAN_HORIZ:

                putchar('-');
                return;
                putchar('-');
                return;

-       case (TBL_SPAN_DHORIZ):
+       case TBL_SPAN_DHORIZ:

                putchar('=');
                return;
        default:
                putchar('=');
                return;
        default:


@@ -304,14 +389,12 @@ print_span(const struct tbl_span *sp, int indent)
 
        for (dp = sp->first; dp; dp = dp->next) {
                switch (dp->pos) {
 
        for (dp = sp->first; dp; dp = dp->next) {
                switch (dp->pos) {

-               case (TBL_DATA_HORIZ):
-                       /* FALLTHROUGH */
-               case (TBL_DATA_NHORIZ):
+               case TBL_DATA_HORIZ:
+               case TBL_DATA_NHORIZ:

                        putchar('-');
                        continue;
                        putchar('-');
                        continue;

-               case (TBL_DATA_DHORIZ):
-                       /* FALLTHROUGH */
-               case (TBL_DATA_NDHORIZ):
+               case TBL_DATA_DHORIZ:
+               case TBL_DATA_NDHORIZ:

                        putchar('=');
                        continue;
                default:
                        putchar('=');
                        continue;
                default: