===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- mandoc/term.h	2009/03/11 00:39:58	1.20
+++ mandoc/term.h	2009/03/15 10:34:11	1.24
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.20 2009/03/11 00:39:58 kristaps Exp $ */
+/* $Id: term.h,v 1.24 2009/03/15 10:34:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,17 +66,10 @@ enum	tsym {
 	TERMSYM_LANGLE =	37,
 	TERMSYM_RANGLE =	38,
 	TERMSYM_LBRACE =	39,
-	TERMSYM_RBRACE =	40
+	TERMSYM_RBRACE =	40,
+	TERMSYM_MAX = 		41
 };
 
-
-enum	tstyle {
-	TERMSTYLE_CLEAR	=	0,
-	TERMSTYLE_BOLD =	1,
-	TERMSTYLE_UNDER =	2,
-	TERMSTYLE_MAX =		3
-};
-
 struct	termsym {
 	const char	 *sym;
 	size_t		  sz;
@@ -88,19 +81,21 @@ struct	termp {
 	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_NONOBREAK	 (1 << 8)
+#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. */
 };
 
 struct	termpair {