===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.2
retrieving revision 1.11
diff -u -p -r1.2 -r1.11
--- mandoc/term.h	2009/02/21 21:00:06	1.2
+++ mandoc/term.h	2009/02/25 23:18:50	1.11
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.2 2009/02/21 21:00:06 kristaps Exp $ */
+/* $Id: term.h,v 1.11 2009/02/25 23:18:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -35,27 +35,51 @@ struct	termp {
 #define	TERMP_NOSPACE	 (1 << 2)	/* No space before words. */
 #define	TERMP_NOLPAD	 (1 << 3)	/* No leftpad before flush. */
 #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)
+	int	  	  flag;
+	size_t	  	  offset;
+	size_t	  	  rmargin;
+	int		  count;
+};
+
+#define	TERMPAIR_SETFLAG(p, fl) \
+	do { \
+		assert(! (TERMPAIR_FLAG & (p)->type)); \
+		(p)->flag = (fl); \
+		(p)->type |= TERMPAIR_FLAG; \
+	} while (0)
+
 struct	termact {
 	int		(*pre)(struct termp *,
+				struct termpair *,
 				const struct mdoc_meta *,
 				const struct mdoc_node *);
 	void		(*post)(struct termp *,
+				struct termpair *,
 				const struct mdoc_meta *,
 				const struct mdoc_node *);
 };
 
-void			  termprint(const struct mdoc_node *,
-				const struct mdoc_meta *);
-
 void			  newln(struct termp *);
 void			  vspace(struct termp *);
 void			  word(struct termp *, const char *);
 void			  flushln(struct termp *);
 void			  transcode(struct termp *, 
 				const char *, size_t);
+
+void			  subtree(struct termp *,
+				const struct mdoc_meta *,
+				const struct mdoc_node *);
 
 const	struct termact 	 *termacts;