===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.32
retrieving revision 1.35
diff -u -p -r1.32 -r1.35
--- mandoc/term.h	2009/03/23 15:20:51	1.32
+++ mandoc/term.h	2009/04/12 19:19:57	1.35
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.32 2009/03/23 15:20:51 kristaps Exp $ */
+/* $Id: term.h,v 1.35 2009/04/12 19:19:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -19,19 +19,17 @@
 #ifndef TERM_H
 #define TERM_H
 
-#include "mdoc.h"
-#include "man.h"
-
 /* FIXME - clean up tabs. */
 
-#define	INDENT		  6
+#define	INDENT		  5
+#define	HALFINDENT	  3
 
 __BEGIN_DECLS
 
 enum	termenc {
 	TERMENC_ASCII,
-	TERMENC_LATIN1,
-	TERMENC_UTF8
+	TERMENC_LATIN1,		/* Not implemented. */
+	TERMENC_UTF8		/* Not implemented. */
 };
 
 struct	termp {
@@ -56,35 +54,6 @@ struct	termp {
 	void		 *symtab;	/* Encoded-symbol table. */
 };
 
-/* XXX - clean this up. */
-
-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(termp, p, fl) \
-	do { \
-		assert(! (TERMPAIR_FLAG & (p)->type)); \
-		(termp)->flags |= (fl); \
-		(p)->flag = (fl); \
-		(p)->type |= TERMPAIR_FLAG; \
-	} while ( /* CONSTCOND */ 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		 *term_ascii2htab(void);
 const char	 *term_a2ascii(void *, const char *, size_t, size_t *);
 void		  term_asciifree(void *);
@@ -93,11 +62,6 @@ void		  term_newln(struct termp *);
 void		  term_vspace(struct termp *);
 void		  term_word(struct termp *, const char *);
 void		  term_flushln(struct termp *);
-void	  	  term_node(struct termp *, struct termpair *,
-			const struct mdoc_meta *,
-			const struct mdoc_node *);
-
-const	struct termact 	 *termacts;
 
 __END_DECLS