Abolish struct tbl_head and replace it by an "int col" member in

struct tbl_cell.  No functional change, minus 40 lines of code.

1 files changed, 2 insertions, 7 deletions

diff --git a/tbl_data.c b/tbl_data.c
index 77c04cf2..697b9073 100644
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -44,13 +44,9 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 	struct tbl_cell	*cp;
 	int		 sv;
 
-	cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
-
-	/*
-	 * Skip over spanners, since
-	 * we want to match data with data layout cells in the header.
-	 */
+	/* Advance to the next layout cell, skipping spanners. */
 
+	cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
 	while (cp != NULL && cp->pos == TBL_CELL_SPAN)
 		cp = cp->next;
 
@@ -172,7 +168,6 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 	dp->line = line;
 	dp->opts = &tbl->opts;
 	dp->layout = rp;
-	dp->head = tbl->first_head;
 	dp->prev = tbl->last_span;
 
 	if (dp->prev == NULL) {