version 1.45, 2017/07/08 17:52:50 |
version 1.51, 2018/12/14 05:18:03 |
|
|
/* $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, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2015, 2017, 2018 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 <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.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 *); |
|
|
getdata(struct tbl_node *tbl, struct tbl_span *dp, |
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; |
|
|
|
/* |
|
* 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 65 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 77 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
cp->col = dp->layout->last->col + 1; |
cp->col = dp->layout->last->col + 1; |
dp->layout->last = cp; |
dp->layout->last = cp; |
} else { |
} else { |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, |
ln, *pos, p + *pos); |
ln, sv, "%s", p + sv); |
while (p[*pos]) |
while (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
return; |
return; |
} |
} |
} |
} |
|
|
dat = mandoc_calloc(1, sizeof(*dat)); |
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; |
dat->spans = 0; |
|
|
/* |
|
* 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 (cp->pos == TBL_CELL_DOWN || |
|
(*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) { |
|
pdp = dp; |
|
while ((pdp = pdp->prev) != NULL) { |
|
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; |
|
} |
|
} |
|
} |
|
|
|
/* |
|
* Count the number of horizontal spans to the right of this cell. |
|
* This is purely a matter of the layout, independent of the data. |
|
*/ |
|
|
for (cp = cp->next; cp != NULL; cp = cp->next) |
for (cp = cp->next; cp != NULL; cp = cp->next) |
if (cp->pos == TBL_CELL_SPAN) |
if (cp->pos == TBL_CELL_SPAN) |
dat->spans++; |
dat->hspans++; |
else |
else |
break; |
break; |
|
|
|
/* Append the new data cell to the data row. */ |
|
|
if (dp->last == NULL) |
if (dp->last == NULL) |
dp->first = dat; |
dp->first = dat; |
else |
else |
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 106 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 152 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, "_")) |
Line 125 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 171 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
dat->layout->pos == TBL_CELL_DOWN) && |
dat->layout->pos == TBL_CELL_DOWN) && |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
tbl->parse, ln, sv, dat->string); |
ln, sv, "%s", dat->string); |
} |
} |
|
|
void |
void |
Line 164 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
Line 210 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
dat->string = mandoc_strdup(p + pos); |
dat->string = mandoc_strdup(p + pos); |
|
|
if (dat->layout->pos == TBL_CELL_DOWN) |
if (dat->layout->pos == TBL_CELL_DOWN) |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
ln, pos, dat->string); |
ln, pos, "%s", dat->string); |
} |
} |
|
|
static struct tbl_span * |
static struct tbl_span * |