===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tree.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/mandoc/tree.c	2017/02/10 15:44:31	1.40
--- src/usr.bin/mandoc/tree.c	2017/04/24 23:06:09	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: tree.c,v 1.40 2017/02/10 15:44:31 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tree.c,v 1.41 2017/04/24 23:06:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 127,149 ****
  		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;
--- 127,149 ----
  		p = n->string;
  		break;
  	case ROFFT_BODY:
! 		p = roff_name[n->tok];
  		break;
  	case ROFFT_HEAD:
! 		p = roff_name[n->tok];
  		break;
  	case ROFFT_TAIL:
! 		p = roff_name[n->tok];
  		break;
  	case ROFFT_ELEM:
! 		p = roff_name[n->tok];
  		if (n->args) {
  			argv = n->args->argv;
  			argc = n->args->argc;
  		}
  		break;
  	case ROFFT_BLOCK:
! 		p = roff_name[n->tok];
  		if (n->args) {
  			argv = n->args->argv;
  			argc = n->args->argc;
***************
*** 255,261 ****
  	case ROFFT_BLOCK:
  	case ROFFT_HEAD:
  	case ROFFT_BODY:
! 		p = man_macronames[n->tok];
  		break;
  	case ROFFT_ROOT:
  		p = "root";
--- 255,261 ----
  	case ROFFT_BLOCK:
  	case ROFFT_HEAD:
  	case ROFFT_BODY:
! 		p = roff_name[n->tok];
  		break;
  	case ROFFT_ROOT:
  		p = "root";