version 1.12, 2011/01/07 13:03:48 |
version 1.52, 2019/02/09 16:00:39 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2011,2015,2017,2018,2019 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 <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
|
#include "mandoc_aux.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "tbl.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "tbl_int.h" |
|
|
static int data(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, |
|
struct tbl_row *); |
|
|
static int |
|
data(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, *pdat; |
struct tbl_cell *cp; |
struct tbl_cell *cp; |
|
struct tbl_span *pdp; |
int sv; |
int sv; |
|
|
cp = NULL; |
/* |
if (dp->last && dp->last->layout) |
* Determine the length of the string in the cell |
cp = dp->last->layout->next; |
* and advance the parse point to the end of the cell. |
else if (NULL == dp->last) |
|
cp = dp->layout->first; |
|
|
|
/* |
|
* Skip over spanners and vertical lines to data formats, since |
|
* we want to match data with data layout cells in the header. |
|
*/ |
*/ |
|
|
while (cp && (TBL_CELL_VERT == cp->pos || |
sv = *pos; |
TBL_CELL_DVERT == cp->pos || |
while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab) |
TBL_CELL_SPAN == cp->pos)) |
(*pos)++; |
|
|
|
/* 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; |
cp = cp->next; |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
/* |
|
* 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, |
|
ln, sv, "%s", p + sv); |
|
while (p[*pos] != '\0') |
|
(*pos)++; |
|
return; |
|
} |
|
} |
|
|
|
dat = mandoc_malloc(sizeof(*dat)); |
dat->layout = cp; |
dat->layout = cp; |
|
dat->next = NULL; |
|
dat->string = NULL; |
|
dat->hspans = 0; |
|
dat->vspans = 0; |
|
dat->block = 0; |
dat->pos = TBL_DATA_NONE; |
dat->pos = TBL_DATA_NONE; |
|
|
if (NULL == dat->layout) |
/* |
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
* Increment the number of vertical spans in a data cell above, |
|
* if this cell vertically extends one or more cells above. |
|
* The iteration must be done over data rows, |
|
* not over layout rows, because one layout row |
|
* can be reused for more than one data row. |
|
*/ |
|
|
if (dp->last) { |
if (cp->pos == TBL_CELL_DOWN || |
dp->last->next = dat; |
(*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) { |
dp->last = dat; |
pdp = dp; |
} else |
while ((pdp = pdp->prev) != NULL) { |
dp->last = dp->first = dat; |
pdat = pdp->first; |
|
while (pdat != NULL && |
|
pdat->layout->col < dat->layout->col) |
|
pdat = pdat->next; |
|
if (pdat == NULL) |
|
break; |
|
if (pdat->layout->pos != TBL_CELL_DOWN && |
|
strcmp(pdat->string, "\\^") != 0) { |
|
pdat->vspans++; |
|
break; |
|
} |
|
} |
|
} |
|
|
sv = *pos; |
/* |
while (p[*pos] && p[*pos] != tbl->opts.tab) |
* Count the number of horizontal spans to the right of this cell. |
(*pos)++; |
* This is purely a matter of the layout, independent of the data. |
|
*/ |
|
|
|
for (cp = cp->next; cp != NULL; cp = cp->next) |
|
if (cp->pos == TBL_CELL_SPAN) |
|
dat->hspans++; |
|
else |
|
break; |
|
|
|
/* Append the new data cell to the data row. */ |
|
|
|
if (dp->last == NULL) |
|
dp->first = dat; |
|
else |
|
dp->last->next = dat; |
|
dp->last = dat; |
|
|
/* |
/* |
* Check for a continued-data scope opening. This consists of a |
* Check for a continued-data scope opening. This consists of a |
* trailing `T{' at the end of the line. Subsequent lines, |
* trailing `T{' at the end of the line. Subsequent lines, |
* 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(0); |
return; |
} |
} |
|
|
dat->string = mandoc_malloc(*pos - sv + 1); |
dat->string = mandoc_strndup(p + sv, *pos - sv); |
memcpy(dat->string, &p[sv], *pos - sv); |
|
dat->string[*pos - sv] = '\0'; |
|
|
|
if (p[*pos]) |
if (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
|
|
if ( ! strcmp(dat->string, "_")) |
if ( ! strcmp(dat->string, "_")) |
Line 101 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 166 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
else |
else |
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (NULL == dat->layout) |
if ((dat->layout->pos == TBL_CELL_HORIZ || |
return(1); |
dat->layout->pos == TBL_CELL_DHORIZ || |
|
dat->layout->pos == TBL_CELL_DOWN) && |
if (TBL_CELL_HORIZ == dat->layout->pos || |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
TBL_CELL_DHORIZ == dat->layout->pos) |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
ln, sv, "%s", dat->string); |
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); |
|
|
|
return(1); |
|
} |
} |
|
|
int |
void |
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; |
|
|
if (0 == strcmp(p, "T}")) { |
dat = tbl->last_span->last; |
tbl->part = TBL_PART_DATA; |
|
return(1); |
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. */ |
} |
} |
|
|
dat = tbl->last_span->last; |
|
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); |
|
|
return(0); |
if (dat->layout->pos == TBL_CELL_DOWN) |
|
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
|
ln, pos, "%s", dat->string); |
} |
} |
|
|
int |
static struct tbl_span * |
tbl_data(struct tbl_node *tbl, int ln, const char *p) |
newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) |
{ |
{ |
struct tbl_span *dp; |
struct tbl_span *dp; |
struct tbl_row *rp; |
|
int pos; |
|
|
|
pos = 0; |
dp = mandoc_calloc(1, sizeof(*dp)); |
|
dp->line = line; |
|
dp->opts = &tbl->opts; |
|
dp->layout = rp; |
|
dp->prev = tbl->last_span; |
|
|
if ('\0' == p[pos]) { |
if (dp->prev == NULL) { |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
tbl->first_span = dp; |
return(0); |
tbl->current_span = NULL; |
} |
} else |
|
dp->prev->next = dp; |
|
tbl->last_span = dp; |
|
|
/* |
return dp; |
* 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. This can |
|
* be NULL! |
|
*/ |
|
|
|
if (tbl->last_span) { |
void |
assert(tbl->last_span->layout); |
tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) |
rp = tbl->last_span->layout->next; |
{ |
if (NULL == rp) |
struct tbl_row *rp; |
rp = tbl->last_span->layout; |
struct tbl_cell *cp; |
} else |
struct tbl_span *sp; |
rp = tbl->first_row; |
|
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
rp = (sp = tbl->last_span) == NULL ? tbl->first_row : |
dp->tbl = &tbl->opts; |
sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ? |
dp->layout = rp; |
sp->layout->next : sp->layout; |
dp->head = tbl->first_head; |
|
|
|
if (tbl->last_span) { |
assert(rp != NULL); |
tbl->last_span->next = dp; |
|
tbl->last_span = dp; |
|
} else { |
|
tbl->last_span = tbl->first_span = dp; |
|
dp->flags |= TBL_SPAN_FIRST; |
|
} |
|
|
|
if ( ! strcmp(p, "_")) { |
if (p[1] == '\0') { |
dp->pos = TBL_SPAN_HORIZ; |
switch (p[0]) { |
return(1); |
case '.': |
} else if ( ! strcmp(p, "=")) { |
/* |
dp->pos = TBL_SPAN_DHORIZ; |
* Empty request lines must be handled here |
return(1); |
* 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; |
|
} |
} |
} |
|
|
dp->pos = TBL_SPAN_DATA; |
/* |
|
* 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. |
|
*/ |
|
|
/* This returns 0 when TBL_PART_CDATA is entered. */ |
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]) |
/* Process a real data row. */ |
if ( ! data(tbl, dp, ln, p, &pos)) |
|
return(0); |
|
|
|
return(1); |
sp = newspan(tbl, ln, rp); |
|
sp->pos = TBL_SPAN_DATA; |
|
while (p[pos] != '\0') |
|
getdata(tbl, sp, ln, p, &pos); |
} |
} |