In a tbl(7) having the "nospaces" option, skip space characters

not only at the end of data cells, but also after "T}",
aligning the behaviour of the parser with GNU tbl(1).

Issue reported by <Oliver dot Corff at email dot de>.

diff --git a/tbl_data.c b/tbl_data.c
index f8d67f496289ce20756ea7d8b63527d784b83547..1efaa4961957c08d1235416d00ff2ed4ac5ea989 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.57 2021/09/07 11:48:19 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.58 2021/09/10 12:07:21 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011,2015,2017-2019,2021 Ingo Schwarze <schwarze@openbsd.org>
@@ -200,6 +200,9 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
 
        if (p[pos] == 'T' && p[pos + 1] == '}') {
                pos += 2;
+               if (tbl->opts.opts & TBL_OPT_NOSPACE)
+                       while (p[pos] == ' ')
+                               pos++;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;