=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tree.c,v retrieving revision 1.29 retrieving revision 1.30 diff -c -r1.29 -r1.30 *** src/usr.bin/mandoc/tree.c 2015/02/05 00:13:34 1.29 --- src/usr.bin/mandoc/tree.c 2015/04/02 21:03:18 1.30 *************** *** 1,4 **** ! /* $OpenBSD: tree.c,v 1.29 2015/02/05 00:13:34 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2013, 2014, 2015 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: tree.c,v 1.30 2015/04/02 21:03:18 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2013, 2014, 2015 Ingo Schwarze *************** *** 7,15 **** * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * ! * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ! * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF --- 7,15 ---- * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * ! * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ! * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *************** *** 24,29 **** --- 24,30 ---- #include #include "mandoc.h" + #include "roff.h" #include "mdoc.h" #include "man.h" #include "main.h" *************** *** 64,96 **** t = p = NULL; switch (n->type) { ! case MDOC_ROOT: t = "root"; break; ! case MDOC_BLOCK: t = "block"; break; ! case MDOC_HEAD: t = "block-head"; break; ! case MDOC_BODY: if (n->end) t = "body-end"; else t = "block-body"; break; ! case MDOC_TAIL: t = "block-tail"; break; ! case MDOC_ELEM: t = "elem"; break; ! case MDOC_TEXT: t = "text"; break; ! case MDOC_TBL: break; ! case MDOC_EQN: t = "eqn"; break; default: --- 65,97 ---- t = p = NULL; switch (n->type) { ! case ROFFT_ROOT: t = "root"; break; ! case ROFFT_BLOCK: t = "block"; break; ! case ROFFT_HEAD: t = "block-head"; break; ! case ROFFT_BODY: if (n->end) t = "body-end"; else t = "block-body"; break; ! case ROFFT_TAIL: t = "block-tail"; break; ! case ROFFT_ELEM: t = "elem"; break; ! case ROFFT_TEXT: t = "text"; break; ! case ROFFT_TBL: break; ! case ROFFT_EQN: t = "eqn"; break; default: *************** *** 99,136 **** } switch (n->type) { ! case MDOC_TEXT: p = n->string; break; ! case MDOC_BODY: p = mdoc_macronames[n->tok]; break; ! case MDOC_HEAD: p = mdoc_macronames[n->tok]; break; ! case MDOC_TAIL: p = mdoc_macronames[n->tok]; break; ! case MDOC_ELEM: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; ! case MDOC_BLOCK: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; ! case MDOC_TBL: break; ! case MDOC_EQN: p = "EQ"; break; ! case MDOC_ROOT: p = "root"; break; default: --- 100,137 ---- } switch (n->type) { ! case ROFFT_TEXT: p = n->string; break; ! case ROFFT_BODY: p = mdoc_macronames[n->tok]; break; ! case ROFFT_HEAD: p = mdoc_macronames[n->tok]; break; ! case ROFFT_TAIL: p = mdoc_macronames[n->tok]; break; ! case ROFFT_ELEM: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; ! case ROFFT_BLOCK: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; ! case ROFFT_TBL: break; ! case ROFFT_EQN: p = "EQ"; break; ! case ROFFT_ROOT: p = "root"; break; default: *************** *** 167,173 **** print_box(n->eqn->root->first, indent + 4); if (n->child) print_mdoc(n->child, indent + ! (n->type == MDOC_BLOCK ? 2 : 4)); if (n->next) print_mdoc(n->next, indent); } --- 168,174 ---- print_box(n->eqn->root->first, indent + 4); if (n->child) print_mdoc(n->child, indent + ! (n->type == ROFFT_BLOCK ? 2 : 4)); if (n->next) print_mdoc(n->next, indent); } *************** *** 184,210 **** t = p = NULL; switch (n->type) { ! case MAN_ROOT: t = "root"; break; ! case MAN_ELEM: t = "elem"; break; ! case MAN_TEXT: t = "text"; break; ! case MAN_BLOCK: t = "block"; break; ! case MAN_HEAD: t = "block-head"; break; ! case MAN_BODY: t = "block-body"; break; ! case MAN_TBL: break; ! case MAN_EQN: t = "eqn"; break; default: --- 185,211 ---- t = p = NULL; switch (n->type) { ! case ROFFT_ROOT: t = "root"; break; ! case ROFFT_ELEM: t = "elem"; break; ! case ROFFT_TEXT: t = "text"; break; ! case ROFFT_BLOCK: t = "block"; break; ! case ROFFT_HEAD: t = "block-head"; break; ! case ROFFT_BODY: t = "block-body"; break; ! case ROFFT_TBL: break; ! case ROFFT_EQN: t = "eqn"; break; default: *************** *** 213,236 **** } switch (n->type) { ! case MAN_TEXT: p = n->string; break; ! case MAN_ELEM: /* FALLTHROUGH */ ! case MAN_BLOCK: /* FALLTHROUGH */ ! case MAN_HEAD: /* FALLTHROUGH */ ! case MAN_BODY: p = man_macronames[n->tok]; break; ! case MAN_ROOT: p = "root"; break; ! case MAN_TBL: break; ! case MAN_EQN: p = "EQ"; break; default: --- 214,237 ---- } switch (n->type) { ! case ROFFT_TEXT: p = n->string; break; ! case ROFFT_ELEM: /* FALLTHROUGH */ ! case ROFFT_BLOCK: /* FALLTHROUGH */ ! case ROFFT_HEAD: /* FALLTHROUGH */ ! case ROFFT_BODY: p = man_macronames[n->tok]; break; ! case ROFFT_ROOT: p = "root"; break; ! case ROFFT_TBL: break; ! case ROFFT_EQN: p = "EQ"; break; default: *************** *** 254,260 **** print_box(n->eqn->root->first, indent + 4); if (n->child) print_man(n->child, indent + ! (n->type == MAN_BLOCK ? 2 : 4)); if (n->next) print_man(n->next, indent); } --- 255,261 ---- print_box(n->eqn->root->first, indent + 4); if (n->child) print_man(n->child, indent + ! (n->type == ROFFT_BLOCK ? 2 : 4)); if (n->next) print_man(n->next, indent); }