version 1.46, 2018/11/25 19:24:20 |
version 1.49, 2018/12/13 02:06:07 |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc.h" |
|
#include "tbl.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "tbl_int.h" |
|
|
static void getdata(struct tbl_node *, struct tbl_span *, |
static void getdata(struct tbl_node *, struct tbl_span *, |
int, const char *, int *); |
int, const char *, int *); |
Line 45 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 46 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
struct tbl_span *pdp; |
struct tbl_span *pdp; |
int sv; |
int sv; |
|
|
|
/* |
|
* Determine the length of the string in the cell |
|
* and advance the parse point to the end of the cell. |
|
*/ |
|
|
|
sv = *pos; |
|
while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab) |
|
(*pos)++; |
|
|
/* Advance to the next layout cell, skipping spanners. */ |
/* Advance to the next layout cell, skipping spanners. */ |
|
|
cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; |
cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; |
Line 67 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 77 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
dp->layout->last = cp; |
dp->layout->last = cp; |
} else { |
} else { |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
ln, *pos, p + *pos); |
ln, sv, p + sv); |
while (p[*pos]) |
while (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
return; |
return; |
} |
} |
Line 91 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 101 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
* can be reused for more than one data row. |
* can be reused for more than one data row. |
*/ |
*/ |
|
|
if (cp->pos == TBL_CELL_DOWN) { |
if (cp->pos == TBL_CELL_DOWN || |
|
(*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) { |
pdp = dp; |
pdp = dp; |
while ((pdp = pdp->prev) != NULL) { |
while ((pdp = pdp->prev) != NULL) { |
pdat = pdp->first; |
pdat = pdp->first; |
Line 100 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 111 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
pdat = pdat->next; |
pdat = pdat->next; |
if (pdat == NULL) |
if (pdat == NULL) |
break; |
break; |
if (pdat->layout->pos != TBL_CELL_DOWN) { |
if (pdat->layout->pos != TBL_CELL_DOWN && |
|
strcmp(pdat->string, "\\^") != 0) { |
pdat->vspans++; |
pdat->vspans++; |
break; |
break; |
} |
} |
Line 126 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 138 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
dp->last->next = dat; |
dp->last->next = dat; |
dp->last = dat; |
dp->last = dat; |
|
|
sv = *pos; |
|
while (p[*pos] && p[*pos] != tbl->opts.tab) |
|
(*pos)++; |
|
|
|
/* |
/* |
* 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, |
Line 143 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 151 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
|
|
dat->string = mandoc_strndup(p + sv, *pos - sv); |
dat->string = mandoc_strndup(p + sv, *pos - sv); |
|
|
if (p[*pos]) |
if (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
|
|
if ( ! strcmp(dat->string, "_")) |
if ( ! strcmp(dat->string, "_")) |