===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mandoc/tbl_data.c	2015/01/30 02:09:04	1.37
+++ mandoc/tbl_data.c	2015/01/30 04:11:50	1.38
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.37 2015/01/30 02:09:04 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.38 2015/01/30 04:11:50 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -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;
+	/* Advance to the next layout cell, skipping spanners. */
 
-	/*
-	 * Skip over spanners, since
-	 * we want to match data with data layout cells in the header.
-	 */
-
+	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
 	dp->line = line;
 	dp->opts = &tbl->opts;
 	dp->layout = rp;
-	dp->head = tbl->first_head;
 	dp->prev = tbl->last_span;
 
 	if (dp->prev == NULL) {