X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/6e133feff5b8dab64f8a349610b937c9502008a4..314f1f1e699245ecd79579db7c40c4fa85b0d484:/term.h

diff --git a/term.h b/term.h
index b1813756..f0d82016 100644
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*	$Id: term.h,v 1.37 2009/06/10 20:18:44 kristaps Exp $ */
+/*	$Id: term.h,v 1.49 2009/10/18 19:03:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,17 +17,10 @@
 #ifndef TERM_H
 #define TERM_H
 
-/* FIXME - clean up tabs. */
-
-#define	INDENT		  5
-#define	HALFINDENT	  3
-
 __BEGIN_DECLS
 
 enum	termenc {
-	TERMENC_ASCII,
-	TERMENC_LATIN1,		/* Not implemented. */
-	TERMENC_UTF8		/* Not implemented. */
+	TERMENC_ASCII
 };
 
 struct	termp {
@@ -37,30 +30,32 @@ struct	termp {
 	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)
+#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(). */
+#define	TERMP_TWOSPACE	 (1 << 10)	/* See term_flushln(). */
+#define	TERMP_NOSPLIT	 (1 << 11)	/* See termp_an_pre/post(). */
+#define	TERMP_SPLIT	 (1 << 12)	/* See termp_an_pre/post(). */
+#define	TERMP_ANPREC	 (1 << 13)	/* See termp_an_pre(). */
+	int		  bold;
+	int		  under;
 	char		 *buf;		/* Output buffer. */
 	enum termenc	  enc;		/* Type of encoding. */
 	void		 *symtab;	/* Encoded-symbol table. */
 };
 
-void		 *term_ascii2htab(void);
-const char	 *term_a2ascii(void *, const char *, size_t, size_t *);
-void		  term_asciifree(void *);
-
 void		  term_newln(struct termp *);
 void		  term_vspace(struct termp *);
 void		  term_word(struct termp *, const char *);
 void		  term_flushln(struct termp *);
 
+size_t		  term_hspan(const struct roffsu *);
+size_t		  term_vspan(const struct roffsu *);
+
 __END_DECLS
 
 #endif /*!TERM_H*/