===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.9
retrieving revision 1.82
diff -u -p -r1.9 -r1.82
--- mandoc/libman.h	2009/06/10 20:18:43	1.9
+++ mandoc/libman.h	2018/08/17 20:33:37	1.82
@@ -1,60 +1,39 @@
-/*	$Id: libman.h,v 1.9 2009/06/10 20:18:43 kristaps Exp $ */
+/*	$Id: libman.h,v 1.82 2018/08/17 20:33:37 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef LIBMAN_H
-#define LIBMAN_H
 
-#include "man.h"
+#define	MACRO_PROT_ARGS	  struct roff_man *man, \
+			  enum roff_tok tok, \
+			  int line, \
+			  int ppos, \
+			  int *pos, \
+			  char *buf
 
-enum	man_next {
-	MAN_NEXT_SIBLING = 0,
-	MAN_NEXT_CHILD
+struct	man_macro {
+	void		(*fp)(MACRO_PROT_ARGS);
+	int		  flags;
+#define	MAN_SCOPED	 (1 << 0)  /* Optional next-line scope. */
+#define	MAN_NSCOPED	 (1 << 1)  /* Allowed in next-line element scope. */
+#define	MAN_BSCOPE	 (1 << 2)  /* Break next-line block scope. */
+#define	MAN_JOIN	 (1 << 3)  /* Join arguments together. */
 };
 
-struct	man {
-	void		*data;
-	struct man_cb	 cb;
-	void		*htab;
-	int		 pflags;
-	int		 flags;
-#define	MAN_HALT	(1 << 0)
-#define	MAN_NLINE	(1 << 1)
-	enum man_next	 next;
-	struct man_node	*last;
-	struct man_node	*first;
-	struct man_meta	 meta;
-};
+const struct man_macro *man_macro(enum roff_tok);
 
-__BEGIN_DECLS
-
-int		  man_word_alloc(struct man *, int, int, const char *);
-int		  man_elem_alloc(struct man *, int, int, int);
-void		  man_node_free(struct man_node *);
-void		  man_node_freelist(struct man_node *);
-void		 *man_hash_alloc(void);
-int		  man_macro(struct man *, int, 
-			int, int, int *, char *);
-int		  man_hash_find(const void *, const char *);
-void		  man_hash_free(void *);
-int		  man_macroend(struct man *);
-int		  man_vwarn(struct man *, int, int, const char *, ...);
-int		  man_verr(struct man *, int, int, const char *, ...);
-int		  man_valid_post(struct man *);
-int		  man_action_post(struct man *);
-
-__END_DECLS
-
-#endif /*!LIBMAN_H*/
+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 *);