From dbd5746117cfc008d44b2e9e53c8f76c8d92673d Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sat, 1 Jan 2011 17:10:20 +0000
Subject: Make some bit-flags into enums as they should be.  Make printing of
 -Ttree tables a little bit smarter.

---
 mandoc.h | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'mandoc.h')

diff --git a/mandoc.h b/mandoc.h
index 1d8913ab..094241f1 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.39 2011/01/01 15:45:18 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.40 2011/01/01 17:10:20 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -181,6 +181,14 @@ struct	tbl_row {
 	struct tbl_cell	 *last;
 };
 
+enum	tbl_datt {
+	TBL_DATA_DATA,
+	TBL_DATA_HORIZ,
+	TBL_DATA_DHORIZ,
+	TBL_DATA_NHORIZ,
+	TBL_DATA_NDHORIZ
+};
+
 /*
  * A cell within a row of data.  The "string" field contains the actual
  * string value that's in the cell.  The rest is layout.
@@ -189,11 +197,13 @@ struct	tbl_dat {
 	struct tbl_cell	 *layout; /* layout cell: CAN BE NULL */
 	struct tbl_dat	 *next;
 	char		 *string;
-	int		  flags;
-#define	TBL_DATA_HORIZ	 (1 << 0)
-#define	TBL_DATA_DHORIZ	 (1 << 1)
-#define	TBL_DATA_NHORIZ	 (1 << 2)
-#define	TBL_DATA_NDHORIZ (1 << 3)
+	enum tbl_datt	  pos;
+};
+
+enum	tbl_spant {
+	TBL_SPAN_DATA, /* span consists of data */
+	TBL_SPAN_HORIZ, /* span is horizontal line */
+	TBL_SPAN_DHORIZ /* span is double horizontal line */
 };
 
 /*
@@ -203,9 +213,7 @@ struct	tbl_span {
 	struct tbl_row	 *layout; /* layout row: CAN BE NULL */
 	struct tbl_dat	 *first;
 	struct tbl_dat	 *last;
-	int		  flags;
-#define	TBL_SPAN_HORIZ	(1 << 0)
-#define	TBL_SPAN_DHORIZ	(1 << 1)
+	enum tbl_spant	  pos;
 	struct tbl_span	 *next;
 };
 
-- 
cgit v1.2.3