===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tree.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/mandoc/tree.c	2014/03/08 15:50:21	1.20
--- src/usr.bin/mandoc/tree.c	2014/04/20 16:44:44	1.21
***************
*** 1,4 ****
! /*	$Id: tree.c,v 1.20 2014/03/08 15:50:21 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: tree.c,v 1.21 2014/04/20 16:44:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 32,38 ****
  static	void	print_span(const struct tbl_span *, int);
  
  
- /* ARGSUSED */
  void
  tree_mdoc(void *arg, const struct mdoc *mdoc)
  {
--- 32,37 ----
***************
*** 40,47 ****
  	print_mdoc(mdoc_node(mdoc), 0);
  }
  
- 
- /* ARGSUSED */
  void
  tree_man(void *arg, const struct man *man)
  {
--- 39,44 ----
***************
*** 49,55 ****
  	print_man(man_node(man), 0);
  }
  
- 
  static void
  print_mdoc(const struct mdoc_node *n, int indent)
  {
--- 46,51 ----
***************
*** 63,95 ****
  	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):
  		/* FALLTHROUGH */
! 	case (MDOC_EQN):
  		break;
  	default:
  		abort();
--- 59,91 ----
  	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:
  		/* FALLTHROUGH */
! 	case MDOC_EQN:
  		break;
  	default:
  		abort();
***************
*** 97,133 ****
  	}
  
  	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):
  		/* FALLTHROUGH */
! 	case (MDOC_EQN):
  		break;
! 	case (MDOC_ROOT):
  		p = "root";
  		break;
  	default:
--- 93,129 ----
  	}
  
  	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:
  		/* FALLTHROUGH */
! 	case MDOC_EQN:
  		break;
! 	case MDOC_ROOT:
  		p = "root";
  		break;
  	default:
***************
*** 172,178 ****
  		print_mdoc(n->next, indent);
  }
  
- 
  static void
  print_man(const struct man_node *n, int indent)
  {
--- 168,173 ----
***************
*** 182,211 ****
  	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_TAIL):
  		t = "block-tail";
  		break;
! 	case (MAN_TBL):
  		/* FALLTHROUGH */
! 	case (MAN_EQN):
  		break;
  	default:
  		abort();
--- 177,206 ----
  	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_TAIL:
  		t = "block-tail";
  		break;
! 	case MAN_TBL:
  		/* FALLTHROUGH */
! 	case MAN_EQN:
  		break;
  	default:
  		abort();
***************
*** 213,238 ****
  	}
  
  	switch (n->type) {
! 	case (MAN_TEXT):
  		p = n->string;
  		break;
! 	case (MAN_ELEM):
  		/* FALLTHROUGH */
! 	case (MAN_BLOCK):
  		/* FALLTHROUGH */
! 	case (MAN_HEAD):
  		/* FALLTHROUGH */
! 	case (MAN_TAIL):
  		/* FALLTHROUGH */
! 	case (MAN_BODY):
  		p = man_macronames[n->tok];
  		break;
! 	case (MAN_ROOT):
  		p = "root";
  		break;
! 	case (MAN_TBL):
  		/* FALLTHROUGH */
! 	case (MAN_EQN):
  		break;
  	default:
  		abort();
--- 208,233 ----
  	}
  
  	switch (n->type) {
! 	case MAN_TEXT:
  		p = n->string;
  		break;
! 	case MAN_ELEM:
  		/* FALLTHROUGH */
! 	case MAN_BLOCK:
  		/* FALLTHROUGH */
! 	case MAN_HEAD:
  		/* FALLTHROUGH */
! 	case MAN_TAIL:
  		/* FALLTHROUGH */
! 	case MAN_BODY:
  		p = man_macronames[n->tok];
  		break;
! 	case MAN_ROOT:
  		p = "root";
  		break;
! 	case MAN_TBL:
  		/* FALLTHROUGH */
! 	case MAN_EQN:
  		break;
  	default:
  		abort();
***************
*** 273,302 ****
  
  	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);
--- 268,297 ----
  
  	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);
***************
*** 312,321 ****
  		putchar('\t');
  
  	switch (sp->pos) {
! 	case (TBL_SPAN_HORIZ):
  		putchar('-');
  		return;
! 	case (TBL_SPAN_DHORIZ):
  		putchar('=');
  		return;
  	default:
--- 307,316 ----
  		putchar('\t');
  
  	switch (sp->pos) {
! 	case TBL_SPAN_HORIZ:
  		putchar('-');
  		return;
! 	case TBL_SPAN_DHORIZ:
  		putchar('=');
  		return;
  	default:
***************
*** 324,337 ****
  
  	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:
--- 319,332 ----
  
  	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: