From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 19086 invoked from network); 7 Sep 2021 11:48:51 -0000 Received: from bsd.lv (HELO mandoc.bsd.lv) (66.111.2.12) by inbox.vuxu.org with ESMTPUTF8; 7 Sep 2021 11:48:51 -0000 Received: from fantadrom.bsd.lv (localhost [127.0.0.1]) by mandoc.bsd.lv (OpenSMTPD) with ESMTP id 62ae79f2 for ; Tue, 7 Sep 2021 06:48:49 -0500 (EST) Received: from localhost (mandoc.bsd.lv [local]) by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id d30ceb4c for ; Tue, 7 Sep 2021 06:48:49 -0500 (EST) Date: Tue, 7 Sep 2021 06:48:49 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: mandoc: we already parse the GNU tbl(7) "nospaces" option, so let it X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: Log Message: ----------- we already parse the GNU tbl(7) "nospaces" option, so let it have the intended effect, too Modified Files: -------------- mandoc: tbl_data.c tbl.7 Revision Data ------------- Index: tbl.7 =================================================================== RCS file: /home/cvs/mandoc/mandoc/tbl.7,v retrieving revision 1.35 retrieving revision 1.36 diff -Ltbl.7 -Ltbl.7 -u -p -r1.35 -r1.36 --- tbl.7 +++ 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. Index: tbl_data.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/tbl_data.c,v retrieving revision 1.56 retrieving revision 1.57 diff -Ltbl_data.c -Ltbl_data.c -u -p -r1.56 -r1.57 --- tbl_data.c +++ tbl_data.c @@ -47,15 +47,15 @@ getdata(struct tbl_node *tbl, struct tbl 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 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 */ 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 * 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 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 -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv