===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.50
retrieving revision 1.52
diff -u -p -r1.50 -r1.52
--- mandoc/libman.h	2011/03/23 12:40:04	1.50
+++ mandoc/libman.h	2011/07/18 07:46:41	1.52
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.50 2011/03/23 12:40:04 kristaps Exp $ */
+/*	$Id: libman.h,v 1.52 2011/07/18 07:46:41 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -37,6 +37,7 @@ struct	man {
 	struct man_node	*first; /* the first parsed node */
 	struct man_meta	 meta; /* document meta-data */
 	struct regset	*regs; /* registers */
+	struct roff	*roff;
 };
 
 #define	MACRO_PROT_ARGS	  struct man *m, \
@@ -56,12 +57,6 @@ struct	man_macro {
 #define	MAN_NOCLOSE	 (1 << 4)	/* See blk_exp(). */
 };
 
-enum	margserr {
-	ARGS_EOLN,
-	ARGS_WORD,
-	ARGS_QWORD
-};
-
 extern	const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
@@ -80,7 +75,6 @@ void		  man_node_delete(struct man *, struct man_node 
 void		  man_hash_init(void);
 enum mant	  man_hash_find(const char *);
 int		  man_macroend(struct man *);
-enum margserr	  man_args(struct man *, int, int *, char *, char **);
 int		  man_valid_post(struct man *);
 int		  man_valid_pre(struct man *, struct man_node *);
 int		  man_unscope(struct man *,