===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- mandoc/mdoc.h	2010/12/16 17:14:48	1.108
+++ mandoc/mdoc.h	2010/12/22 11:15:16	1.109
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.h,v 1.108 2010/12/16 17:14:48 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.109 2010/12/22 11:15:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -358,13 +358,22 @@ struct	mdoc_an {
  * of iterating through the mdoc_arg pointers of a node: defaults are
  * provided, etc.
  */
-union mdoc_data {
-	struct mdoc_an 	 *An;
-	struct mdoc_bd	 *Bd;
-	struct mdoc_bf	 *Bf;
-	struct mdoc_bl	 *Bl;
+union	mdoc_data {
+	struct mdoc_an 	  An;
+	struct mdoc_bd	  Bd;
+	struct mdoc_bf	  Bf;
+	struct mdoc_bl	  Bl;
 };
 
+/*
+ * Reference-counted structure for containing normalised arguments of
+ * certain macros (those listed in union mdoc_data).
+ */
+struct	mdoc_norm {
+	int		  refcnt;
+	union mdoc_data	  d;
+};
+
 /* 
  * Single node in tree-linked AST. 
  */
@@ -387,6 +396,7 @@ struct	mdoc_node {
 #define	MDOC_ENDED	 (1 << 5) /* rendering has been ended */
 	enum mdoc_type	  type; /* AST node type */
 	enum mdoc_sec	  sec; /* current named section */
+	struct mdoc_norm *norm; /* ref-counted, normalised args */
 	/* FIXME: these can be union'd to shave a few bytes. */
 	struct mdoc_arg	 *args; /* BLOCK/ELEM */
 	struct mdoc_node *pending; /* BLOCK */
@@ -395,7 +405,6 @@ struct	mdoc_node {
 	struct mdoc_node *tail; /* BLOCK */
 	char		 *string; /* TEXT */
 	enum mdoc_endbody end; /* BODY */
-	union mdoc_data	  data;
 };
 
 /*