===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.35
retrieving revision 1.81
diff -u -p -r1.35 -r1.81
--- mandoc/libman.h	2010/06/09 19:22:56	1.35
+++ mandoc/libman.h	2017/04/29 12:45:41	1.81
@@ -1,90 +1,40 @@
-/*	$Id: libman.h,v 1.35 2010/06/09 19:22:56 kristaps Exp $ */
+/*	$Id: libman.h,v 1.81 2017/04/29 12:45:41 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015 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 {
-	void		*data;
-	mandocmsg	 msg;
-	int		 pflags; /* parse flags (see man.h) */
-	int		 flags; /* parse flags */
-#define	MAN_HALT	(1 << 0) /* badness happened: die */
-#define	MAN_ELINE	(1 << 1) /* Next-line element scope. */
-#define	MAN_BLINE	(1 << 2) /* Next-line block scope. */
-#define	MAN_ILINE	(1 << 3) /* Ignored in next-line scope. */
-#define	MAN_LITERAL	(1 << 4) /* Literal input. */
-#define	MAN_BPLINE	(1 << 5)
-	enum man_next	 next;
-	struct man_node	*last;
-	struct man_node	*first;
-	struct man_meta	 meta;
-};
-
-#define	MACRO_PROT_ARGS	  struct man *m, enum mant tok, int line, \
-			  int ppos, int *pos, char *buf
-
 struct	man_macro {
-	int		(*fp)(MACRO_PROT_ARGS);
+	void		(*fp)(MACRO_PROT_ARGS);
 	int		  flags;
-#define	MAN_SCOPED	 (1 << 0)
-#define	MAN_EXPLICIT	 (1 << 1)	/* See blk_imp(). */
-#define	MAN_FSCOPED	 (1 << 2)	/* See blk_imp(). */
-#define	MAN_NSCOPED	 (1 << 3)	/* See in_line_eoln(). */
-#define	MAN_NOCLOSE	 (1 << 4)	/* See blk_exp(). */
+#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. */
 };
 
 extern	const struct man_macro *const man_macros;
 
-__BEGIN_DECLS
 
-#define		  man_pmsg(m, l, p, t) \
-		  (*(m)->msg)((t), (m)->data, (l), (p), NULL)
-#define		  man_nmsg(m, n, t) \
-		  (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
-int		  man_word_alloc(struct man *, int, int, const char *);
-int		  man_block_alloc(struct man *, int, int, enum mant);
-int		  man_head_alloc(struct man *, int, int, enum mant);
-int		  man_body_alloc(struct man *, int, int, enum mant);
-int		  man_elem_alloc(struct man *, int, int, enum mant);
-void		  man_node_delete(struct man *, struct man_node *);
-void		  man_hash_init(void);
-enum	mant	  man_hash_find(const char *);
-int		  man_macroend(struct man *);
-int		  man_args(struct man *, int, int *, char *, char **);
-#define	ARGS_ERROR	(-1)
-#define	ARGS_EOLN	(0)
-#define	ARGS_WORD	(1)
-#define	ARGS_QWORD	(1)
-int		  man_vmsg(struct man *, enum mandocerr,
-			int, int, const char *, ...);
-int		  man_valid_post(struct man *);
-int		  man_valid_pre(struct man *, struct man_node *);
-int		  man_action_post(struct man *);
-int		  man_action_pre(struct man *, struct man_node *);
-int		  man_unscope(struct man *, 
-			const struct man_node *, enum mandocerr);
-
-__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 *);