===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.138
retrieving revision 1.144
diff -u -p -r1.138 -r1.144
--- mandoc/mdoc.h	2015/04/02 22:48:17	1.138
+++ mandoc/mdoc.h	2015/11/07 14:01:16	1.144
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.h,v 1.138 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: mdoc.h,v 1.144 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -172,16 +172,6 @@ enum	mdocargt {
 	MDOC_ARG_MAX
 };
 
-struct	mdoc_meta {
-	char		 *msec; /* `Dt' section (1, 3p, etc.) */
-	char		 *vol; /* `Dt' volume (implied) */
-	char		 *arch; /* `Dt' arch (i386, etc.) */
-	char		 *date; /* `Dd' normalised date */
-	char		 *title; /* `Dt' title (FOO, etc.) */
-	char		 *os; /* `Os' system (OpenBSD, etc.) */
-	char		 *name; /* leading `Nm' name */
-};
-
 /*
  * An argument to a macro (multiple values = `-column xxx yyy').
  */
@@ -290,12 +280,5 @@ extern	const char *const *mdoc_macronames;
 /* Names of macro args.  Index is enum mdocargt. */
 extern	const char *const *mdoc_argnames;
 
-__BEGIN_DECLS
 
-struct	mdoc;
-
-const struct roff_node *mdoc_node(const struct mdoc *);
-const struct mdoc_meta *mdoc_meta(const struct mdoc *);
-void mdoc_deroff(char **, const struct roff_node *);
-
-__END_DECLS
+void		 mdoc_validate(struct roff_man *);