Two minor improvements:

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 9047fd87f966974c1c11437d4a61af3409887ae6..fe0259f9227adbd9ee1416774c4d04895874404d 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_data.c,v 1.48 2018/12/12 21:54:35 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) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2015,2017-2019,2021 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -21,6 +21,8 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <stdint.h>
+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>


@@ -29,7 +31,7 @@
 #include "mandoc.h"
 #include "tbl.h"
 #include "libmandoc.h"
 #include "mandoc.h"
 #include "tbl.h"
 #include "libmandoc.h"

-#include "libroff.h"
+#include "tbl_int.h"

 
 static void             getdata(struct tbl_node *, struct tbl_span *,
                                int, const char *, int *);
 
 static void             getdata(struct tbl_node *, struct tbl_span *,
                                int, const char *, int *);


@@ -44,16 +46,20 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
        struct tbl_dat  *dat, *pdat;
        struct tbl_cell *cp;
        struct tbl_span *pdp;
        struct tbl_dat  *dat, *pdat;
        struct tbl_cell *cp;
        struct tbl_span *pdp;

-       int              sv;
+       const char      *ccp;
+       int              startpos, endpos;

 
        /*
         * Determine the length of the string in the cell
         * and advance the parse point to the end of the cell.
         */
 
 
        /*
         * Determine the length of the string in the cell
         * and advance the parse point to the end of the cell.
         */
 

-       sv = *pos;
-       while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab)
-               (*pos)++;
+       startpos = *pos;
+       ccp = p + startpos;
+       while (*ccp != '\0' && *ccp != tbl->opts.tab)
+               if (*ccp++ == '\\')
+                       mandoc_escape(&ccp, NULL, NULL);
+       *pos = ccp - p;

 
        /* Advance to the next layout cell, skipping spanners. */
 
 
        /* Advance to the next layout cell, skipping spanners. */
 


@@ -72,12 +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;
                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 {
                        dp->layout->last->next = cp;
                        cp->col = dp->layout->last->col + 1;
                        dp->layout->last = cp;
                } else {

-                       mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
-                           ln, sv, p + sv);
+                       mandoc_msg(MANDOCERR_TBLDATA_EXTRA,
+                           ln, startpos, "%s", p + startpos);

                        while (p[*pos] != '\0')
                                (*pos)++;
                        return;
                        while (p[*pos] != '\0')
                                (*pos)++;
                        return;


@@ -102,7 +110,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
         */
 
        if (cp->pos == TBL_CELL_DOWN ||
         */
 
        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;
                pdp = dp;
                while ((pdp = pdp->prev) != NULL) {
                        pdat = pdp->first;


@@ -138,18 +147,29 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                dp->last->next = dat;
        dp->last = dat;
 
                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.
         */
 
        /*
         * 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;
        }
 
                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)++;
 
        if (p[*pos] != '\0')
                (*pos)++;


@@ -170,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,
            dat->layout->pos == TBL_CELL_DOWN) &&
            dat->pos == TBL_DATA_DATA && *dat->string != '\0')
                mandoc_msg(MANDOCERR_TBLDATA_SPAN,

-                   tbl->parse, ln, sv, dat->string);
+                   ln, startpos, "%s", dat->string);

 }
 
 void
 }
 
 void


@@ -183,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 (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++;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;


@@ -209,8 +232,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
                dat->string = mandoc_strdup(p + pos);
 
        if (dat->layout->pos == TBL_CELL_DOWN)
                dat->string = mandoc_strdup(p + pos);
 
        if (dat->layout->pos == TBL_CELL_DOWN)

-               mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
-                   ln, pos, dat->string);
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN,
+                   ln, pos, "%s", dat->string);

 }
 
 static struct tbl_span *
 }
 
 static struct tbl_span *


@@ -241,20 +264,34 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
        struct tbl_cell *cp;
        struct tbl_span *sp;
 
        struct tbl_cell *cp;
        struct tbl_span *sp;
 

-       rp = (sp = tbl->last_span) == NULL ? tbl->first_row :
-           sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ?
-           sp->layout->next : sp->layout;
-
+       for (sp = tbl->last_span; sp != NULL; sp = sp->prev)
+               if (sp->pos == TBL_SPAN_DATA)
+                       break;
+       rp = sp == NULL ? tbl->first_row :
+           sp->layout->next == NULL ? sp->layout : sp->layout->next;

        assert(rp != NULL);
 
        assert(rp != NULL);
 

-       if ( ! strcmp(p, "_")) {
-               sp = newspan(tbl, ln, rp);
-               sp->pos = TBL_SPAN_HORIZ;
-               return;
-       } else if ( ! strcmp(p, "=")) {
-               sp = newspan(tbl, ln, rp);
-               sp->pos = TBL_SPAN_DHORIZ;
-               return;
+       if (p[1] == '\0') {
+               switch (p[0]) {
+               case '.':
+                       /*
+                        * Empty request lines must be handled here
+                        * and cannot be discarded in roff_parseln()
+                        * because in the layout section, they
+                        * are significant and end the layout.
+                        */
+                       return;
+               case '_':
+                       sp = newspan(tbl, ln, rp);
+                       sp->pos = TBL_SPAN_HORIZ;
+                       return;
+               case '=':
+                       sp = newspan(tbl, ln, rp);
+                       sp->pos = TBL_SPAN_DHORIZ;
+                       return;
+               default:
+                       break;
+               }

        }
 
        /*
        }
 
        /*