===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.28
retrieving revision 1.32
diff -u -p -r1.28 -r1.32
--- mandoc/term.h	2009/03/19 16:17:27	1.28
+++ mandoc/term.h	2009/03/23 15:20:51	1.32
@@ -1,6 +1,6 @@
-/* $Id: term.h,v 1.28 2009/03/19 16:17:27 kristaps Exp $ */
+/* $Id: term.h,v 1.32 2009/03/23 15:20:51 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the
@@ -20,6 +20,7 @@
 #define TERM_H
 
 #include "mdoc.h"
+#include "man.h"
 
 /* FIXME - clean up tabs. */
 
@@ -73,7 +74,7 @@ struct	termpair {
 		(termp)->flags |= (fl); \
 		(p)->flag = (fl); \
 		(p)->type |= TERMPAIR_FLAG; \
-	} while (0)
+	} while ( /* CONSTCOND */ 0)
 
 struct	termact {
 	int	(*pre)(struct termp *, struct termpair *,
@@ -84,17 +85,17 @@ struct	termact {
 			const struct mdoc_node *);
 };
 
-void		 *ascii2htab(void);
-const char	 *a2ascii(void *, const char *, size_t, size_t *);
-void		  asciifree(void *);
+void		 *term_ascii2htab(void);
+const char	 *term_a2ascii(void *, const char *, size_t, size_t *);
+void		  term_asciifree(void *);
 
-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 *); 
+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;