Full support for eqn positionals (above, over, sup, sub, etc.).

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 52e120f932747edb91c3a6874bd63b79cc43fb46..1c03c716347aa62034cd66a1b6b10dc8b0596f3a 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*     $Id: tree.c,v 1.30 2011/01/02 20:34:05 kristaps Exp $ */
+/*     $Id: tree.c,v 1.42 2011/07/21 14:13:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -28,8 +28,9 @@
 #include "man.h"
 #include "main.h"
 
-static void    print_mdoc(const struct mdoc_node *, int);
+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_span(const struct tbl_span *, int);
 
 
@@ -63,6 +64,7 @@ print_mdoc(const struct mdoc_node *n, int indent)
        argv = NULL;
        argc = sz = 0;
        params = NULL;
+       t = p = NULL;
 
        switch (n->type) {
        case (MDOC_ROOT):
@@ -90,15 +92,14 @@ print_mdoc(const struct mdoc_node *n, int indent)
                t = "text";
                break;
        case (MDOC_TBL):
-               t = "tbl";
+               /* FALLTHROUGH */
+       case (MDOC_EQN):
                break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       p = NULL;
-
        switch (n->type) {
        case (MDOC_TEXT):
                p = n->string;
@@ -127,6 +128,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
                }
                break;
        case (MDOC_TBL):
+               /* FALLTHROUGH */
+       case (MDOC_EQN):
                break;
        case (MDOC_ROOT):
                p = "root";
@@ -137,8 +140,11 @@ print_mdoc(const struct mdoc_node *n, int indent)
        }
 
        if (n->span) {
-               assert(NULL == p);
+               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');
@@ -158,11 +164,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
                for (i = 0; i < (int)sz; i++)
                        printf(" [%s]", params[i]);
 
-               printf(" %d:%d", n->line, n->pos);
+               printf(" %d:%d\n", n->line, n->pos);
        }
 
-       putchar('\n');
-
        if (n->child)
                print_mdoc(n->child, indent + 1);
        if (n->next)
@@ -176,6 +180,8 @@ print_man(const struct man_node *n, int indent)
        const char       *p, *t;
        int               i;
 
+       t = p = NULL;
+
        switch (n->type) {
        case (MAN_ROOT):
                t = "root";
@@ -195,16 +201,18 @@ print_man(const struct man_node *n, int indent)
        case (MAN_BODY):
                t = "block-body";
                break;
+       case (MAN_TAIL):
+               t = "block-tail";
+               break;
        case (MAN_TBL):
-               t = "tbl";
+               /* FALLTHROUGH */
+       case (MAN_EQN):
                break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       p = NULL;
-
        switch (n->type) {
        case (MAN_TEXT):
                p = n->string;
@@ -215,6 +223,8 @@ print_man(const struct man_node *n, int indent)
                /* FALLTHROUGH */
        case (MAN_HEAD):
                /* FALLTHROUGH */
+       case (MAN_TAIL):
+               /* FALLTHROUGH */
        case (MAN_BODY):
                p = man_macronames[n->tok];
                break;
@@ -222,6 +232,8 @@ print_man(const struct man_node *n, int indent)
                p = "root";
                break;
        case (MAN_TBL):
+               /* FALLTHROUGH */
+       case (MAN_EQN):
                break;
        default:
                abort();
@@ -229,16 +241,17 @@ print_man(const struct man_node *n, int indent)
        }
 
        if (n->span) {
-               assert(NULL == p);
+               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');
-               printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+               printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
        }
 
-       putchar('\n');
-
        if (n->child)
                print_man(n->child, indent + 1);
        if (n->next)
@@ -246,29 +259,46 @@ print_man(const struct man_node *n, int indent)
 }
 
 static void
-print_span(const struct tbl_span *sp, int indent)
+print_box(const struct eqn_box *ep, int indent)
 {
-       const struct tbl_dat *dp;
-       const struct tbl_head *hp;
        int              i;
 
-       if (TBL_SPAN_FIRST & sp->flags) {
-               for (i = 0; i < indent; i++)
-                       putchar('\t');
-               printf("tbl-head: ");
-               for (hp = sp->head; hp; hp = hp->next) {
-                       printf("[%d]", hp->width);
-                       if (hp->next)
-                               putchar(' ');
-               }
-               putchar('\n');
+       if (NULL == ep)
+               return;
+       for (i = 0; i < indent; i++)
+               putchar('\t');
+
+       switch (ep->type) {
+       case (EQN_ROOT):
+               printf("eqn-root(%d, %d, %d)\n", 
+                       ep->pos, ep->font, ep->mark);
+               print_box(ep->child, indent + 1);
+               break;
+       case (EQN_SUBEXPR):
+               printf("eqn-subxpr(%d, %d, %d)\n", 
+                       ep->pos, ep->font, ep->mark);
+               print_box(ep->child, indent + 1);
+               break;
+       case (EQN_TEXT):
+               printf("eqn-text(%d, %d, %d): [%s]\n", 
+                       ep->pos, ep->font, ep->mark, ep->text);
+               break;
+       default:
+               break;
        }
 
+       print_box(ep->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');
 
-       printf("tbl: ");
-
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
                putchar('-');
@@ -295,8 +325,14 @@ print_span(const struct tbl_span *sp, int indent)
                default:
                        break;
                }
-               printf("[%s%s]", dp->string, dp->layout ?  "" : "*");
-               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\n", sp->line);
 }