=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.52 retrieving revision 1.62 diff -u -p -r1.52 -r1.62 --- mandoc/tree.c 2014/04/20 16:46:05 1.52 +++ mandoc/tree.c 2015/02/05 00:14:13 1.62 @@ -1,7 +1,7 @@ -/* $Id: tree.c,v 1.52 2014/04/20 16:46:05 schwarze Exp $ */ +/* $Id: tree.c,v 1.62 2015/02/05 00:14:13 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons - * Copyright (c) 2013, 2014 Ingo Schwarze + * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons + * Copyright (c) 2013, 2014, 2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,10 +15,10 @@ * 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" -#endif +#include + #include #include #include @@ -40,14 +40,14 @@ void tree_mdoc(void *arg, const struct mdoc *mdoc) { - print_mdoc(mdoc_node(mdoc), 0); + print_mdoc(mdoc_node(mdoc)->child, 0); } void tree_man(void *arg, const struct man *man) { - print_man(man_node(man), 0); + print_man(man_node(man)->child, 0); } static void @@ -58,6 +58,9 @@ print_mdoc(const struct mdoc_node *n, int indent) size_t argc; struct mdoc_argv *argv; + if (n == NULL) + return; + argv = NULL; argc = 0; t = p = NULL; @@ -88,8 +91,9 @@ print_mdoc(const struct mdoc_node *n, int indent) t = "text"; break; case MDOC_TBL: - /* FALLTHROUGH */ + break; case MDOC_EQN: + t = "eqn"; break; default: abort(); @@ -124,8 +128,9 @@ print_mdoc(const struct mdoc_node *n, int indent) } break; case MDOC_TBL: - /* FALLTHROUGH */ + break; case MDOC_EQN: + p = "EQ"; break; case MDOC_ROOT: p = "root"; @@ -138,12 +143,9 @@ print_mdoc(const struct mdoc_node *n, int 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'); + putchar(' '); printf("%s (%s)", p, t); @@ -160,14 +162,14 @@ print_mdoc(const struct mdoc_node *n, int indent) putchar(' '); if (MDOC_LINE & n->flags) putchar('*'); - printf("%d:%d", n->line, n->pos); - if (n->lastline != n->line) - printf("-%d", n->lastline); - putchar('\n'); + printf("%d:%d\n", n->line, n->pos + 1); } + if (n->eqn) + print_box(n->eqn->root->first, indent + 4); if (n->child) - print_mdoc(n->child, indent + 1); + print_mdoc(n->child, indent + + (n->type == MDOC_BLOCK ? 2 : 4)); if (n->next) print_mdoc(n->next, indent); } @@ -178,6 +180,9 @@ print_man(const struct man_node *n, int indent) const char *p, *t; int i; + if (n == NULL) + return; + t = p = NULL; switch (n->type) { @@ -199,12 +204,10 @@ 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: - /* FALLTHROUGH */ + break; case MAN_EQN: + t = "eqn"; break; default: abort(); @@ -221,8 +224,6 @@ 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; @@ -230,8 +231,9 @@ print_man(const struct man_node *n, int indent) p = "root"; break; case MAN_TBL: - /* FALLTHROUGH */ + break; case MAN_EQN: + p = "EQ"; break; default: abort(); @@ -241,20 +243,20 @@ print_man(const struct man_node *n, int 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'); + putchar(' '); printf("%s (%s) ", p, t); if (MAN_LINE & n->flags) putchar('*'); - printf("%d:%d\n", n->line, n->pos); + printf("%d:%d\n", n->line, n->pos + 1); } + if (n->eqn) + print_box(n->eqn->root->first, indent + 4); if (n->child) - print_man(n->child, indent + 1); + print_man(n->child, indent + + (n->type == MAN_BLOCK ? 2 : 4)); if (n->next) print_man(n->next, indent); } @@ -265,16 +267,22 @@ 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'); + putchar(' '); t = NULL; switch (ep->type) { case EQN_ROOT: t = "eqn-root"; break; + case EQN_LISTONE: case EQN_LIST: t = "eqn-list"; break; @@ -284,20 +292,38 @@ print_box(const struct eqn_box *ep, int indent) case EQN_TEXT: t = "eqn-text"; break; + case EQN_PILE: + t = "eqn-pile"; + 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 : ""); + 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->first, indent + 4); print_box(ep->next, indent); } @@ -308,7 +334,7 @@ print_span(const struct tbl_span *sp, int indent) int i; for (i = 0; i < indent; i++) - putchar('\t'); + putchar(' '); switch (sp->pos) { case TBL_SPAN_HORIZ: