===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.25
retrieving revision 1.34
diff -u -p -r1.25 -r1.34
--- mandoc/Attic/private.h	2008/12/03 19:21:58	1.25
+++ mandoc/Attic/private.h	2008/12/08 16:29:57	1.34
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.25 2008/12/03 19:21:58 kristaps Exp $ */
+/* $Id: private.h,v 1.34 2008/12/08 16:29:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,12 +19,17 @@
 #ifndef PRIVATE_H
 #define PRIVATE_H
 
+#include <stdio.h>
+#include <time.h>
+
 struct	md_rbuf {
 	int		 fd;		/* Open descriptor. */
 	char		*name;		/* Name of file. */
 	char		*buf;		/* Buffer. */
 	size_t		 bufsz;		/* Size of buffer. */
 	size_t		 line;		/* Current line number. */
+#define	MD_LINE	 	(BUFSIZ)
+	char		 linebuf[MD_LINE];
 };
 
 struct	md_mbuf {
@@ -35,6 +40,38 @@ struct	md_mbuf {
 	size_t		 pos;		/* Position in buffer. */
 };
 
+#define	ROFFTok_Sp_A	 0
+#define	ROFFTok_Sp_B	 1
+#define	ROFFTok_Sp_F	 2
+#define	ROFFTok_Sp_N	 3
+#define	ROFFTok_Sp_R	 4
+#define	ROFFTok_Sp_T	 5
+#define	ROFFTok_Sp_V	 6
+#define	ROFFTok_Space	 7
+#define	ROFFTok_Null	 8
+#define	ROFFTok_Hyphen	 9
+#define	ROFFTok_Em	 10
+#define	ROFFTok_En	 11
+#define	ROFFTok_Ge	 12
+#define	ROFFTok_Le	 13
+#define	ROFFTok_Rquote	 14
+#define	ROFFTok_Lquote	 15
+#define	ROFFTok_Uparrow	 16
+#define	ROFFTok_Acute	 17
+#define	ROFFTok_Grave	 18
+#define	ROFFTok_Pi	 19
+#define	ROFFTok_Ne	 20
+#define	ROFFTok_Lt	 21
+#define	ROFFTok_Gt	 22
+#define	ROFFTok_Plusmin	 23
+#define	ROFFTok_Infty	 24
+#define	ROFFTok_Bar	 25
+#define	ROFFTok_Nan	 26
+#define	ROFFTok_Quote	 27
+#define	ROFFTok_Sp_0	 28
+#define	ROFFTok_Slash	 29
+#define	ROFFTok_MAX	 30
+
 #define	ROFF___	 	 0
 #define	ROFF_Dd		 1
 #define	ROFF_Dt		 2
@@ -205,26 +242,69 @@ struct	md_mbuf {
 #define	ROFF_Words	 59
 #define	ROFF_ARGMAX	 60
 
+#define	ROFF_MAXLINEARG	 32
+
 extern	const char *const *toknames;
 extern	const char *const *tokargnames;
 
-enum	roffmsg { ROFF_WARN, ROFF_ERROR };
+enum	roffmsg { 
+	ROFF_WARN, 
+	ROFF_ERROR 
+};
 
+enum	roffmsec {
+	ROFF_MSEC_1,
+	ROFF_MSEC_2,
+	ROFF_MSEC_3,
+	ROFF_MSEC_3p,
+	ROFF_MSEC_4,
+	ROFF_MSEC_5,
+	ROFF_MSEC_6,
+	ROFF_MSEC_7,
+	ROFF_MSEC_8,
+	ROFF_MSEC_9,
+	ROFF_MSEC_UNASS,
+	ROFF_MSEC_DRAFT,
+	ROFF_MSEC_PAPER,
+	ROFF_MSEC_MAX
+};
+
+#define	ROFFSec_NMASK	(0x07)
+
+#define	ROFFSec_NAME	(1 << 0)
+#define	ROFFSec_SYNOP	(1 << 1)
+#define	ROFFSec_DESC	(1 << 2)
+#define	ROFFSec_RETVAL	(1 << 3)
+#define	ROFFSec_ENV	(1 << 4)
+#define	ROFFSec_FILES	(1 << 5)
+#define	ROFFSec_EX	(1 << 6)
+#define	ROFFSec_DIAG	(1 << 7)
+#define	ROFFSec_ERRS	(1 << 8)
+#define	ROFFSec_SEEALSO	(1 << 9)
+#define	ROFFSec_STAND	(1 << 10)
+#define	ROFFSec_HIST	(1 << 11)
+#define	ROFFSec_AUTH	(1 << 12)
+#define	ROFFSec_CAVEATS	(1 << 13)
+#define	ROFFSec_BUGS	(1 << 14)
+#define	ROFFSec_OTHER	(1 << 15)
+
 struct	roffcb {
 	void	(*roffmsg)(void *, enum roffmsg, 
-			const char *, const char *, char *);
-	int	(*roffhead)(void *);
+			const char *, const char *, const char *);
+	int	(*roffhead)(void *, const struct tm *, const char *, 
+			const char *, enum roffmsec, const char *);
 	int	(*rofftail)(void *);
-	int	(*roffdata)(void *, int, char *);
-	int	(*roffin)(void *, int, int *, char **);
+	int	(*roffdata)(void *, int, const char *, const char *);
+	int	(*roffin)(void *, int, int *, const char **);
 	int	(*roffout)(void *, int);
-	int	(*roffblkin)(void *, int, int *, char **);
+	int	(*roffblkin)(void *, int, int *, const char **);
 	int	(*roffblkout)(void *, int);
-	int	(*roffblkheadin)(void *, int, int *, char **);
+	int	(*roffblkheadin)(void *, int, int *, const char **);
 	int	(*roffblkheadout)(void *, int);
-	int	(*roffblkbodyin)(void *, int, int *, char **);
+	int	(*roffblkbodyin)(void *, int, int *, const char **);
 	int	(*roffblkbodyout)(void *, int);
-	int	(*roffspecial)(void *, int, int *, char **, char **);
+	int	(*roffspecial)(void *, int, const char *, 
+			const int *, const char **, const char **);
 };
 
 struct	rofftree;
@@ -253,6 +333,8 @@ int	 	  md_buf_putstring(struct md_mbuf *, const char 
 struct	rofftree *roff_alloc(const struct roffcb *, void *);
 int		  roff_engine(struct rofftree *, char *);
 int		  roff_free(struct rofftree *, int);
+
+int		  rofftok_scan(const char *, int *);
 
 __END_DECLS