===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- mandoc/tbl_data.c	2021/09/10 12:07:21	1.58
+++ mandoc/tbl_data.c	2021/09/10 13:24:38	1.59
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.58 2021/09/10 12:07:21 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.59 2021/09/10 13:24:38 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011,2015,2017-2019,2021 Ingo Schwarze <schwarze@openbsd.org>
@@ -147,25 +147,28 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 		dp->last->next = dat;
 	dp->last = dat;
 
+	/* Strip leading and trailing spaces, if requested. */
+
+	endpos = *pos;
+	if (dp->opts->opts & TBL_OPT_NOSPACE) {
+		while (p[startpos] == ' ')
+			startpos++;
+		while (endpos > startpos && p[endpos - 1] == ' ')
+			endpos--;
+	}
+
 	/*
 	 * Check for a continued-data scope opening.  This consists of a
 	 * trailing `T{' at the end of the line.  Subsequent lines,
 	 * until a standalone `T}', are included in our cell.
 	 */
 
-	if (*pos - startpos == 2 &&
+	if (endpos - startpos == 2 &&
 	    p[startpos] == 'T' && p[startpos + 1] == '{') {
 		tbl->part = TBL_PART_CDATA;
 		return;
 	}
 
-	endpos = *pos;
-	if (dp->opts->opts & TBL_OPT_NOSPACE) {
-		while (p[startpos] == ' ')
-			startpos++;
-		while (endpos > startpos && p[endpos - 1] == ' ')
-			endpos--;
-	}
 	dat->string = mandoc_strndup(p + startpos, endpos - startpos);
 
 	if (p[*pos] != '\0')