===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- mandoc/Attic/private.h	2008/12/01 15:32:36	1.21
+++ mandoc/Attic/private.h	2008/12/03 19:21:58	1.25
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.21 2008/12/01 15:32:36 kristaps Exp $ */
+/* $Id: private.h,v 1.25 2008/12/03 19:21:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,7 +19,6 @@
 #ifndef PRIVATE_H
 #define PRIVATE_H
 
-/* Input buffer (input read into buffer, then filled when empty). */
 struct	md_rbuf {
 	int		 fd;		/* Open descriptor. */
 	char		*name;		/* Name of file. */
@@ -28,7 +27,6 @@ struct	md_rbuf {
 	size_t		 line;		/* Current line number. */
 };
 
-/* Output buffer (output buffered until full, then flushed). */
 struct	md_mbuf {
 	int		 fd;		/* Open descriptor. */
 	char		*name;		/* Name of file. */
@@ -217,14 +215,20 @@ struct	roffcb {
 			const char *, const char *, char *);
 	int	(*roffhead)(void *);
 	int	(*rofftail)(void *);
-	int	(*roffin)(void *, int, int *, char **);
 	int	(*roffdata)(void *, int, char *);
+	int	(*roffin)(void *, int, int *, char **);
 	int	(*roffout)(void *, int);
 	int	(*roffblkin)(void *, int, int *, char **);
 	int	(*roffblkout)(void *, int);
-	int	(*roffspecial)(void *, int);
+	int	(*roffblkheadin)(void *, int, int *, char **);
+	int	(*roffblkheadout)(void *, int);
+	int	(*roffblkbodyin)(void *, int, int *, char **);
+	int	(*roffblkbodyout)(void *, int);
+	int	(*roffspecial)(void *, int, int *, char **, char **);
 };
 
+struct	rofftree;
+
 __BEGIN_DECLS
 
 typedef	void  (*(*md_init)(const struct md_args *, 
@@ -232,10 +236,10 @@ typedef	void  (*(*md_init)(const struct md_args *, 
 typedef	int	(*md_line)(void *, char *);
 typedef	int	(*md_exit)(void *, int);
 
-void		 *md_init_html4_strict(const struct md_args *,
+void		 *md_init_html(const struct md_args *,
 			struct md_mbuf *, const struct md_rbuf *);
-int		  md_line_html4_strict(void *, char *);
-int		  md_exit_html4_strict(void *, int);
+int		  md_line_html(void *, char *);
+int		  md_exit_html(void *, int);
 
 void		 *md_init_xml(const struct md_args *,
 			struct md_mbuf *, const struct md_rbuf *);
@@ -245,8 +249,6 @@ int		  md_exit_xml(void *, int);
 int	 	  md_buf_puts(struct md_mbuf *, const char *, size_t);
 int	 	  md_buf_putchar(struct md_mbuf *, char);
 int	 	  md_buf_putstring(struct md_mbuf *, const char *);
-
-struct	rofftree;
 
 struct	rofftree *roff_alloc(const struct roffcb *, void *);
 int		  roff_engine(struct rofftree *, char *);