===================================================================
RCS file: /cvs/mandoc/roff.h,v
retrieving revision 1.42
retrieving revision 1.44
diff -u -p -r1.42 -r1.44
--- mandoc/roff.h	2017/04/29 12:45:42	1.42
+++ mandoc/roff.h	2017/05/05 02:06:19	1.44
@@ -1,4 +1,4 @@
-/*	$Id: roff.h,v 1.42 2017/04/29 12:45:42 schwarze Exp $	*/
+/*	$Id: roff.h,v 1.44 2017/05/05 02:06:19 schwarze Exp $	*/
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -66,7 +66,10 @@ enum	roff_type {
 };
 
 enum	roff_tok {
-	ROFF_ab = 0,
+	ROFF_br = 0,
+	ROFF_ft,
+	ROFF_MAX,
+	ROFF_ab,
 	ROFF_ad,
 	ROFF_af,
 	ROFF_aln,
@@ -86,7 +89,6 @@ enum	roff_tok {
 	ROFF_boxa,
 	ROFF_bp,
 	ROFF_BP,
-	/* MAN_br, MDOC_br */
 	ROFF_break,
 	ROFF_breakchar,
 	ROFF_brnl,
@@ -155,7 +157,6 @@ enum	roff_tok {
 	ROFF_fschar,
 	ROFF_fspacewidth,
 	ROFF_fspecial,
-	/* MAN_ft; ignored in mdoc(7) */
 	ROFF_ftr,
 	ROFF_fzoom,
 	ROFF_gcolor,
@@ -428,7 +429,6 @@ enum	roff_tok {
 	MDOC_En,
 	MDOC_Dx,
 	MDOC__Q,
-	MDOC_br,
 	MDOC_sp,
 	MDOC__U,
 	MDOC_Ta,
@@ -454,7 +454,6 @@ enum	roff_tok {
 	MAN_I,
 	MAN_IR,
 	MAN_RI,
-	MAN_br,
 	MAN_sp,
 	MAN_nf,
 	MAN_fi,
@@ -465,7 +464,6 @@ enum	roff_tok {
 	MAN_PD,
 	MAN_AT,
 	MAN_in,
-	MAN_ft,
 	MAN_OP,
 	MAN_EX,
 	MAN_EE,
@@ -577,3 +575,4 @@ void		 deroff(char **, const struct roff_node *);
 struct ohash	*roffhash_alloc(enum roff_tok, enum roff_tok);
 enum roff_tok	 roffhash_find(struct ohash *, const char *, size_t);
 void		 roffhash_free(struct ohash *);
+void		 roff_validate(struct roff_man *);