===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.84
retrieving revision 1.91
diff -u -p -r1.84 -r1.91
--- mandoc/mdoc.h	2010/06/12 10:09:19	1.84
+++ mandoc/mdoc.h	2010/06/26 15:22:19	1.91
@@ -1,6 +1,6 @@
-/*	$Id: mdoc.h,v 1.84 2010/06/12 10:09:19 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.91 2010/06/26 15:22:19 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
@@ -155,6 +155,7 @@ enum	mdoct {
 
 /* What follows is a list of ALL possible macro arguments. */
 
+/* FIXME: make this into an enum. */
 #define	MDOC_Split	 0
 #define	MDOC_Nosplit	 1
 #define	MDOC_Ragged	 2
@@ -272,6 +273,19 @@ enum	mdoc_disp {
 	DISP_literal
 };
 
+struct	mdoc_bd {
+	const char	 *offs; /* -offset */
+	enum mdoc_disp	  type; /* -ragged, etc. */
+	int		  comp; /* -compact */
+};
+
+struct	mdoc_bl {
+	const char	 *width; /* -width */
+	const char	 *offs; /* -offset */
+	enum mdoc_list	  type; /* -tag, -enum, etc. */
+	int		  comp; /* -compact */
+};
+
 /* Node in AST. */
 struct	mdoc_node {
 	struct mdoc_node *parent; /* parent AST node */
@@ -299,8 +313,8 @@ struct	mdoc_node {
 	char		 *string;	/* TEXT */
 
 	union {
-		enum mdoc_list list; /* `Bl' nodes */
-		enum mdoc_disp disp; /* `Bd' nodes */
+		struct mdoc_bl Bl;
+		struct mdoc_bd Bd;
 	} data;
 };