Return to tbl_data.c CVS log | Up to [cvsweb.bsd.lv] / mandoc |
version 1.29, 2014/03/23 11:25:26 | version 1.43, 2017/06/16 20:01:06 | ||
---|---|---|---|
|
|
||
/* $Id$ */ | /* $Id$ */ | ||
/* | /* | ||
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> | * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> | ||
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> | * Copyright (c) 2011, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> | ||
* | * | ||
* Permission to use, copy, modify, and distribute this software for any | * Permission to use, copy, modify, and distribute this software for any | ||
* purpose with or without fee is hereby granted, provided that the above | * purpose with or without fee is hereby granted, provided that the above | ||
|
|
||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
*/ | */ | ||
#ifdef HAVE_CONFIG_H | |||
#include "config.h" | #include "config.h" | ||
#endif | |||
#include <sys/types.h> | |||
#include <assert.h> | #include <assert.h> | ||
#include <ctype.h> | #include <ctype.h> | ||
#include <stdlib.h> | #include <stdlib.h> | ||
|
|
||
#include "libmandoc.h" | #include "libmandoc.h" | ||
#include "libroff.h" | #include "libroff.h" | ||
static int getdata(struct tbl_node *, struct tbl_span *, | static void getdata(struct tbl_node *, struct tbl_span *, | ||
int, const char *, int *); | int, const char *, int *); | ||
static struct tbl_span *newspan(struct tbl_node *, int, | static struct tbl_span *newspan(struct tbl_node *, int, | ||
struct tbl_row *); | struct tbl_row *); | ||
static int | |||
getdata(struct tbl_node *tbl, struct tbl_span *dp, | static void | ||
getdata(struct tbl_node *tbl, struct tbl_span *dp, | |||
int ln, const char *p, int *pos) | int ln, const char *p, int *pos) | ||
{ | { | ||
struct tbl_dat *dat; | struct tbl_dat *dat; | ||
struct tbl_cell *cp; | struct tbl_cell *cp; | ||
int sv, spans; | int sv; | ||
cp = NULL; | /* Advance to the next layout cell, skipping spanners. */ | ||
if (dp->last && dp->last->layout) | |||
cp = dp->last->layout->next; | |||
else if (NULL == dp->last) | |||
cp = dp->layout->first; | |||
/* | cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; | ||
* Skip over spanners, since | while (cp != NULL && cp->pos == TBL_CELL_SPAN) | ||
* we want to match data with data layout cells in the header. | |||
*/ | |||
while (cp && TBL_CELL_SPAN == cp->pos) | |||
cp = cp->next; | cp = cp->next; | ||
/* | /* | ||
* Stop processing when we reach the end of the available layout | * If the current layout row is out of cells, allocate | ||
* cells. This means that we have extra input. | * 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 (NULL == cp) { | if (cp == NULL) { | ||
mandoc_msg(MANDOCERR_TBLEXTRADAT, | if (dp->layout->last->col + 1 < dp->opts->cols) { | ||
tbl->parse, ln, *pos, NULL); | cp = mandoc_calloc(1, sizeof(*cp)); | ||
/* Skip to the end... */ | cp->pos = TBL_CELL_LEFT; | ||
while (p[*pos]) | dp->layout->last->next = cp; | ||
(*pos)++; | cp->col = dp->layout->last->col + 1; | ||
return(1); | dp->layout->last = cp; | ||
} else { | |||
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, | |||
ln, *pos, p + *pos); | |||
while (p[*pos]) | |||
(*pos)++; | |||
return; | |||
} | |||
} | } | ||
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); | dat = mandoc_calloc(1, sizeof(*dat)); | ||
dat->layout = cp; | dat->layout = cp; | ||
dat->pos = TBL_DATA_NONE; | dat->pos = TBL_DATA_NONE; | ||
dat->spans = 0; | |||
assert(TBL_CELL_SPAN != cp->pos); | for (cp = cp->next; cp != NULL; cp = cp->next) | ||
if (cp->pos == TBL_CELL_SPAN) | |||
for (spans = 0, cp = cp->next; cp; cp = cp->next) | dat->spans++; | ||
if (TBL_CELL_SPAN == cp->pos) | |||
spans++; | |||
else | else | ||
break; | break; | ||
dat->spans = spans; | |||
if (dp->last) { | if (dp->last == NULL) | ||
dp->first = dat; | |||
else | |||
dp->last->next = dat; | dp->last->next = dat; | ||
dp->last = dat; | dp->last = dat; | ||
} else | |||
dp->last = dp->first = dat; | |||
sv = *pos; | sv = *pos; | ||
while (p[*pos] && p[*pos] != tbl->opts.tab) | while (p[*pos] && p[*pos] != tbl->opts.tab) | ||
|
|
||
* until a standalone `T}', are included in our cell. | * until a standalone `T}', are included in our cell. | ||
*/ | */ | ||
if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { | if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') { | ||
tbl->part = TBL_PART_CDATA; | tbl->part = TBL_PART_CDATA; | ||
return(1); | return; | ||
} | } | ||
assert(*pos - sv >= 0); | dat->string = mandoc_strndup(p + sv, *pos - sv); | ||
dat->string = mandoc_malloc((size_t)(*pos - sv + 1)); | |||
memcpy(dat->string, &p[sv], (size_t)(*pos - sv)); | |||
dat->string[*pos - sv] = '\0'; | |||
if (p[*pos]) | if (p[*pos]) | ||
(*pos)++; | (*pos)++; | ||
|
|
||
else | else | ||
dat->pos = TBL_DATA_DATA; | dat->pos = TBL_DATA_DATA; | ||
if (TBL_CELL_HORIZ == dat->layout->pos || | if ((dat->layout->pos == TBL_CELL_HORIZ || | ||
TBL_CELL_DHORIZ == dat->layout->pos || | dat->layout->pos == TBL_CELL_DHORIZ || | ||
TBL_CELL_DOWN == dat->layout->pos) | dat->layout->pos == TBL_CELL_DOWN) && | ||
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) | dat->pos == TBL_DATA_DATA && *dat->string != '\0') | ||
mandoc_msg(MANDOCERR_TBLIGNDATA, | mandoc_msg(MANDOCERR_TBLDATA_SPAN, | ||
tbl->parse, ln, sv, NULL); | tbl->parse, ln, sv, dat->string); | ||
return(1); | |||
} | } | ||
/* ARGSUSED */ | |||
int | int | ||
tbl_cdata(struct tbl_node *tbl, int ln, const char *p) | tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) | ||
{ | { | ||
struct tbl_dat *dat; | struct tbl_dat *dat; | ||
size_t sz; | size_t sz; | ||
int pos; | |||
pos = 0; | |||
dat = tbl->last_span->last; | dat = tbl->last_span->last; | ||
if (p[pos] == 'T' && p[pos + 1] == '}') { | if (p[pos] == 'T' && p[pos + 1] == '}') { | ||
|
|
||
if (p[pos] == tbl->opts.tab) { | if (p[pos] == tbl->opts.tab) { | ||
tbl->part = TBL_PART_DATA; | tbl->part = TBL_PART_DATA; | ||
pos++; | pos++; | ||
return(getdata(tbl, tbl->last_span, ln, p, &pos)); | while (p[pos] != '\0') | ||
} else if ('\0' == p[pos]) { | getdata(tbl, tbl->last_span, ln, p, &pos); | ||
return 1; | |||
} else if (p[pos] == '\0') { | |||
tbl->part = TBL_PART_DATA; | tbl->part = TBL_PART_DATA; | ||
return(1); | return 1; | ||
} | } | ||
/* Fallthrough: T} is part of a word. */ | /* Fallthrough: T} is part of a word. */ | ||
} | } | ||
dat->pos = TBL_DATA_DATA; | dat->pos = TBL_DATA_DATA; | ||
dat->block = 1; | |||
if (dat->string) { | if (dat->string != NULL) { | ||
sz = strlen(p) + strlen(dat->string) + 2; | sz = strlen(p + pos) + strlen(dat->string) + 2; | ||
dat->string = mandoc_realloc(dat->string, sz); | dat->string = mandoc_realloc(dat->string, sz); | ||
strlcat(dat->string, " ", sz); | (void)strlcat(dat->string, " ", sz); | ||
strlcat(dat->string, p, sz); | (void)strlcat(dat->string, p + pos, sz); | ||
} else | } else | ||
dat->string = mandoc_strdup(p); | dat->string = mandoc_strdup(p + pos); | ||
if (TBL_CELL_DOWN == dat->layout->pos) | if (dat->layout->pos == TBL_CELL_DOWN) | ||
mandoc_msg(MANDOCERR_TBLIGNDATA, | mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, | ||
tbl->parse, ln, pos, NULL); | ln, pos, dat->string); | ||
return(0); | return 0; | ||
} | } | ||
static struct tbl_span * | static struct tbl_span * | ||
|
|
||
{ | { | ||
struct tbl_span *dp; | struct tbl_span *dp; | ||
dp = mandoc_calloc(1, sizeof(struct tbl_span)); | dp = mandoc_calloc(1, sizeof(*dp)); | ||
dp->line = line; | dp->line = line; | ||
dp->opts = &tbl->opts; | dp->opts = &tbl->opts; | ||
dp->layout = rp; | dp->layout = rp; | ||
dp->head = tbl->first_head; | dp->prev = tbl->last_span; | ||
if (tbl->last_span) { | if (dp->prev == NULL) { | ||
tbl->last_span->next = dp; | tbl->first_span = dp; | ||
tbl->last_span = dp; | |||
} else { | |||
tbl->last_span = tbl->first_span = dp; | |||
tbl->current_span = NULL; | tbl->current_span = NULL; | ||
dp->flags |= TBL_SPAN_FIRST; | } else | ||
} | dp->prev->next = dp; | ||
tbl->last_span = dp; | |||
return(dp); | return dp; | ||
} | } | ||
int | void | ||
tbl_data(struct tbl_node *tbl, int ln, const char *p) | tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) | ||
{ | { | ||
struct tbl_span *dp; | |||
struct tbl_row *rp; | struct tbl_row *rp; | ||
int pos; | struct tbl_cell *cp; | ||
struct tbl_span *sp, *spi; | |||
struct tbl_dat *dp; | |||
int have_data, spans; | |||
pos = 0; | rp = (sp = tbl->last_span) == NULL ? tbl->first_row : | ||
sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ? | |||
sp->layout->next : sp->layout; | |||
if ('\0' == p[pos]) { | assert(rp != NULL); | ||
mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL); | |||
return(0); | |||
} | |||
/* | sp = newspan(tbl, ln, rp); | ||
* Choose a layout row: take the one following the last parsed | |||
* span's. If that doesn't exist, use the last parsed span's. | |||
* If there's no last parsed span, use the first row. Lastly, | |||
* if the last span was a horizontal line, use the same layout | |||
* (it doesn't "consume" the layout). | |||
*/ | |||
if (tbl->last_span) { | |||
assert(tbl->last_span->layout); | |||
if (tbl->last_span->pos == TBL_SPAN_DATA) { | |||
for (rp = tbl->last_span->layout->next; | |||
rp && rp->first; rp = rp->next) { | |||
switch (rp->first->pos) { | |||
case (TBL_CELL_HORIZ): | |||
dp = newspan(tbl, ln, rp); | |||
dp->pos = TBL_SPAN_HORIZ; | |||
continue; | |||
case (TBL_CELL_DHORIZ): | |||
dp = newspan(tbl, ln, rp); | |||
dp->pos = TBL_SPAN_DHORIZ; | |||
continue; | |||
default: | |||
break; | |||
} | |||
break; | |||
} | |||
} else | |||
rp = tbl->last_span->layout; | |||
if (NULL == rp) | |||
rp = tbl->last_span->layout; | |||
} else | |||
rp = tbl->first_row; | |||
assert(rp); | |||
dp = newspan(tbl, ln, rp); | |||
if ( ! strcmp(p, "_")) { | if ( ! strcmp(p, "_")) { | ||
dp->pos = TBL_SPAN_HORIZ; | sp->pos = TBL_SPAN_HORIZ; | ||
return(1); | return; | ||
} else if ( ! strcmp(p, "=")) { | } else if ( ! strcmp(p, "=")) { | ||
dp->pos = TBL_SPAN_DHORIZ; | sp->pos = TBL_SPAN_DHORIZ; | ||
return(1); | return; | ||
} | } | ||
sp->pos = TBL_SPAN_DATA; | |||
dp->pos = TBL_SPAN_DATA; | while (p[pos] != '\0') | ||
getdata(tbl, sp, ln, p, &pos); | |||
/* This returns 0 when TBL_PART_CDATA is entered. */ | /* | ||
* If this span contains some data, | |||
* make sure at least part of it gets printed. | |||
*/ | |||
while ('\0' != p[pos]) | have_data = 0; | ||
if ( ! getdata(tbl, dp, ln, p, &pos)) | cp = rp->first; | ||
return(0); | for (dp = sp->first; dp != NULL; dp = dp->next) { | ||
if (dp->pos == TBL_DATA_DATA && *dp->string != '\0') { | |||
if (cp == NULL || | |||
(cp->pos != TBL_CELL_HORIZ && | |||
cp->pos != TBL_CELL_DHORIZ)) | |||
return; | |||
have_data = 1; | |||
} | |||
spans = dp->spans; | |||
while (spans-- >= 0) { | |||
if (cp != NULL) | |||
cp = cp->next; | |||
} | |||
} | |||
if (have_data == 0 || rp->next == NULL) | |||
return; | |||
return(1); | /* | ||
* There is some data, but it would all get lost | |||
* due to horizontal lines in the layout. | |||
* Insert an empty span to consume the layout row. | |||
*/ | |||
tbl->last_span = sp->prev; | |||
spi = newspan(tbl, ln, rp); | |||
spi->pos = TBL_SPAN_DATA; | |||
spi->next = sp; | |||
tbl->last_span = sp; | |||
sp->prev = spi; | |||
sp->layout = rp->next; | |||
cp = sp->layout->first; | |||
for (dp = sp->first; dp != NULL; dp = dp->next) { | |||
dp->layout = cp; | |||
dp->spans = 0; | |||
if (cp != NULL) | |||
cp = cp->next; | |||
while (cp != NULL && cp->pos == TBL_CELL_SPAN) { | |||
dp->spans++; | |||
cp = cp->next; | |||
} | |||
} | |||
} | } |