===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.27
retrieving revision 1.29
diff -u -p -r1.27 -r1.29
--- mandoc/term.h	2009/03/19 11:49:00	1.27
+++ mandoc/term.h	2009/03/20 15:14:01	1.29
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.27 2009/03/19 11:49:00 kristaps Exp $ */
+/* $Id: term.h,v 1.29 2009/03/20 15:14:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,12 @@
 
 __BEGIN_DECLS
 
+enum	termenc {
+	TERMENC_ASCII,
+	TERMENC_LATIN1,
+	TERMENC_UTF8
+};
+
 struct	termp {
 	size_t		  rmargin;	/* Current right margin. */
 	size_t		  maxrmargin;	/* Max right margin. */
@@ -45,6 +51,7 @@ struct	termp {
 #define	TERMP_BOLD	 (1 << 8)	/* Styles... */
 #define	TERMP_UNDER	 (1 << 9)
 	char		 *buf;		/* Output buffer. */
+	enum termenc	  enc;		/* Type of encoding. */
 	void		 *symtab;	/* Encoded-symbol table. */
 };
 
@@ -77,17 +84,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;