===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.71
retrieving revision 1.82
diff -u -p -r1.71 -r1.82
--- mandoc/libman.h	2015/04/18 16:06:39	1.71
+++ mandoc/libman.h	2018/08/17 20:33:37	1.82
@@ -1,7 +1,7 @@
-/*	$Id: libman.h,v 1.71 2015/04/18 16:06:39 schwarze Exp $ */
+/*	$Id: libman.h,v 1.82 2018/08/17 20:33:37 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
  */
 
 #define	MACRO_PROT_ARGS	  struct roff_man *man, \
-			  int tok, \
+			  enum roff_tok tok, \
 			  int line, \
 			  int ppos, \
 			  int *pos, \
@@ -32,21 +32,8 @@ struct	man_macro {
 #define	MAN_JOIN	 (1 << 3)  /* Join arguments together. */
 };
 
-extern	const struct man_macro *const man_macros;
+const struct man_macro *man_macro(enum roff_tok);
 
-__BEGIN_DECLS
-
-void		  man_word_alloc(struct roff_man *, int, int, const char *);
-void		  man_word_append(struct roff_man *, const char *);
-void		  man_block_alloc(struct roff_man *, int, int, int);
-void		  man_head_alloc(struct roff_man *, int, int, int);
-void		  man_body_alloc(struct roff_man *, int, int, int);
-void		  man_elem_alloc(struct roff_man *, int, int, int);
-void		  man_node_delete(struct roff_man *, struct roff_node *);
-void		  man_hash_init(void);
-int		  man_hash_find(const char *);
-void		  man_macroend(struct roff_man *);
-void		  man_valid_post(struct roff_man *);
+void		  man_node_validate(struct roff_man *);
+void		  man_state(struct roff_man *, struct roff_node *);
 void		  man_unscope(struct roff_man *, const struct roff_node *);
-
-__END_DECLS