===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.37
retrieving revision 1.43
diff -u -p -r1.37 -r1.43
--- mandoc/libman.h	2010/06/26 15:36:37	1.37
+++ mandoc/libman.h	2010/08/20 01:02:07	1.43
@@ -1,6 +1,6 @@
-/*	$Id: libman.h,v 1.37 2010/06/26 15:36:37 kristaps Exp $ */
+/*	$Id: libman.h,v 1.43 2010/08/20 01:02:07 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,6 @@
 #ifndef LIBMAN_H
 #define LIBMAN_H
 
-#include "regs.h"
 #include "man.h"
 
 enum	man_next {
@@ -26,9 +25,8 @@ enum	man_next {
 };
 
 struct	man {
-	void		*data;
-	mandocmsg	 msg;
-	int		 pflags; /* parse flags (see man.h) */
+	void		*data; /* private application data */
+	mandocmsg	 msg; /* output message handler */
 	int		 flags; /* parse flags */
 #define	MAN_HALT	(1 << 0) /* badness happened: die */
 #define	MAN_ELINE	(1 << 1) /* Next-line element scope. */
@@ -36,14 +34,19 @@ struct	man {
 #define	MAN_ILINE	(1 << 3) /* Ignored in next-line scope. */
 #define	MAN_LITERAL	(1 << 4) /* Literal input. */
 #define	MAN_BPLINE	(1 << 5)
-	enum man_next	 next;
-	struct man_node	*last;
-	struct man_node	*first;
-	struct man_meta	 meta;
+	enum man_next	 next; /* where to put the next node */
+	struct man_node	*last; /* the last parsed node */
+	struct man_node	*first; /* the first parsed node */
+	struct man_meta	 meta; /* document meta-data */
+	struct regset	*regs; /* registers */
 };
 
-#define	MACRO_PROT_ARGS	  struct man *m, enum mant tok, int line, \
-			  int ppos, int *pos, char *buf
+#define	MACRO_PROT_ARGS	  struct man *m, \
+			  enum mant tok, \
+			  int line, \
+			  int ppos, \
+			  int *pos, \
+			  char *buf
 
 struct	man_macro {
 	int		(*fp)(MACRO_PROT_ARGS);