version 1.2, 2010/12/30 09:34:07 |
version 1.10, 2011/01/04 12:06:21 |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
#include <time.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
static void data(struct tbl *, struct tbl_span *, |
static void data(struct tbl_node *, struct tbl_span *, |
int, const char *, int *); |
int, const char *, int *); |
|
|
void |
void |
data(struct tbl *tbl, struct tbl_span *dp, |
data(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; |
int sv; |
int sv; |
|
|
|
cp = NULL; |
|
if (dp->last && dp->last->layout) |
|
cp = dp->last->layout->next; |
|
else if (NULL == dp->last) |
|
cp = dp->layout->first; |
|
|
|
/* Skip over spanners to data formats. */ |
|
|
|
while (cp && (TBL_CELL_VERT == cp->pos || |
|
TBL_CELL_DVERT == cp->pos)) |
|
cp = cp->next; |
|
|
/* FIXME: warn about losing data contents if cell is HORIZ. */ |
/* FIXME: warn about losing data contents if cell is HORIZ. */ |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
|
dat->layout = cp; |
|
|
|
if (NULL == dat->layout) |
|
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
|
|
if (dp->last) { |
if (dp->last) { |
dp->last->next = dat; |
dp->last->next = dat; |
dp->last = dat; |
dp->last = dat; |
Line 44 data(struct tbl *tbl, struct tbl_span *dp, |
|
Line 62 data(struct tbl *tbl, struct tbl_span *dp, |
|
dp->last = dp->first = dat; |
dp->last = dp->first = dat; |
|
|
sv = *pos; |
sv = *pos; |
while (p[*pos] && p[*pos] != tbl->tab) |
while (p[*pos] && p[*pos] != tbl->opts.tab) |
(*pos)++; |
(*pos)++; |
|
|
dat->string = mandoc_malloc(*pos - sv + 1); |
dat->string = mandoc_malloc(*pos - sv + 1); |
Line 54 data(struct tbl *tbl, struct tbl_span *dp, |
|
Line 72 data(struct tbl *tbl, struct tbl_span *dp, |
|
if (p[*pos]) |
if (p[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
/* XXX: do the strcmps, then malloc(). */ |
|
|
|
if ( ! strcmp(dat->string, "_")) |
if ( ! strcmp(dat->string, "_")) |
dat->flags |= TBL_DATA_HORIZ; |
dat->pos = TBL_DATA_HORIZ; |
else if ( ! strcmp(dat->string, "=")) |
else if ( ! strcmp(dat->string, "=")) |
dat->flags |= TBL_DATA_DHORIZ; |
dat->pos = TBL_DATA_DHORIZ; |
else if ( ! strcmp(dat->string, "\\_")) |
else if ( ! strcmp(dat->string, "\\_")) |
dat->flags |= TBL_DATA_NHORIZ; |
dat->pos = TBL_DATA_NHORIZ; |
else if ( ! strcmp(dat->string, "\\=")) |
else if ( ! strcmp(dat->string, "\\=")) |
dat->flags |= TBL_DATA_NDHORIZ; |
dat->pos = TBL_DATA_NDHORIZ; |
|
else |
|
dat->pos = TBL_DATA_DATA; |
|
|
|
if (TBL_CELL_HORIZ == dat->layout->pos || |
|
TBL_CELL_DHORIZ == dat->layout->pos) |
|
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
|
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); |
} |
} |
|
|
int |
int |
tbl_data(struct tbl *tbl, int ln, const char *p) |
tbl_data(struct tbl_node *tbl, int ln, const char *p) |
{ |
{ |
struct tbl_span *dp; |
struct tbl_span *dp; |
|
struct tbl_row *rp; |
int pos; |
int pos; |
|
|
pos = 0; |
pos = 0; |
|
|
if ('\0' == p[pos]) { |
if ('\0' == p[pos]) { |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
return(1); |
return(0); |
} |
} |
|
|
|
/* |
|
* 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) { |
|
assert(tbl->last_span->layout); |
|
rp = tbl->last_span->layout->next; |
|
if (NULL == rp) |
|
rp = tbl->last_span->layout; |
|
} else |
|
rp = tbl->first_row; |
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
|
dp->tbl = &tbl->opts; |
|
dp->layout = rp; |
|
dp->head = tbl->first_head; |
|
|
if (tbl->last_span) { |
if (tbl->last_span) { |
tbl->last_span->next = dp; |
tbl->last_span->next = dp; |
tbl->last_span = dp; |
tbl->last_span = dp; |
} else |
} else { |
tbl->last_span = tbl->first_span = dp; |
tbl->last_span = tbl->first_span = dp; |
|
dp->flags |= TBL_SPAN_FIRST; |
|
} |
|
|
if ( ! strcmp(p, "_")) { |
if ( ! strcmp(p, "_")) { |
dp->flags |= TBL_SPAN_HORIZ; |
dp->pos = TBL_SPAN_HORIZ; |
return(1); |
return(1); |
} else if ( ! strcmp(p, "=")) { |
} else if ( ! strcmp(p, "=")) { |
dp->flags |= TBL_SPAN_DHORIZ; |
dp->pos = TBL_SPAN_DHORIZ; |
return(1); |
return(1); |
} |
} |
|
|
|
dp->pos = TBL_SPAN_DATA; |
|
|
while ('\0' != p[pos]) |
while ('\0' != p[pos]) |
data(tbl, dp, ln, p, &pos); |
data(tbl, dp, ln, p, &pos); |