===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.5
retrieving revision 1.42
diff -u -p -r1.5 -r1.42
--- mandoc/Attic/private.h	2008/11/24 18:32:39	1.5
+++ mandoc/Attic/private.h	2008/12/15 03:13:01	1.42
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.5 2008/11/24 18:32:39 kristaps Exp $ */
+/* $Id: private.h,v 1.42 2008/12/15 03:13:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,71 +19,51 @@
 #ifndef PRIVATE_H
 #define PRIVATE_H
 
-struct	md_rbuf {
-	int		 fd;
-	char		*name;
-	char		*buf;
-	size_t		 bufsz;
-	size_t		 line;
+#include "mdoc.h"
+
+struct	mdoc {
+	void		 *data;
+	struct mdoc_cb	  cb;
+	void		 *htab;
+	struct mdoc_node *last;
+	struct mdoc_node *first;
+
+	enum mdoc_sec	  sec_lastn;
+	enum mdoc_sec	  sec_last;
 };
 
-struct	md_mbuf {
-	int		 fd;
-	char		*name;
-	char		*buf;
-	size_t		 bufsz;
-	size_t		 pos;
+struct	mdoc_macro {
+	int	(*fp)(struct mdoc *, int, int, int *, char *);
+	int	  flags;
+#define	MDOC_CALLABLE	(1 << 0)
+#define	MDOC_EXPLICIT	(1 << 1)
 };
 
-#define	ROFF___	 	 0
-#define	ROFF_Dd		 1
-#define	ROFF_Dt		 2
-#define	ROFF_Os		 3
-#define	ROFF_Sh		 4
-#define	ROFF_An		 5
-#define	ROFF_Li		 6
-#define	ROFF_MAX	 7
+extern	const struct mdoc_macro *const mdoc_macros;
 
-#define	ROFF_Split	 0
-#define	ROFF_Nosplit	 1
-#define	ROFF_ARGMAX	 2
-
-/* FIXME: have a md_roff with all necessary parameters. */
-
-typedef	int	(*roffin)(int, int *, char **);
-typedef	int	(*roffout)(int);
-typedef	int	(*roffblkin)(int);
-typedef	int	(*roffblkout)(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_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_exit_html4_strict(void *, int);
-
-void		 *md_init_dummy(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_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 md_args *, 
-			struct md_mbuf *, const struct md_rbuf *,
-			const roffin *, const roffout *,
-			const roffblkin *, const roffblkout *);
-int		  roff_engine(struct rofftree *, char *, size_t);
-int		  roff_free(struct rofftree *, int);
+int		  mdoc_err(struct mdoc *, int, int, enum mdoc_err);
+int		  mdoc_warn(struct mdoc *, int, int, enum mdoc_warn);
+void		  mdoc_msg(struct mdoc *, int, const char *, ...);
+int		  mdoc_macro(struct mdoc *, int, int, int *, char *);
+int		  mdoc_find(const struct mdoc *, const char *);
+void		  mdoc_word_alloc(struct mdoc *, int, const char *);
+void		  mdoc_elem_alloc(struct mdoc *, int, int, 
+			size_t, const struct mdoc_arg *, 
+			size_t, const char **);
+void		  mdoc_block_alloc(struct mdoc *, int, int, 
+			size_t, const struct mdoc_arg *);
+void		  mdoc_head_alloc(struct mdoc *, 
+			int, int, size_t, const char **);
+void		  mdoc_body_alloc(struct mdoc *, int, int);
+void		  mdoc_node_free(struct mdoc_node *);
+void		  mdoc_sibling(struct mdoc *, int, struct mdoc_node **,
+			struct mdoc_node **, struct mdoc_node *);
+void		 *mdoc_hash_alloc(void);
+int		  mdoc_hash_find(const void *, const char *);
+void		  mdoc_hash_free(void *);
+int		  mdoc_isdelim(const char *);
 
 __END_DECLS