===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -p -r1.6 -r1.11
--- mandoc/term.h	2009/02/25 12:09:20	1.6
+++ mandoc/term.h	2009/02/25 23:18:50	1.11
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.6 2009/02/25 12:09:20 kristaps Exp $ */
+/* $Id: term.h,v 1.11 2009/02/25 23:18:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,21 +37,26 @@ struct	termp {
 #define	TERMP_NOBREAK	 (1 << 4)	/* No break after flush. */
 #define	TERMP_LITERAL	 (1 << 5)	/* Literal words. */
 #define	TERMP_IGNDELIM	 (1 << 6)	/* Delims like regulars. */
+#define	TERMP_NONOSPACE	 (1 << 7)	/* No space (no autounset). */
+#define	TERMP_NORPAD	 (1 << 8)	/* No rightpad. */
 	char		 *buf;
 };
 
 struct	termpair {
+	struct termpair	 *ppair;
 	int		  type;
 #define	TERMPAIR_FLAG	 (1 << 0)
-	union {
-		int	  flag;
-	} data;
+	int	  	  flag;
+	size_t	  	  offset;
+	size_t	  	  rmargin;
+	int		  count;
 };
 
 #define	TERMPAIR_SETFLAG(p, fl) \
 	do { \
-		(p)->data.flag = (fl); \
-		(p)->type = TERMPAIR_FLAG; \
+		assert(! (TERMPAIR_FLAG & (p)->type)); \
+		(p)->flag = (fl); \
+		(p)->type |= TERMPAIR_FLAG; \
 	} while (0)
 
 struct	termact {