correctly handle scaling units after .PD

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 3d7f9085143153ba2a4c0c918d607dc529171e96..4753219c8e7f93828078a64f20991d85dede33da 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,7 @@
-/*     $Id: tree.c,v 1.43 2011/07/21 15:21:13 kristaps Exp $ */
+/*     $Id: tree.c,v 1.60 2014/11/28 05:51:32 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 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <limits.h>
 
 #include <assert.h>
 #include <limits.h>


@@ -35,7 +36,6 @@ static        void    print_mdoc(const struct mdoc_node *, int);
 static void    print_span(const struct tbl_span *, int);
 
 
 static void    print_span(const struct tbl_span *, int);
 
 

-/* ARGSUSED */

 void
 tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 void
 tree_mdoc(void *arg, const struct mdoc *mdoc)
 {


@@ -43,8 +43,6 @@ tree_mdoc(void *arg, const struct mdoc *mdoc)
        print_mdoc(mdoc_node(mdoc), 0);
 }
 
        print_mdoc(mdoc_node(mdoc), 0);
 }
 

-
-/* ARGSUSED */

 void
 tree_man(void *arg, const struct man *man)
 {
 void
 tree_man(void *arg, const struct man *man)
 {


@@ -52,49 +50,47 @@ tree_man(void *arg, const struct man *man)
        print_man(man_node(man), 0);
 }
 
        print_man(man_node(man), 0);
 }
 

-

 static void
 print_mdoc(const struct mdoc_node *n, int indent)
 {
        const char       *p, *t;
        int               i, j;
 static void
 print_mdoc(const struct mdoc_node *n, int indent)
 {
        const char       *p, *t;
        int               i, j;

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

        struct mdoc_argv *argv;
 
        argv = NULL;
        struct mdoc_argv *argv;
 
        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 MDOC_ROOT:

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

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

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

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                t = "block-head";
                break;
                t = "block-head";
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

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

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                t = "block-tail";
                break;
                t = "block-tail";
                break;

-       case (MDOC_ELEM):
+       case MDOC_ELEM:

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

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

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

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

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


@@ -102,37 +98,38 @@ print_mdoc(const struct mdoc_node *n, int indent)
        }
 
        switch (n->type) {
        }
 
        switch (n->type) {

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

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

-       case (MDOC_BODY):
+       case MDOC_BODY:

                p = mdoc_macronames[n->tok];
                break;
                p = mdoc_macronames[n->tok];
                break;

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                p = mdoc_macronames[n->tok];
                break;
                p = mdoc_macronames[n->tok];
                break;

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                p = mdoc_macronames[n->tok];
                break;
                p = mdoc_macronames[n->tok];
                break;

-       case (MDOC_ELEM):
+       case MDOC_ELEM:

                p = mdoc_macronames[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;
                p = mdoc_macronames[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                p = mdoc_macronames[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;
                p = mdoc_macronames[n->tok];
                if (n->args) {
                        argv = n->args->argv;
                        argc = n->args->argc;
                }
                break;

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

                break;
                break;

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

                p = "root";
                break;
        default:
                p = "root";
                break;
        default:


@@ -143,9 +140,6 @@ print_mdoc(const struct mdoc_node *n, int indent)
        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++)
                        putchar('\t');
        } else {
                for (i = 0; i < indent; i++)
                        putchar('\t');


@@ -161,20 +155,24 @@ 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 (MDOC_LINE & n->flags)
+                       putchar('*');
+               printf("%d:%d", n->line, n->pos + 1);
+               if (n->lastline != n->line)
+                       printf("-%d", n->lastline);
+               putchar('\n');

        }
 
        }
 

+       if (n->eqn)
+               print_box(n->eqn->root->first, indent + 1);

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

-

 static void
 print_man(const struct man_node *n, int indent)
 {
 static void
 print_man(const struct man_node *n, int indent)
 {


@@ -184,30 +182,28 @@ print_man(const struct man_node *n, int indent)
        t = p = NULL;
 
        switch (n->type) {
        t = p = NULL;
 
        switch (n->type) {

-       case (MAN_ROOT):
+       case MAN_ROOT:

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

-       case (MAN_ELEM):
+       case MAN_ELEM:

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

-       case (MAN_TEXT):
+       case MAN_TEXT:

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

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

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

-       case (MAN_HEAD):
+       case MAN_HEAD:

                t = "block-head";
                break;
                t = "block-head";
                break;

-       case (MAN_BODY):
+       case MAN_BODY:

                t = "block-body";
                break;
                t = "block-body";
                break;

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

                break;
                break;

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

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


@@ -215,26 +211,25 @@ print_man(const struct man_node *n, int indent)
        }
 
        switch (n->type) {
        }
 
        switch (n->type) {

-       case (MAN_TEXT):
+       case MAN_TEXT:

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

-       case (MAN_ELEM):
-               /* FALLTHROUGH */
-       case (MAN_BLOCK):
+       case MAN_ELEM:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MAN_HEAD):
+       case MAN_BLOCK:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MAN_TAIL):
+       case MAN_HEAD:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MAN_BODY):
+       case MAN_BODY:

                p = man_macronames[n->tok];
                break;
                p = man_macronames[n->tok];
                break;

-       case (MAN_ROOT):
+       case MAN_ROOT:

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

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

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


@@ -244,15 +239,17 @@ print_man(const struct man_node *n, int indent)
        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++)
                        putchar('\t');
        } else {
                for (i = 0; i < indent; i++)
                        putchar('\t');

-               printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+               printf("%s (%s) ", p, t);
+               if (MAN_LINE & n->flags)
+                       putchar('*');
+               printf("%d:%d\n", n->line, n->pos + 1);

        }
 
        }
 

+       if (n->eqn)
+               print_box(n->eqn->root->first, indent + 1);

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


@@ -263,34 +260,65 @@ 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++)
                putchar('\t');
 
 
        if (NULL == ep)
                return;
        for (i = 0; i < indent; i++)
                putchar('\t');
 

+       t = NULL;

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

-       case (EQN_ROOT):
-               printf("eqn-root(%d, %d, %d, %d)\n", 
-                       EQN_DEFSIZE == ep->size ? 0 : ep->size,
-                       ep->pos, ep->font, ep->mark);
-               print_box(ep->child, indent + 1);
-               break;
-       case (EQN_SUBEXPR):
-               printf("eqn-subxpr(%d, %d, %d, %d)\n", 
-                       EQN_DEFSIZE == ep->size ? 0 : ep->size,
-                       ep->pos, ep->font, ep->mark);
-               print_box(ep->child, indent + 1);
-               break;
-       case (EQN_TEXT):
-               printf("eqn-text(%d, %d, %d, %d): [%s]\n", 
-                       EQN_DEFSIZE == ep->size ? 0 : ep->size,
-                       ep->pos, ep->font, ep->mark, ep->text);
+       case EQN_ROOT:
+               t = "eqn-root";

                break;
                break;

-       default:
+       case EQN_LISTONE:
+       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 + 1);

        print_box(ep->next, indent);
 }
 
        print_box(ep->next, indent);
 }
 


@@ -304,10 +332,10 @@ print_span(const struct tbl_span *sp, int indent)
                putchar('\t');
 
        switch (sp->pos) {
                putchar('\t');
 
        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:


@@ -316,14 +344,14 @@ 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):
+               case TBL_DATA_HORIZ:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (TBL_DATA_NHORIZ):
+               case TBL_DATA_NHORIZ:

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

-               case (TBL_DATA_DHORIZ):
+               case TBL_DATA_DHORIZ:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (TBL_DATA_NDHORIZ):
+               case TBL_DATA_NDHORIZ:

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