===================================================================
RCS file: /cvs/mandoc/roff.h,v
retrieving revision 1.43
retrieving revision 1.45
diff -u -p -r1.43 -r1.45
--- mandoc/roff.h	2017/05/04 17:48:29	1.43
+++ mandoc/roff.h	2017/05/05 13:17:55	1.45
@@ -1,4 +1,4 @@
-/*	$Id: roff.h,v 1.43 2017/05/04 17:48:29 schwarze Exp $	*/
+/*	$Id: roff.h,v 1.45 2017/05/05 13:17:55 schwarze Exp $	*/
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -67,6 +67,8 @@ enum	roff_type {
 
 enum	roff_tok {
 	ROFF_br = 0,
+	ROFF_ft,
+	ROFF_ll,
 	ROFF_MAX,
 	ROFF_ab,
 	ROFF_ad,
@@ -156,7 +158,6 @@ enum	roff_tok {
 	ROFF_fschar,
 	ROFF_fspacewidth,
 	ROFF_fspecial,
-	/* MAN_ft; ignored in mdoc(7) */
 	ROFF_ftr,
 	ROFF_fzoom,
 	ROFF_gcolor,
@@ -196,7 +197,6 @@ enum	roff_tok {
 	ROFF_lg,
 	ROFF_lhang,
 	ROFF_linetabs,
-	/* MAN_ll, MDOC_ll */
 	ROFF_lnr,
 	ROFF_lnrf,
 	ROFF_lpfx,
@@ -432,7 +432,6 @@ enum	roff_tok {
 	MDOC_sp,
 	MDOC__U,
 	MDOC_Ta,
-	MDOC_ll,
 	MDOC_MAX,
 	MAN_TH,
 	MAN_SH,
@@ -464,13 +463,11 @@ enum	roff_tok {
 	MAN_PD,
 	MAN_AT,
 	MAN_in,
-	MAN_ft,
 	MAN_OP,
 	MAN_EX,
 	MAN_EE,
 	MAN_UR,
 	MAN_UE,
-	MAN_ll,
 	MAN_MAX
 };
 
@@ -576,3 +573,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 *);