===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -c -r1.116 -r1.117
*** src/usr.bin/mandoc/man.c	2017/03/03 13:55:06	1.116
--- src/usr.bin/mandoc/man.c	2017/04/24 23:06:09	1.117
***************
*** 1,4 ****
! /*	$OpenBSD: man.c,v 1.116 2017/03/03 13:55:06 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man.c,v 1.117 2017/04/24 23:06:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 33,53 ****
  #include "roff_int.h"
  #include "libman.h"
  
- const	char *const __man_macronames[MAN_MAX] = {
- 	"br",		"TH",		"SH",		"SS",
- 	"TP",		"LP",		"PP",		"P",
- 	"IP",		"HP",		"SM",		"SB",
- 	"BI",		"IB",		"BR",		"RB",
- 	"R",		"B",		"I",		"IR",
- 	"RI",		"sp",		"nf",
- 	"fi",		"RE",		"RS",		"DT",
- 	"UC",		"PD",		"AT",		"in",
- 	"ft",		"OP",		"EX",		"EE",
- 	"UR",		"UE",		"ll"
- 	};
- 
- const	char * const *man_macronames = __man_macronames;
- 
  static	void		 man_descope(struct roff_man *, int, int);
  static	int		 man_ptext(struct roff_man *, int, char *, int);
  static	int		 man_pmacro(struct roff_man *, int, char *, int);
--- 33,38 ----
***************
*** 273,280 ****
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",
! 		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
! 		    man_macronames[n->tok]);
  
  		roff_node_delete(man, n);
  		man->flags &= ~MAN_ELINE;
--- 258,265 ----
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",
! 		    tok == TOKEN_NONE ? "TS" : roff_name[tok],
! 		    roff_name[n->tok]);
  
  		roff_node_delete(man, n);
  		man->flags &= ~MAN_ELINE;
***************
*** 315,322 ****
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",
! 		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
! 		    man_macronames[n->tok]);
  
  		roff_node_delete(man, n);
  		man->flags &= ~MAN_BLINE;
--- 300,307 ----
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",
! 		    tok == TOKEN_NONE ? "TS" : roff_name[tok],
! 		    roff_name[n->tok]);
  
  		roff_node_delete(man, n);
  		man->flags &= ~MAN_BLINE;