===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.25
retrieving revision 1.39
diff -u -p -r1.25 -r1.39
--- mandoc/term.h	2009/03/16 22:19:19	1.25
+++ mandoc/term.h	2009/07/19 09:10:42	1.39
@@ -1,96 +1,65 @@
-/* $Id: term.h,v 1.25 2009/03/16 22:19:19 kristaps Exp $ */
+/*	$Id: term.h,v 1.39 2009/07/19 09:10:42 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifndef TERM_H
 #define TERM_H
 
-#include "mdoc.h"
+/* FIXME - clean up tabs. */
 
-/* XXX - clean up tabs. */
+#define	INDENT		  5
+#define	HALFINDENT	  3
 
-#define	INDENT		  6
-
 __BEGIN_DECLS
 
+enum	termenc {
+	TERMENC_ASCII,
+	TERMENC_LATIN1,		/* Not implemented. */
+	TERMENC_UTF8		/* Not implemented. */
+};
+
 struct	termp {
-	size_t		  rmargin;
-	size_t		  maxrmargin;
-	size_t		  maxcols;
-	size_t		  offset;
-	size_t		  col;
-	int		  iflags;
-#define	TERMP_NOPUNT	 (1 << 0)
+	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_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;
-	void		 *symtab;
+#define	TERMP_STYLE	  0x3		/* Style mask. */
+#define	TERMP_BOLD	 (1 << 0)	/* Styles... */
+#define	TERMP_UNDER	 (1 << 1)
+#define	TERMP_NOSPACE	 (1 << 2)	/* No space before words. */
+#define	TERMP_NOLPAD	 (1 << 3)	/* See term_flushln(). */
+#define	TERMP_NOBREAK	 (1 << 4)	/* See term_flushln(). */
+#define	TERMP_IGNDELIM	 (1 << 6)	/* Delims like regulars. */
+#define	TERMP_NONOSPACE	 (1 << 7)	/* No space (no autounset). */
+#define	TERMP_DANGLE	 (1 << 8)	/* See term_flushln(). */
+#define	TERMP_HANG	 (1 << 9)	/* See term_flushln(). */
+	char		 *buf;		/* Output buffer. */
+	enum termenc	  enc;		/* Type of encoding. */
+	void		 *symtab;	/* Encoded-symbol table. */
 };
 
-/* XXX - clean this up. */
+void		 *term_ascii2htab(void);
+const char	 *term_a2ascii(void *, const char *, size_t, size_t *);
+void		  term_asciifree(void *);
 
-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 (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		 *ascii2htab(void);
-const char	 *a2ascii(void *, const char *, size_t, size_t *);
-
-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;
+void		  term_newln(struct termp *);
+void		  term_vspace(struct termp *);
+void		  term_word(struct termp *, const char *);
+void		  term_flushln(struct termp *);
 
 __END_DECLS