===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.46
retrieving revision 1.50
diff -u -p -r1.46 -r1.50
--- mandoc/tbl_data.c	2018/11/25 19:24:20	1.46
+++ mandoc/tbl_data.c	2018/12/14 01:18:26	1.50
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.46 2018/11/25 19:24:20 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.50 2018/12/14 01:18:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -21,14 +21,16 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "mandoc.h"
+#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
+#include "tbl_int.h"
 
 static	void		 getdata(struct tbl_node *, struct tbl_span *,
 				int, const char *, int *);
@@ -45,6 +47,15 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 	struct tbl_span	*pdp;
 	int		 sv;
 
+	/*
+	 * Determine the length of the string in the cell
+	 * and advance the parse point to the end of the cell.
+	 */
+
+	sv = *pos;
+	while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab)
+		(*pos)++;
+
 	/* Advance to the next layout cell, skipping spanners. */
 
 	cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
@@ -67,8 +78,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 			dp->layout->last = cp;
 		} else {
 			mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
-			    ln, *pos, p + *pos);
-			while (p[*pos])
+			    ln, sv, p + sv);
+			while (p[*pos] != '\0')
 				(*pos)++;
 			return;
 		}
@@ -91,7 +102,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 	 * can be reused for more than one data row.
 	 */
 
-	if (cp->pos == TBL_CELL_DOWN) {
+	if (cp->pos == TBL_CELL_DOWN ||
+	    (*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) {
 		pdp = dp;
 		while ((pdp = pdp->prev) != NULL) {
 			pdat = pdp->first;
@@ -100,7 +112,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 				pdat = pdat->next;
 			if (pdat == NULL)
 				break;
-			if (pdat->layout->pos != TBL_CELL_DOWN) {
+			if (pdat->layout->pos != TBL_CELL_DOWN &&
+			    strcmp(pdat->string, "\\^") != 0) {
 				pdat->vspans++;
 				break;
 			}
@@ -126,10 +139,6 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 		dp->last->next = dat;
 	dp->last = dat;
 
-	sv = *pos;
-	while (p[*pos] && p[*pos] != tbl->opts.tab)
-		(*pos)++;
-
 	/*
 	 * Check for a continued-data scope opening.  This consists of a
 	 * trailing `T{' at the end of the line.  Subsequent lines,
@@ -143,7 +152,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 
 	dat->string = mandoc_strndup(p + sv, *pos - sv);
 
-	if (p[*pos])
+	if (p[*pos] != '\0')
 		(*pos)++;
 
 	if ( ! strcmp(dat->string, "_"))