Expose the parsed table API to the world and add accessors through the

roff.h interface.

5 files changed, 85 insertions, 56 deletions

diff --git a/libroff.h b/libroff.h
index d86858b9..890a7414 100644
--- a/libroff.h
+++ b/libroff.h
@@ -25,62 +25,6 @@ enum	tbl_part {
 	TBL_PART_DATA  /* creating data rows */
 };
 
-enum	tbl_cellt {
-	TBL_CELL_CENTRE, /* c, C */
-	TBL_CELL_RIGHT, /* r, R */
-	TBL_CELL_LEFT, /* l, L */
-	TBL_CELL_NUMBER, /* n, N */
-	TBL_CELL_SPAN, /* s, S */
-	TBL_CELL_LONG, /* a, A */
-	TBL_CELL_DOWN, /* ^ */
-	TBL_CELL_HORIZ, /* _, - */
-	TBL_CELL_DHORIZ, /* = */
-	TBL_CELL_VERT, /* | */
-	TBL_CELL_DVERT, /* || */
-	TBL_CELL_MAX
-};
-
-struct	tbl_cell {
-	struct tbl_cell	 *next;
-	enum tbl_cellt	  pos;
-	int		  spacing;
-	int		  flags;
-#define	TBL_CELL_TALIGN	 (1 << 0) /* t, T */
-#define	TBL_CELL_BALIGN	 (1 << 1) /* d, D */
-#define	TBL_CELL_BOLD	 (1 << 2) /* fB, B, b */
-#define	TBL_CELL_ITALIC	 (1 << 3) /* fI, I, i */
-#define	TBL_CELL_EQUAL	 (1 << 4) /* e, E */
-#define	TBL_CELL_UP	 (1 << 5) /* u, U */
-#define	TBL_CELL_WIGN	 (1 << 6) /* z, Z */
-};
-
-struct	tbl_row {
-	struct tbl_row	 *next;
-	struct tbl_cell	 *first;
-	struct tbl_cell	 *last;
-};
-
-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)
-};
-
-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)
-	struct tbl_span	 *next;
-};
-
 struct	tbl {
 	mandocmsg	  msg; /* status messages */
 	void		 *data; /* privdata for messages */
@@ -115,6 +59,7 @@ enum rofferr 	 tbl_read(struct tbl *, int, const char *, int);
 int		 tbl_option(struct tbl *, int, const char *);
 int		 tbl_layout(struct tbl *, int, const char *);
 int		 tbl_data(struct tbl *, int, const char *);
+const struct tbl_span *tbl_span(const struct tbl *);
 
 __END_DECLS
 
diff --git a/mandoc.h b/mandoc.h
index 13acea24..96265da5 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -139,6 +139,75 @@ enum	mandocerr {
 	MANDOCERR_MAX
 };
 
+enum	tbl_cellt {
+	TBL_CELL_CENTRE, /* c, C */
+	TBL_CELL_RIGHT, /* r, R */
+	TBL_CELL_LEFT, /* l, L */
+	TBL_CELL_NUMBER, /* n, N */
+	TBL_CELL_SPAN, /* s, S */
+	TBL_CELL_LONG, /* a, A */
+	TBL_CELL_DOWN, /* ^ */
+	TBL_CELL_HORIZ, /* _, - */
+	TBL_CELL_DHORIZ, /* = */
+	TBL_CELL_VERT, /* | */
+	TBL_CELL_DVERT, /* || */
+	TBL_CELL_MAX
+};
+
+/*
+ * A cell in a layout row.
+ */
+struct	tbl_cell {
+	struct tbl_cell	 *next;
+	enum tbl_cellt	  pos;
+	int		  spacing;
+	int		  flags;
+#define	TBL_CELL_TALIGN	 (1 << 0) /* t, T */
+#define	TBL_CELL_BALIGN	 (1 << 1) /* d, D */
+#define	TBL_CELL_BOLD	 (1 << 2) /* fB, B, b */
+#define	TBL_CELL_ITALIC	 (1 << 3) /* fI, I, i */
+#define	TBL_CELL_EQUAL	 (1 << 4) /* e, E */
+#define	TBL_CELL_UP	 (1 << 5) /* u, U */
+#define	TBL_CELL_WIGN	 (1 << 6) /* z, Z */
+};
+
+/*
+ * A layout row.
+ */
+struct	tbl_row {
+	struct tbl_row	 *next;
+	struct tbl_cell	 *first;
+	struct tbl_cell	 *last;
+};
+
+/*
+ * A cell within a row of data.  The "string" field contains the actual
+ * string value that's in the cell.  The rest is layout.
+ */
+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)
+};
+
+/*
+ * A row of data in a table.
+ */
+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)
+	struct tbl_span	 *next;
+};
+
 /*
  * Available registers (set in libroff, accessed elsewhere).
  */
diff --git a/roff.c b/roff.c
index 9536bac3..eecba18c 100644
--- a/roff.c
+++ b/roff.c
@@ -1375,3 +1375,10 @@ roff_freestr(struct roff *r)
 
 	r->first_string = NULL;
 }
+
+const struct tbl_span *
+roff_span(const struct roff *r)
+{
+	
+	return(r->tbl ? tbl_span(r->tbl) : NULL);
+}
diff --git a/roff.h b/roff.h
index 4c57e8e0..16630b0e 100644
--- a/roff.h
+++ b/roff.h
@@ -38,6 +38,7 @@ void		  roff_reset(struct roff *);
 enum	rofferr	  roff_parseln(struct roff *, int, 
 			char **, size_t *, int, int *);
 int		  roff_endparse(struct roff *);
+const struct tbl_span *roff_span(const struct roff *);
 
 __END_DECLS
 
diff --git a/tbl.c b/tbl.c
index c6267866..f91aec29 100644
--- a/tbl.c
+++ b/tbl.c
@@ -120,3 +120,10 @@ tbl_restart(struct tbl *tbl)
 	tbl->part = TBL_PART_LAYOUT;
 }
 
+const struct tbl_span *
+tbl_span(const struct tbl *tbl)
+{
+
+	assert(tbl);
+	return(tbl->last_span);
+}