===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/term.h	2009/02/25 12:27:37	1.7
+++ mandoc/term.h	2009/02/25 17:02:47	1.10
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.7 2009/02/25 12:27:37 kristaps Exp $ */
+/* $Id: term.h,v 1.10 2009/02/25 17:02:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,14 +37,18 @@ 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). */
 	char		 *buf;
 };
 
 struct	termpair {
+	struct termpair	 *ppair;
 	int		  type;
 #define	TERMPAIR_FLAG	 (1 << 0)
 	int	  	  flag;
 	size_t	  	  offset;
+	size_t	  	  rmargin;
+	int		  count;
 };
 
 #define	TERMPAIR_SETFLAG(p, fl) \