Rudimentary implementation of the .it request (input line trap).

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 84568474d2000c6fe8ddef7a51c3d4de3d115511..dccbe37f750d1e900a022e3d136f0cd77e691acf 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,6 @@
-/*     $Id: tree.c,v 1.33 2011/02/06 21:44:36 kristaps Exp $ */
+/*     $Id: tree.c,v 1.48 2013/05/18 17:08:43 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +19,7 @@
 #endif
 
 #include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -28,8 +29,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);
 
 
@@ -56,13 +58,12 @@ 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;
-       argc = sz = 0;
-       params = NULL;
+       argc = 0;
+       t = p = NULL;
 
        switch (n->type) {
        case (MDOC_ROOT):
@@ -90,18 +91,14 @@ print_mdoc(const struct mdoc_node *n, int indent)
                t = "text";
                break;
        case (MDOC_TBL):
-               t = "tbl";
-               break;
+               /* FALLTHROUGH */
        case (MDOC_EQN):
-               t = "eqn";
                break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       p = NULL;
-
        switch (n->type) {
        case (MDOC_TEXT):
                p = n->string;
@@ -130,9 +127,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
                }
                break;
        case (MDOC_TBL):
-               break;
+               /* FALLTHROUGH */
        case (MDOC_EQN):
-               p = "eqn";
                break;
        case (MDOC_ROOT):
                p = "root";
@@ -143,8 +139,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');
@@ -161,14 +160,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
                                printf(" ]");
                }
                
-               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)
@@ -182,6 +176,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";
@@ -201,19 +197,18 @@ print_man(const struct man_node *n, int indent)
        case (MAN_BODY):
                t = "block-body";
                break;
-       case (MAN_TBL):
-               t = "tbl";
+       case (MAN_TAIL):
+               t = "block-tail";
                break;
+       case (MAN_TBL):
+               /* FALLTHROUGH */
        case (MAN_EQN):
-               t = "eqn";
                break;
        default:
                abort();
                /* NOTREACHED */
        }
 
-       p = NULL;
-
        switch (n->type) {
        case (MAN_TEXT):
                p = n->string;
@@ -224,6 +219,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;
@@ -231,9 +228,8 @@ print_man(const struct man_node *n, int indent)
                p = "root";
                break;
        case (MAN_TBL):
-               break;
+               /* FALLTHROUGH */
        case (MAN_EQN):
-               p = "eqn";
                break;
        default:
                abort();
@@ -241,22 +237,65 @@ 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)
                print_man(n->next, indent);
 }
 
+static void
+print_box(const struct eqn_box *ep, int indent)
+{
+       int              i;
+       const char      *t;
+
+       if (NULL == ep)
+               return;
+       for (i = 0; i < indent; i++)
+               putchar('\t');
+
+       t = NULL;
+       switch (ep->type) {
+       case (EQN_ROOT):
+               t = "eqn-root";
+               break;
+       case (EQN_LIST):
+               t = "eqn-list";
+               break;
+       case (EQN_SUBEXPR):
+               t = "eqn-expr";
+               break;
+       case (EQN_TEXT):
+               t = "eqn-text";
+               break;
+       case (EQN_MATRIX):
+               t = "eqn-matrix";
+               break;
+       }
+
+       assert(t);
+       printf("%s(%d, %d, %d, %d, %d, \"%s\", \"%s\") %s\n", 
+               t, EQN_DEFSIZE == ep->size ? 0 : ep->size,
+               ep->pos, ep->font, ep->mark, ep->pile, 
+               ep->left ? ep->left : "",
+               ep->right ? ep->right : "",
+               ep->text ? ep->text : "");
+
+       print_box(ep->first, indent + 1);
+       print_box(ep->next, indent);
+}
+
 static void
 print_span(const struct tbl_span *sp, int indent)
 {
@@ -266,8 +305,6 @@ print_span(const struct tbl_span *sp, int indent)
        for (i = 0; i < indent; i++)
                putchar('\t');
 
-       printf("tbl: ");
-
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
                putchar('-');
@@ -300,7 +337,8 @@ print_span(const struct tbl_span *sp, int indent)
                if (NULL == dp->layout)
                        putchar('*');
                putchar(']');
-               if (dp->next)
-                       putchar(' ');
+               putchar(' ');
        }
+
+       printf("(tbl) %d:1\n", sp->line);
 }