===================================================================
RCS file: /cvs/mandoc/roff.h,v
retrieving revision 1.47
retrieving revision 1.52
diff -u -p -r1.47 -r1.52
--- mandoc/roff.h	2017/05/07 17:31:45	1.47
+++ mandoc/roff.h	2017/06/07 23:29:49	1.52
@@ -1,4 +1,4 @@
-/*	$Id: roff.h,v 1.47 2017/05/07 17:31:45 schwarze Exp $	*/
+/*	$Id: roff.h,v 1.52 2017/06/07 23:29:49 schwarze Exp $	*/
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,12 @@ enum	roff_macroset {
 	MACROSET_MAN
 };
 
+enum	mdoc_os {
+	MDOC_OS_OTHER = 0,
+	MDOC_OS_NETBSD,
+	MDOC_OS_OPENBSD
+};
+
 enum	roff_sec {
 	SEC_NONE = 0,
 	SEC_NAME,
@@ -67,10 +73,13 @@ enum	roff_type {
 
 enum	roff_tok {
 	ROFF_br = 0,
+	ROFF_ce,
 	ROFF_ft,
 	ROFF_ll,
+	ROFF_mc,
 	ROFF_sp,
 	ROFF_ta,
+	ROFF_ti,
 	ROFF_MAX,
 	ROFF_ab,
 	ROFF_ad,
@@ -99,7 +108,6 @@ enum	roff_tok {
 	ROFF_brpnl,
 	ROFF_c2,
 	ROFF_cc,
-	ROFF_ce,
 	ROFF_cf,
 	ROFF_cflags,
 	ROFF_ch,
@@ -205,7 +213,6 @@ enum	roff_tok {
 	ROFF_ls,
 	ROFF_lsm,
 	ROFF_lt,
-	ROFF_mc,
 	ROFF_mediasize,
 	ROFF_minss,
 	ROFF_mk,
@@ -275,7 +282,6 @@ enum	roff_tok {
 	ROFF_tc,
 	ROFF_TE,
 	ROFF_TH,
-	ROFF_ti,
 	ROFF_tkf,
 	ROFF_tl,
 	ROFF_tm,
@@ -309,6 +315,7 @@ enum	roff_tok {
 	ROFF_writem,
 	ROFF_xflag,
 	ROFF_cblock,
+	ROFF_RENAMED,
 	ROFF_USERDEF,
 	TOKEN_NONE,
 	MDOC_Dd,
@@ -527,6 +534,7 @@ struct	roff_meta {
 	char		 *name;    /* Leading manual name. */
 	char		 *date;    /* Normalized date. */
 	int		  hasbody; /* Document is not empty. */
+	enum mdoc_os	  os_e;    /* Operating system. */
 };
 
 struct	roff_man {