===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.15
retrieving revision 1.26
diff -u -p -r1.15 -r1.26
--- mandoc/term.h	2009/03/03 21:07:01	1.15
+++ mandoc/term.h	2009/03/17 13:35:46	1.26
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.15 2009/03/03 21:07:01 kristaps Exp $ */
+/* $Id: term.h,v 1.26 2009/03/17 13:35:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,83 +21,37 @@
 
 #include "mdoc.h"
 
+/* XXX - clean up tabs. */
+
 #define	INDENT		  6
 
 __BEGIN_DECLS
 
-enum	tsym {
-	TERMSYM_RBRACK = 	0,
-	TERMSYM_LBRACK = 	1,
-	TERMSYM_LARROW = 	2,
-	TERMSYM_RARROW = 	3,
-	TERMSYM_UARROW = 	4,
-	TERMSYM_DARROW = 	5,
-	TERMSYM_LSQUOTE = 	6,
-	TERMSYM_RSQUOTE = 	7,
-	TERMSYM_SQUOTE = 	8,
-	TERMSYM_LDQUOTE = 	9,
-	TERMSYM_RDQUOTE = 	10,
-	TERMSYM_DQUOTE = 	11,
-	TERMSYM_LT = 		12,
-	TERMSYM_GT = 		13,
-	TERMSYM_LE = 		14,
-	TERMSYM_GE = 		15,
-	TERMSYM_EQ = 		16,
-	TERMSYM_NEQ = 		17,
-	TERMSYM_ACUTE = 	18,
-	TERMSYM_GRAVE = 	19,
-	TERMSYM_PI = 		20,
-	TERMSYM_PLUSMINUS = 	21,
-	TERMSYM_INF = 		22,
-	TERMSYM_INF2 = 		23,
-	TERMSYM_NAN = 		24,
-	TERMSYM_BAR = 		25,
-	TERMSYM_BULLET = 	26,
-	TERMSYM_AMP = 		27,
-	TERMSYM_EM = 		28,
-	TERMSYM_EN = 		29,
-	TERMSYM_COPY = 		30,
-	TERMSYM_ASTERISK =	31,
-	TERMSYM_SLASH =		32,
-	TERMSYM_HYPHEN =	33,
-	TERMSYM_SPACE =		34,
-	TERMSYM_PERIOD =	35,
-	TERMSYM_BREAK =		36
-};
-
-
-enum	tstyle {
-	TERMSTYLE_CLEAR	=	0,
-	TERMSTYLE_BOLD =	1,
-	TERMSTYLE_UNDER =	2,
-	TERMSTYLE_MAX =		3
-};
-
-struct	termsym {
-	const char	 *sym;
-	size_t		  sz;
-};
-
 struct	termp {
 	size_t		  rmargin;
 	size_t		  maxrmargin;
 	size_t		  maxcols;
 	size_t		  offset;
 	size_t		  col;
+	int		  iflags;
+#define	TERMP_NOPUNT	 (1 << 0)
 	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_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;
-	struct termsym	 *symtab;	/* Special-symbol table. */
-	struct termsym	 *styletab;	/* Style table. */
+	void		 *symtab;
 };
 
+/* XXX - clean this up. */
+
 struct	termpair {
 	struct termpair	 *ppair;
 	int		  type;
@@ -117,26 +71,25 @@ struct	termpair {
 	} 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 *);
+	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			  subtree(struct termp *,
-				const struct mdoc_meta *,
-				const struct mdoc_node *);
+void		 *ascii2htab(void);
+const char	 *a2ascii(void *, const char *, size_t, size_t *);
+void		  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 *); 
 
 const	struct termact 	 *termacts;