===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.35
retrieving revision 1.39
diff -u -p -r1.35 -r1.39
--- mandoc/term.h	2009/04/12 19:19:57	1.35
+++ mandoc/term.h	2009/07/19 09:10:42	1.39
@@ -1,20 +1,18 @@
-/* $Id: term.h,v 1.35 2009/04/12 19:19:57 kristaps Exp $ */
+/*	$Id: term.h,v 1.39 2009/07/19 09:10:42 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * 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
@@ -39,16 +37,16 @@ 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_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. */