===================================================================
RCS file: /cvs/mandoc/roff.h,v
retrieving revision 1.44
retrieving revision 1.47
diff -u -p -r1.44 -r1.47
--- mandoc/roff.h	2017/05/05 02:06:19	1.44
+++ mandoc/roff.h	2017/05/07 17:31:45	1.47
@@ -1,4 +1,4 @@
-/*	$Id: roff.h,v 1.44 2017/05/05 02:06:19 schwarze Exp $	*/
+/*	$Id: roff.h,v 1.47 2017/05/07 17:31:45 schwarze Exp $	*/
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -68,6 +68,9 @@ enum	roff_type {
 enum	roff_tok {
 	ROFF_br = 0,
 	ROFF_ft,
+	ROFF_ll,
+	ROFF_sp,
+	ROFF_ta,
 	ROFF_MAX,
 	ROFF_ab,
 	ROFF_ad,
@@ -196,7 +199,6 @@ enum	roff_tok {
 	ROFF_lg,
 	ROFF_lhang,
 	ROFF_linetabs,
-	/* MAN_ll, MDOC_ll */
 	ROFF_lnr,
 	ROFF_lnrf,
 	ROFF_lpfx,
@@ -261,7 +263,6 @@ enum	roff_tok {
 	ROFF_shift,
 	ROFF_sizes,
 	ROFF_so,
-	/* MAN_sp, MDOC_sp */
 	ROFF_spacewidth,
 	ROFF_special,
 	ROFF_spreadwarn,
@@ -271,7 +272,6 @@ enum	roff_tok {
 	ROFF_sv,
 	ROFF_sy,
 	ROFF_T_,
-	ROFF_ta,
 	ROFF_tc,
 	ROFF_TE,
 	ROFF_TH,
@@ -429,10 +429,8 @@ enum	roff_tok {
 	MDOC_En,
 	MDOC_Dx,
 	MDOC__Q,
-	MDOC_sp,
 	MDOC__U,
 	MDOC_Ta,
-	MDOC_ll,
 	MDOC_MAX,
 	MAN_TH,
 	MAN_SH,
@@ -454,7 +452,6 @@ enum	roff_tok {
 	MAN_I,
 	MAN_IR,
 	MAN_RI,
-	MAN_sp,
 	MAN_nf,
 	MAN_fi,
 	MAN_RE,
@@ -469,7 +466,6 @@ enum	roff_tok {
 	MAN_EE,
 	MAN_UR,
 	MAN_UE,
-	MAN_ll,
 	MAN_MAX
 };