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/libmdoc.h b/libmdoc.h
index 83a300e1..16d577ce 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.55 2010/06/26 16:07:08 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.56 2010/06/27 15:52:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,8 +26,8 @@ enum	mdoc_next {
 };
 
 struct	mdoc {
-	void		 *data;
-	mandocmsg	  msg;
+	void		 *data; /* private application data */
+	mandocmsg	  msg; /* message callback */
 	int		  flags;
 #define	MDOC_HALT	 (1 << 0) /* error in parse: halt */
 #define	MDOC_LITERAL	 (1 << 1) /* in a literal scope */
@@ -37,16 +37,16 @@ struct	mdoc {
 #define	MDOC_PPHRASE	 (1 << 5) /* within a partial phrase */
 #define	MDOC_FREECOL	 (1 << 6) /* `It' invocation should close */
 	int		  pflags;
-	enum mdoc_next	  next;
-	struct mdoc_node *last;
-	struct mdoc_node *first;
-	struct mdoc_meta  meta;
+	enum mdoc_next	  next; /* where to put the next node */
+	struct mdoc_node *last; /* the last node parsed */
+	struct mdoc_node *first; /* the first node parsed */
+	struct mdoc_meta  meta; /* document meta-data */
 	enum mdoc_sec	  lastnamed;
 	enum mdoc_sec	  lastsec;
+	const struct regset *regs; /* readonly registers */
 };
 
 #define	MACRO_PROT_ARGS	struct mdoc *m, \
-			const struct regset *regs, \
 			enum mdoct tok, \
 			int line, \
 			int ppos, \