===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.11
retrieving revision 1.32
diff -u -p -r1.11 -r1.32
--- mandoc/term.h	2009/02/25 23:18:50	1.11
+++ mandoc/term.h	2009/03/23 15:20:51	1.32
@@ -1,6 +1,6 @@
-/* $Id: term.h,v 1.11 2009/02/25 23:18:50 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,28 +20,44 @@
 #define TERM_H
 
 #include "mdoc.h"
+#include "man.h"
 
+/* FIXME - clean up tabs. */
+
+#define	INDENT		  6
+
 __BEGIN_DECLS
 
+enum	termenc {
+	TERMENC_ASCII,
+	TERMENC_LATIN1,
+	TERMENC_UTF8
+};
+
 struct	termp {
-	size_t		  rmargin;
-	size_t		  maxrmargin;
-	size_t		  maxcols;
-	size_t		  offset;
-	size_t		  col;
+	size_t		  rmargin;	/* Current right margin. */
+	size_t		  maxrmargin;	/* Max right margin. */
+	size_t		  maxcols;	/* Max size of buf. */
+	size_t		  offset;	/* Margin offest. */
+	size_t		  col;		/* Bytes in buf. */
 	int		  flags;
-#define	TERMP_BOLD	 (1 << 0)	/* Embolden words. */
-#define	TERMP_UNDERLINE	 (1 << 1)	/* Underline words. */
-#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;
+#define	TERMP_NOSPACE	 (1 << 0)	/* No space before words. */
+#define	TERMP_NOLPAD	 (1 << 1)	/* No leftpad before flush. */
+#define	TERMP_NOBREAK	 (1 << 2)	/* No break after flush. */
+#define	TERMP_LITERAL	 (1 << 3)	/* Literal words. */
+#define	TERMP_IGNDELIM	 (1 << 4)	/* Delims like regulars. */
+#define	TERMP_NONOSPACE	 (1 << 5)	/* No space (no autounset). */
+#define	TERMP_NONOBREAK	 (1 << 7)	/* Don't newln NOBREAK. */
+#define	TERMP_STYLE	  0x0300	/* Style mask. */
+#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. */
 };
 
+/* XXX - clean this up. */
+
 struct	termpair {
 	struct termpair	 *ppair;
 	int		  type;
@@ -52,34 +68,34 @@ struct	termpair {
 	int		  count;
 };
 
-#define	TERMPAIR_SETFLAG(p, fl) \
+#define	TERMPAIR_SETFLAG(termp, p, fl) \
 	do { \
 		assert(! (TERMPAIR_FLAG & (p)->type)); \
+		(termp)->flags |= (fl); \
 		(p)->flag = (fl); \
 		(p)->type |= TERMPAIR_FLAG; \
-	} while (0)
+	} 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 *);
+	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			  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		 *term_ascii2htab(void);
+const char	 *term_a2ascii(void *, const char *, size_t, size_t *);
+void		  term_asciifree(void *);
 
-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;