=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.29 retrieving revision 1.50 diff -u -p -r1.29 -r1.50 --- mandoc/tree.c 2011/01/01 22:27:08 1.29 +++ mandoc/tree.c 2013/12/24 19:11:46 1.50 @@ -1,6 +1,7 @@ -/* $Id: tree.c,v 1.29 2011/01/01 22:27:08 kristaps Exp $ */ +/* $Id: tree.c,v 1.50 2013/12/24 19:11:46 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons + * Copyright (c) 2013 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 @@ -19,6 +20,7 @@ #endif #include +#include #include #include #include @@ -28,9 +30,10 @@ #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_span(const struct tbl_span *); +static void print_mdoc(const struct mdoc_node *, int); +static void print_span(const struct tbl_span *, int); /* ARGSUSED */ @@ -56,13 +59,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 +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"; @@ -136,13 +139,16 @@ print_mdoc(const struct mdoc_node *n, int indent) /* NOTREACHED */ } - for (i = 0; i < indent; i++) - putchar('\t'); - if (n->span) { - assert(NULL == p); - print_span(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'); + printf("%s (%s)", p, t); for (i = 0; i < (int)argc; i++) { @@ -154,15 +160,16 @@ print_mdoc(const struct mdoc_node *n, int indent) if (argv[i].sz > 0) printf(" ]"); } - - for (i = 0; i < (int)sz; i++) - printf(" [%s]", params[i]); - printf(" %d:%d", n->line, n->pos); + 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'); } - putchar('\n'); - if (n->child) print_mdoc(n->child, indent + 1); if (n->next) @@ -176,6 +183,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 +204,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 +226,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,23 +235,26 @@ print_man(const struct man_node *n, int indent) p = "root"; break; case (MAN_TBL): + /* FALLTHROUGH */ + case (MAN_EQN): break; default: abort(); /* NOTREACHED */ } - for (i = 0; i < indent; i++) - putchar('\t'); - if (n->span) { - assert(NULL == p); - print_span(n->span); - } else - printf("%s (%s) %d:%d", p, t, n->line, n->pos); + 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\n", p, t, n->line, n->pos); + } - putchar('\n'); - if (n->child) print_man(n->child, indent + 1); if (n->next) @@ -246,11 +262,55 @@ print_man(const struct man_node *n, int indent) } static void -print_span(const struct tbl_span *sp) +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) +{ const struct tbl_dat *dp; + int i; - printf("tbl: "); + for (i = 0; i < indent; i++) + putchar('\t'); switch (sp->pos) { case (TBL_SPAN_HORIZ): @@ -278,8 +338,14 @@ print_span(const struct tbl_span *sp) 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); }