===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.20
retrieving revision 1.76
diff -u -p -r1.20 -r1.76
--- mandoc/libman.h	2009/08/21 13:14:07	1.20
+++ mandoc/libman.h	2015/04/19 14:57:38	1.76
@@ -1,118 +1,44 @@
-/*	$Id: libman.h,v 1.20 2009/08/21 13:14:07 kristaps Exp $ */
+/*	$Id: libman.h,v 1.76 2015/04/19 14:57:38 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, \
+			  int tok, \
+			  int line, \
+			  int ppos, \
+			  int *pos, \
+			  char *buf
 
-enum	man_next {
-	MAN_NEXT_SIBLING = 0,
-	MAN_NEXT_CHILD
-};
-
-struct	man {
-	void		*data;
-	struct man_cb	 cb;
-	void		*htab;
-	int		 pflags;
-	int		 flags;
-#define	MAN_HALT	(1 << 0)
-#define	MAN_ELINE	(1 << 1) 	/* Next-line element scope. */
-#define	MAN_BLINE	(1 << 2) 	/* Next-line block scope. */
-#define	MAN_LITERAL	(1 << 3)	/* Literal input. */
-	enum man_next	 next;
-	struct man_node	*last;
-	struct man_node	*first;
-	struct man_meta	 meta;
-};
-
-enum	merr {
-	WNPRINT = 0,
-	WNMEM,
-	WMSEC,
-	WDATE,
-	WLNSCOPE,
-	WTSPACE,
-	WTQUOTE,
-	WNODATA,
-	WNOTITLE,
-	WESCAPE,
-	WNUMFMT,
-	WHEADARGS,
-	WBODYARGS,
-	WNHEADARGS,
-	WMACRO,
-	WMACROFORM,
-	WEXITSCOPE,
-	WNOSCOPE,
-	WOLITERAL,
-	WNLITERAL,
-	WERRMAX
-};
-
-#define	MACRO_PROT_ARGS	  struct man *m, int 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_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_perr(m, l, p, t) \
-		  man_err((m), (l), (p), 1, (t))
-#define		  man_pwarn(m, l, p, t) \
-		  man_err((m), (l), (p), 0, (t))
-#define		  man_nerr(m, n, t) \
-		  man_err((m), (n)->line, (n)->pos, 1, (t))
-#define		  man_nwarn(m, n, t) \
-		  man_err((m), (n)->line, (n)->pos, 0, (t))
+int		  man_hash_find(const char *);
+void		  man_macroend(struct roff_man *);
+void		  man_valid_post(struct roff_man *);
+void		  man_unscope(struct roff_man *, const struct roff_node *);
 
-int		  man_word_alloc(struct man *, int, int, const char *);
-int		  man_block_alloc(struct man *, int, int, int);
-int		  man_head_alloc(struct man *, int, int, int);
-int		  man_body_alloc(struct man *, int, int, int);
-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_hash_find(const void *, const char *);
-void		  man_hash_free(void *);
-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_err(struct man *, int, int, int, enum merr);
-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_valid_pre(struct man *, const 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 *);
-
 __END_DECLS
-
-#endif /*!LIBMAN_H*/