summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tbl_data.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/tbl_data.c b/tbl_data.c
index 43d6ef5d..5938f7ce 100644
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -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')