===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- mandoc/Attic/private.h	2008/11/27 11:23:51	1.10
+++ mandoc/Attic/private.h	2008/11/28 11:21:12	1.14
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.10 2008/11/27 11:23:51 kristaps Exp $ */
+/* $Id: private.h,v 1.14 2008/11/28 11:21:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -199,22 +199,26 @@ struct	md_mbuf {
 #define ROFF_susv2	 55
 #define ROFF_susv3	 56
 #define ROFF_svid4	 57
-#define	ROFF_ARGMAX	 58
+#define	ROFF_Filled	 58
+#define	ROFF_Words	 59
+#define	ROFF_ARGMAX	 60
 
 extern	const char *const *toknames;
 extern	const char *const *tokargnames;
 
-/* FIXME: have a md_roff with all necessary parameters. */
+enum	roffmsg { ROFF_WARN, ROFF_ERROR };
 
-/* FIXME: have roffbegin and roffend for doc head/foot. */
-
 struct	roffcb {
-	int	(*roffhead)(void);
-	int	(*rofftail)(void);
-	int	(*roffin)(int, int *, char **);
-	int	(*roffout)(int);
-	int	(*roffblkin)(int);
-	int	(*roffblkout)(int);
+	void	(*roffmsg)(const struct md_args *, enum roffmsg, 
+			const char *, const char *, const char *, 
+			int, char *);
+	int	(*roffhead)(const struct md_args *);
+	int	(*rofftail)(const struct md_args *);
+	int	(*roffin)(const struct md_args *, int, int *, char **);
+	int	(*roffout)(const struct md_args *, int);
+	int	(*roffblkin)(const struct md_args *, int);
+	int	(*roffblkout)(const struct md_args *, int);
+	int	(*roffspecial)(const struct md_args *, int);
 };
 
 __BEGIN_DECLS
@@ -229,10 +233,10 @@ void		 *md_init_html4_strict(const struct md_args *,
 int		  md_line_html4_strict(void *, char *, size_t);
 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 *, size_t);
+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);