more details about Mac OS X; information from Sevan Janiyan

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index cfc489bb4547ca4818327f31399d85237e2d5e1f..fe0259f9227adbd9ee1416774c4d04895874404d 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.55 2021/05/18 13:22:43 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>
@@ -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);
@@ -78,13 +78,14 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                if (dp->layout->last->col + 1 < dp->opts->cols) {
                        cp = mandoc_calloc(1, sizeof(*cp));
                        cp->pos = TBL_CELL_LEFT;
+                       cp->font = ESCAPE_FONTROMAN;
                        cp->spacing = SIZE_MAX;
                        dp->layout->last->next = cp;
                        cp->col = dp->layout->last->col + 1;
                        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;
@@ -109,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;
@@ -145,18 +147,29 @@ 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 - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') {
+       if (endpos - startpos == 2 &&
+           p[startpos] == 'T' && p[startpos + 1] == '{') {
                tbl->part = TBL_PART_CDATA;
                return;
        }
 
-       dat->string = mandoc_strndup(p + sv, *pos - sv);
+       dat->string = mandoc_strndup(p + startpos, endpos - startpos);
 
        if (p[*pos] != '\0')
                (*pos)++;
@@ -177,7 +190,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
@@ -190,6 +203,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++;