=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.30 retrieving revision 1.48 diff -u -p -r1.30 -r1.48 --- mandoc/tree.c 2011/01/02 20:34:05 1.30 +++ mandoc/tree.c 2013/05/18 17:08:43 1.48 @@ -1,6 +1,6 @@ -/* $Id: tree.c,v 1.30 2011/01/02 20:34:05 kristaps Exp $ */ +/* $Id: tree.c,v 1.48 2013/05/18 17:08:43 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons * * 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 +#include #include #include #include @@ -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,15 +91,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 +127,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 +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'); @@ -155,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) @@ -176,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"; @@ -195,16 +197,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 +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; @@ -222,6 +228,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 +237,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 +255,56 @@ 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; + const char *t; - 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'); + + 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) +{ + 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 +331,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); }