diff options
Diffstat (limited to 'usr.bin/mandoc/tree.c')
| -rw-r--r-- | usr.bin/mandoc/tree.c | 115 |
1 files changed, 94 insertions, 21 deletions
diff --git a/usr.bin/mandoc/tree.c b/usr.bin/mandoc/tree.c index b775ca1edc7..959b0a5b744 100644 --- a/usr.bin/mandoc/tree.c +++ b/usr.bin/mandoc/tree.c @@ -1,6 +1,6 @@ -/* $Id: tree.c,v 1.10 2010/07/13 01:09:13 schwarze Exp $ */ +/* $Id: tree.c,v 1.11 2011/01/04 22:28:17 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 @@ -26,6 +26,7 @@ static void print_mdoc(const struct mdoc_node *, int); static void print_man(const struct man_node *, int); +static void print_span(const struct tbl_span *, int); /* ARGSUSED */ @@ -84,11 +85,16 @@ print_mdoc(const struct mdoc_node *n, int indent) case (MDOC_TEXT): t = "text"; break; + case (MDOC_TBL): + t = "tbl"; + break; default: abort(); /* NOTREACHED */ } + p = NULL; + switch (n->type) { case (MDOC_TEXT): p = n->string; @@ -116,6 +122,8 @@ print_mdoc(const struct mdoc_node *n, int indent) argc = n->args->argc; } break; + case (MDOC_TBL): + break; case (MDOC_ROOT): p = "root"; break; @@ -124,24 +132,32 @@ print_mdoc(const struct mdoc_node *n, int indent) /* NOTREACHED */ } - for (i = 0; i < indent; i++) - (void)printf(" "); - (void)printf("%s (%s)", p, t); - - for (i = 0; i < (int)argc; i++) { - (void)printf(" -%s", mdoc_argnames[argv[i].arg]); - if (argv[i].sz > 0) - (void)printf(" ["); - for (j = 0; j < (int)argv[i].sz; j++) - (void)printf(" [%s]", argv[i].value[j]); - if (argv[i].sz > 0) - (void)printf(" ]"); - } + if (n->span) { + assert(NULL == p); + print_span(n->span, indent); + } else { + for (i = 0; i < indent; i++) + putchar('\t'); + + printf("%s (%s)", p, t); - for (i = 0; i < (int)sz; i++) - (void)printf(" [%s]", params[i]); + for (i = 0; i < (int)argc; i++) { + printf(" -%s", mdoc_argnames[argv[i].arg]); + if (argv[i].sz > 0) + printf(" ["); + for (j = 0; j < (int)argv[i].sz; j++) + printf(" [%s]", argv[i].value[j]); + if (argv[i].sz > 0) + printf(" ]"); + } + + for (i = 0; i < (int)sz; i++) + printf(" [%s]", params[i]); - (void)printf(" %d:%d\n", n->line, n->pos); + printf(" %d:%d", n->line, n->pos); + } + + putchar('\n'); if (n->child) print_mdoc(n->child, indent + 1); @@ -175,11 +191,16 @@ print_man(const struct man_node *n, int indent) case (MAN_BODY): t = "block-body"; break; + case (MAN_TBL): + t = "tbl"; + break; default: abort(); /* NOTREACHED */ } + p = NULL; + switch (n->type) { case (MAN_TEXT): p = n->string; @@ -196,17 +217,69 @@ print_man(const struct man_node *n, int indent) case (MAN_ROOT): p = "root"; break; + case (MAN_TBL): + break; default: abort(); /* NOTREACHED */ } - for (i = 0; i < indent; i++) - (void)printf(" "); - (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos); + if (n->span) { + assert(NULL == p); + print_span(n->span, indent); + } else { + for (i = 0; i < indent; i++) + putchar('\t'); + printf("%s (%s) %d:%d", 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_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('-'); + return; + case (TBL_SPAN_DHORIZ): + putchar('='); + return; + default: + break; + } + + for (dp = sp->first; dp; dp = dp->next) { + switch (dp->pos) { + case (TBL_DATA_HORIZ): + /* FALLTHROUGH */ + case (TBL_DATA_NHORIZ): + putchar('-'); + continue; + case (TBL_DATA_DHORIZ): + /* FALLTHROUGH */ + case (TBL_DATA_NDHORIZ): + putchar('='); + continue; + default: + break; + } + printf("[%s%s]", dp->string, dp->layout ? "" : "*"); + if (dp->next) + putchar(' '); + } +} |