summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tbl.72
-rw-r--r--tbl_data.c25
2 files changed, 18 insertions, 9 deletions
diff --git a/tbl.7 b/tbl.7
index 116f4c7b..917cf6d3 100644
--- a/tbl.7
+++ b/tbl.7
@@ -94,7 +94,7 @@ Allow page breaks within the table.
This is a GNU extension and currently ignored.
.It Cm nospaces
Ignore leading and trailing spaces in data cells.
-This is a GNU extension and currently ignored.
+This is a GNU extension.
.It Cm nowarn
Suppress warnings about tables exceeding the current line length.
This is a GNU extension and currently ignored.
diff --git a/tbl_data.c b/tbl_data.c
index 9edf864a..046afc57 100644
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -47,15 +47,15 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
struct tbl_cell *cp;
struct tbl_span *pdp;
const char *ccp;
- int sv;
+ int startpos, endpos;
/*
* Determine the length of the string in the cell
* and advance the parse point to the end of the cell.
*/
- sv = *pos;
- ccp = p + sv;
+ startpos = *pos;
+ ccp = p + startpos;
while (*ccp != '\0' && *ccp != tbl->opts.tab)
if (*ccp++ == '\\')
mandoc_escape(&ccp, NULL, NULL);
@@ -85,7 +85,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
dp->layout->last = cp;
} else {
mandoc_msg(MANDOCERR_TBLDATA_EXTRA,
- ln, sv, "%s", p + sv);
+ ln, startpos, "%s", p + startpos);
while (p[*pos] != '\0')
(*pos)++;
return;
@@ -110,7 +110,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
*/
if (cp->pos == TBL_CELL_DOWN ||
- (*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) {
+ (*pos - startpos == 2 &&
+ p[startpos] == '\\' && p[startpos + 1] == '^')) {
pdp = dp;
while ((pdp = pdp->prev) != NULL) {
pdat = pdp->first;
@@ -152,12 +153,20 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
* until a standalone `T}', are included in our cell.
*/
- if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') {
+ if (*pos - startpos == 2 &&
+ p[startpos] == 'T' && p[startpos + 1] == '{') {
tbl->part = TBL_PART_CDATA;
return;
}
- dat->string = mandoc_strndup(p + sv, *pos - sv);
+ 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')
(*pos)++;
@@ -178,7 +187,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
dat->layout->pos == TBL_CELL_DOWN) &&
dat->pos == TBL_DATA_DATA && *dat->string != '\0')
mandoc_msg(MANDOCERR_TBLDATA_SPAN,
- ln, sv, "%s", dat->string);
+ ln, startpos, "%s", dat->string);
}
void