Downstream maintainers: this removes UGLY! I don't want diverging

functionality and UGLY works quite well thanks to schwarze@'s careful
attention.

This also backs out function-prototype changes for struct regset,
instead stuffing a pointer to the regset directly into struct
mdoc/man/roff.

1 files changed, 8 insertions, 8 deletions

diff --git a/libman.h b/libman.h
index 2bc50027..4cc0befc 100644
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.38 2010/06/26 16:07:08 kristaps Exp $ */
+/*	$Id: libman.h,v 1.39 2010/06/27 15:52:41 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,8 +26,8 @@ enum	man_next {
 };
 
 struct	man {
-	void		*data;
-	mandocmsg	 msg;
+	void		*data; /* private application data */
+	mandocmsg	 msg; /* output message handler */
 	int		 pflags; /* parse flags (see man.h) */
 	int		 flags; /* parse flags */
 #define	MAN_HALT	(1 << 0) /* badness happened: die */
@@ -36,14 +36,14 @@ 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 */
+	const struct regset *regs; /* readonly registers */
 };
 
 #define	MACRO_PROT_ARGS	  struct man *m, \
-			  const struct regset *regs, \
 			  enum mant tok, \
 			  int line, \
 			  int ppos, \