-/* $Id: tbl_data.c,v 1.2 2010/12/30 09:34:07 kristaps Exp $ */
+/* $Id: tbl_data.c,v 1.45 2017/07/08 17:52:50 schwarze Exp $ */
/*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2015, 2017 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
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
+#include <sys/types.h>
+
#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include "mandoc.h"
+#include "mandoc_aux.h"
#include "libmandoc.h"
#include "libroff.h"
-static void data(struct tbl *, struct tbl_span *,
- int, const char *, int *);
+static void getdata(struct tbl_node *, struct tbl_span *,
+ int, const char *, int *);
+static struct tbl_span *newspan(struct tbl_node *, int,
+ struct tbl_row *);
-void
-data(struct tbl *tbl, struct tbl_span *dp,
+
+static void
+getdata(struct tbl_node *tbl, struct tbl_span *dp,
int ln, const char *p, int *pos)
{
struct tbl_dat *dat;
+ struct tbl_cell *cp;
int sv;
- /* FIXME: warn about losing data contents if cell is HORIZ. */
-
- dat = mandoc_calloc(1, sizeof(struct tbl_dat));
+ /* Advance to the next layout cell, skipping spanners. */
+
+ cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
+ while (cp != NULL && cp->pos == TBL_CELL_SPAN)
+ cp = cp->next;
+
+ /*
+ * If the current layout row is out of cells, allocate
+ * a new cell if another row of the table has at least
+ * this number of columns, or discard the input if we
+ * are beyond the last column of the table as a whole.
+ */
+
+ if (cp == NULL) {
+ if (dp->layout->last->col + 1 < dp->opts->cols) {
+ cp = mandoc_calloc(1, sizeof(*cp));
+ cp->pos = TBL_CELL_LEFT;
+ 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, *pos, p + *pos);
+ while (p[*pos])
+ (*pos)++;
+ return;
+ }
+ }
- if (dp->last) {
+ dat = mandoc_calloc(1, sizeof(*dat));
+ dat->layout = cp;
+ dat->pos = TBL_DATA_NONE;
+ dat->spans = 0;
+ for (cp = cp->next; cp != NULL; cp = cp->next)
+ if (cp->pos == TBL_CELL_SPAN)
+ dat->spans++;
+ else
+ break;
+
+ if (dp->last == NULL)
+ dp->first = dat;
+ else
dp->last->next = dat;
- dp->last = dat;
- } else
- dp->last = dp->first = dat;
+ dp->last = dat;
sv = *pos;
- while (p[*pos] && p[*pos] != tbl->tab)
+ while (p[*pos] && p[*pos] != tbl->opts.tab)
(*pos)++;
- dat->string = mandoc_malloc(*pos - sv + 1);
- memcpy(dat->string, &p[sv], *pos - sv);
- dat->string[*pos - sv] = '\0';
+ /*
+ * 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] == '{') {
+ tbl->part = TBL_PART_CDATA;
+ return;
+ }
+
+ dat->string = mandoc_strndup(p + sv, *pos - sv);
if (p[*pos])
(*pos)++;
- /* XXX: do the strcmps, then malloc(). */
-
if ( ! strcmp(dat->string, "_"))
- dat->flags |= TBL_DATA_HORIZ;
+ dat->pos = TBL_DATA_HORIZ;
else if ( ! strcmp(dat->string, "="))
- dat->flags |= TBL_DATA_DHORIZ;
+ dat->pos = TBL_DATA_DHORIZ;
else if ( ! strcmp(dat->string, "\\_"))
- dat->flags |= TBL_DATA_NHORIZ;
+ dat->pos = TBL_DATA_NHORIZ;
else if ( ! strcmp(dat->string, "\\="))
- dat->flags |= TBL_DATA_NDHORIZ;
+ dat->pos = TBL_DATA_NDHORIZ;
+ else
+ dat->pos = TBL_DATA_DATA;
+
+ if ((dat->layout->pos == TBL_CELL_HORIZ ||
+ dat->layout->pos == TBL_CELL_DHORIZ ||
+ 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);
}
-int
-tbl_data(struct tbl *tbl, int ln, const char *p)
+void
+tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
{
- struct tbl_span *dp;
- int pos;
+ struct tbl_dat *dat;
+ size_t sz;
+
+ dat = tbl->last_span->last;
+
+ if (p[pos] == 'T' && p[pos + 1] == '}') {
+ pos += 2;
+ if (p[pos] == tbl->opts.tab) {
+ tbl->part = TBL_PART_DATA;
+ pos++;
+ while (p[pos] != '\0')
+ getdata(tbl, tbl->last_span, ln, p, &pos);
+ return;
+ } else if (p[pos] == '\0') {
+ tbl->part = TBL_PART_DATA;
+ return;
+ }
+
+ /* Fallthrough: T} is part of a word. */
+ }
- pos = 0;
+ dat->pos = TBL_DATA_DATA;
+ dat->block = 1;
- if ('\0' == p[pos]) {
- TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
- return(1);
- }
+ if (dat->string != NULL) {
+ sz = strlen(p + pos) + strlen(dat->string) + 2;
+ dat->string = mandoc_realloc(dat->string, sz);
+ (void)strlcat(dat->string, " ", sz);
+ (void)strlcat(dat->string, p + pos, sz);
+ } else
+ dat->string = mandoc_strdup(p + pos);
+
+ if (dat->layout->pos == TBL_CELL_DOWN)
+ mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
+ ln, pos, dat->string);
+}
+
+static struct tbl_span *
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
+{
+ struct tbl_span *dp;
- dp = mandoc_calloc(1, sizeof(struct tbl_span));
+ dp = mandoc_calloc(1, sizeof(*dp));
+ dp->line = line;
+ dp->opts = &tbl->opts;
+ dp->layout = rp;
+ dp->prev = tbl->last_span;
- if (tbl->last_span) {
- tbl->last_span->next = dp;
- tbl->last_span = dp;
+ if (dp->prev == NULL) {
+ tbl->first_span = dp;
+ tbl->current_span = NULL;
} else
- tbl->last_span = tbl->first_span = dp;
+ dp->prev->next = dp;
+ tbl->last_span = dp;
+
+ return dp;
+}
+
+void
+tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
+{
+ struct tbl_row *rp;
+ 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;
+
+ assert(rp != NULL);
if ( ! strcmp(p, "_")) {
- dp->flags |= TBL_SPAN_HORIZ;
- return(1);
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_HORIZ;
+ return;
} else if ( ! strcmp(p, "=")) {
- dp->flags |= TBL_SPAN_DHORIZ;
- return(1);
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_DHORIZ;
+ return;
+ }
+
+ /*
+ * If the layout row contains nothing but horizontal lines,
+ * allocate an empty span for it and assign the current span
+ * to the next layout row accepting data.
+ */
+
+ while (rp->next != NULL) {
+ if (rp->last->col + 1 < tbl->opts.cols)
+ break;
+ for (cp = rp->first; cp != NULL; cp = cp->next)
+ if (cp->pos != TBL_CELL_HORIZ &&
+ cp->pos != TBL_CELL_DHORIZ)
+ break;
+ if (cp != NULL)
+ break;
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_DATA;
+ rp = rp->next;
}
- while ('\0' != p[pos])
- data(tbl, dp, ln, p, &pos);
+ /* Process a real data row. */
- return(1);
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_DATA;
+ while (p[pos] != '\0')
+ getdata(tbl, sp, ln, p, &pos);
}
git.ckatri.com / mandoc.git / blobdiff