version 1.15, 2011/01/09 23:14:41 |
version 1.27, 2013/06/01 04:56:50 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2011 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 |
|
|
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
static int data(struct tbl_node *, struct tbl_span *, |
static int data(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 |
static int |
data(struct tbl_node *tbl, struct tbl_span *dp, |
data(struct tbl_node *tbl, struct tbl_span *dp, |
Line 37 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 40 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
struct tbl_cell *cp; |
struct tbl_cell *cp; |
int sv; |
int sv, spans; |
|
|
cp = NULL; |
cp = NULL; |
if (dp->last && dp->last->layout) |
if (dp->last && dp->last->layout) |
Line 46 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 49 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
cp = dp->layout->first; |
cp = dp->layout->first; |
|
|
/* |
/* |
* Skip over spanners and vertical lines to data formats, since |
* Skip over spanners, since |
* we want to match data with data layout cells in the header. |
* we want to match data with data layout cells in the header. |
*/ |
*/ |
|
|
while (cp && (TBL_CELL_VERT == cp->pos || |
while (cp && TBL_CELL_SPAN == cp->pos) |
TBL_CELL_DVERT == cp->pos || |
|
TBL_CELL_SPAN == cp->pos)) |
|
cp = cp->next; |
cp = cp->next; |
|
|
|
/* |
|
* Stop processing when we reach the end of the available layout |
|
* cells. This means that we have extra input. |
|
*/ |
|
|
|
if (NULL == cp) { |
|
mandoc_msg(MANDOCERR_TBLEXTRADAT, |
|
tbl->parse, ln, *pos, NULL); |
|
/* Skip to the end... */ |
|
while (p[*pos]) |
|
(*pos)++; |
|
return(1); |
|
} |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat->layout = cp; |
dat->layout = cp; |
dat->pos = TBL_DATA_NONE; |
dat->pos = TBL_DATA_NONE; |
|
|
if (NULL == dat->layout) |
assert(TBL_CELL_SPAN != cp->pos); |
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
|
|
|
|
for (spans = 0, cp = cp->next; cp; cp = cp->next) |
|
if (TBL_CELL_SPAN == cp->pos) |
|
spans++; |
|
else |
|
break; |
|
|
|
dat->spans = spans; |
|
|
if (dp->last) { |
if (dp->last) { |
dp->last->next = dat; |
dp->last->next = dat; |
dp->last = dat; |
dp->last = dat; |
Line 80 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 102 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
|
|
if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { |
if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { |
tbl->part = TBL_PART_CDATA; |
tbl->part = TBL_PART_CDATA; |
return(0); |
return(1); |
} |
} |
|
|
dat->string = mandoc_malloc(*pos - sv + 1); |
assert(*pos - sv >= 0); |
memcpy(dat->string, &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'; |
dat->string[*pos - sv] = '\0'; |
|
|
if (p[*pos]) |
if (p[*pos]) |
Line 101 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 125 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) |
|
return(1); |
|
|
|
if (TBL_CELL_HORIZ == dat->layout->pos || |
if (TBL_CELL_HORIZ == dat->layout->pos || |
TBL_CELL_DHORIZ == dat->layout->pos) |
TBL_CELL_DHORIZ == dat->layout->pos || |
|
TBL_CELL_DOWN == dat->layout->pos) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); |
mandoc_msg(MANDOCERR_TBLIGNDATA, |
|
tbl->parse, ln, sv, NULL); |
|
|
return(1); |
return(1); |
} |
} |
Line 123 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 146 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
pos = 0; |
pos = 0; |
|
|
dat = tbl->last_span->last; |
dat = tbl->last_span->last; |
dat->pos = TBL_DATA_DATA; |
|
|
|
if (p[pos] == 'T' && p[pos + 1] == '}') { |
if (p[pos] == 'T' && p[pos + 1] == '}') { |
pos += 2; |
pos += 2; |
Line 139 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 161 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
/* Fallthrough: T} is part of a word. */ |
/* Fallthrough: T} is part of a word. */ |
} |
} |
|
|
|
dat->pos = TBL_DATA_DATA; |
|
|
if (dat->string) { |
if (dat->string) { |
sz = strlen(p) + strlen(dat->string) + 2; |
sz = strlen(p) + strlen(dat->string) + 2; |
dat->string = mandoc_realloc(dat->string, sz); |
dat->string = mandoc_realloc(dat->string, sz); |
Line 147 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 171 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
} else |
} else |
dat->string = mandoc_strdup(p); |
dat->string = mandoc_strdup(p); |
|
|
|
if (TBL_CELL_DOWN == dat->layout->pos) |
|
mandoc_msg(MANDOCERR_TBLIGNDATA, |
|
tbl->parse, ln, pos, NULL); |
|
|
return(0); |
return(0); |
} |
} |
|
|
|
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->line = line; |
|
dp->opts = &tbl->opts; |
|
dp->layout = rp; |
|
dp->head = tbl->first_head; |
|
|
|
if (tbl->last_span) { |
|
tbl->last_span->next = dp; |
|
tbl->last_span = dp; |
|
} else { |
|
tbl->last_span = tbl->first_span = dp; |
|
tbl->current_span = NULL; |
|
dp->flags |= TBL_SPAN_FIRST; |
|
} |
|
|
|
return(dp); |
|
} |
|
|
int |
int |
tbl_data(struct tbl_node *tbl, int ln, const char *p) |
tbl_data(struct tbl_node *tbl, int ln, const char *p) |
{ |
{ |
Line 160 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 211 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
pos = 0; |
pos = 0; |
|
|
if ('\0' == p[pos]) { |
if ('\0' == p[pos]) { |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 170 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 221 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
* If there's no last parsed span, use the first row. Lastly, |
* If there's no last parsed span, use the first row. Lastly, |
* if the last span was a horizontal line, use the same layout |
* if the last span was a horizontal line, use the same layout |
* (it doesn't "consume" the layout). |
* (it doesn't "consume" the layout). |
* |
|
* In the end, this can be NULL! |
|
*/ |
*/ |
|
|
if (tbl->last_span) { |
if (tbl->last_span) { |
assert(tbl->last_span->layout); |
assert(tbl->last_span->layout); |
if (tbl->last_span->pos == TBL_SPAN_DATA) |
if (tbl->last_span->pos == TBL_SPAN_DATA) { |
rp = tbl->last_span->layout->next; |
for (rp = tbl->last_span->layout->next; |
else |
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; |
rp = tbl->last_span->layout; |
|
|
if (NULL == rp) |
if (NULL == rp) |
rp = tbl->last_span->layout; |
rp = tbl->last_span->layout; |
} else |
} else |
rp = tbl->first_row; |
rp = tbl->first_row; |
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
assert(rp); |
dp->tbl = &tbl->opts; |
|
dp->layout = rp; |
|
dp->head = tbl->first_head; |
|
|
|
if (tbl->last_span) { |
dp = newspan(tbl, ln, rp); |
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 ( ! strcmp(p, "_")) { |
dp->pos = TBL_SPAN_HORIZ; |
dp->pos = TBL_SPAN_HORIZ; |