===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.12
retrieving revision 1.18
diff -u -p -r1.12 -r1.18
--- mandoc/Attic/private.h	2008/11/27 16:54:58	1.12
+++ mandoc/Attic/private.h	2008/11/30 18:50:44	1.18
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.12 2008/11/27 16:54:58 kristaps Exp $ */
+/* $Id: private.h,v 1.18 2008/11/30 18:50:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -209,34 +209,34 @@ extern	const char *const *tokargnames;
 enum	roffmsg { ROFF_WARN, ROFF_ERROR };
 
 struct	roffcb {
-	void	(*roffmsg)(const struct md_args *, enum roffmsg, 
-			const char *, const char *, const char *, 
-			int, char *);
-	int	(*roffhead)(void);
-	int	(*rofftail)(void);
-	int	(*roffin)(int, int *, char **);
-	int	(*roffout)(int);
-	int	(*roffblkin)(int);
-	int	(*roffblkout)(int);
-	int	(*roffspecial)(int);
+	void	(*roffmsg)(void *, enum roffmsg, 
+			const char *, const char *, char *);
+	int	(*roffhead)(void *);
+	int	(*rofftail)(void *);
+	int	(*roffin)(void *, int, int *, char **);
+	int	(*roffdata)(void *, int, char *);
+	int	(*roffout)(void *, int);
+	int	(*roffblkin)(void *, int, int *, char **);
+	int	(*roffblkout)(void *, int);
+	int	(*roffspecial)(void *, int);
 };
 
 __BEGIN_DECLS
 
 typedef	void  (*(*md_init)(const struct md_args *, 
 			struct md_mbuf *, const struct md_rbuf *));
-typedef	int	(*md_line)(void *, char *, size_t);
+typedef	int	(*md_line)(void *, char *);
 typedef	int	(*md_exit)(void *, int);
 
 void		 *md_init_html4_strict(const struct md_args *,
 			struct md_mbuf *, const struct md_rbuf *);
-int		  md_line_html4_strict(void *, char *, size_t);
+int		  md_line_html4_strict(void *, char *);
 int		  md_exit_html4_strict(void *, int);
 
-void		 *md_init_dummy(const struct md_args *,
+void		 *md_init_valid(const struct md_args *,
 			struct md_mbuf *, const struct md_rbuf *);
-int		  md_line_dummy(void *, char *, size_t);
-int		  md_exit_dummy(void *, int);
+int		  md_line_valid(void *, char *);
+int		  md_exit_valid(void *, int);
 
 int	 	  md_buf_puts(struct md_mbuf *, const char *, size_t);
 int	 	  md_buf_putchar(struct md_mbuf *, char);
@@ -244,10 +244,8 @@ int	 	  md_buf_putstring(struct md_mbuf *, const char 
 
 struct	rofftree;
 
-struct	rofftree *roff_alloc(const struct md_args *, 
-			struct md_mbuf *, const struct md_rbuf *,
-			const struct roffcb *);
-int		  roff_engine(struct rofftree *, char *, size_t);
+struct	rofftree *roff_alloc(const struct roffcb *, void *);
+int		  roff_engine(struct rofftree *, char *);
 int		  roff_free(struct rofftree *, int);
 
 __END_DECLS