=================================================================== RCS file: /cvs/mandoc/tbl_data.c,v retrieving revision 1.43 retrieving revision 1.53 diff -u -p -r1.43 -r1.53 --- mandoc/tbl_data.c 2017/06/16 20:01:06 1.43 +++ mandoc/tbl_data.c 2020/01/11 20:48:18 1.53 @@ -1,7 +1,7 @@ -/* $Id: tbl_data.c,v 1.43 2017/06/16 20:01:06 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.53 2020/01/11 20:48:18 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2015, 2017 Ingo Schwarze + * Copyright (c) 2011,2015,2017,2018,2019 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -21,14 +21,17 @@ #include #include +#include +#include #include #include #include -#include "mandoc.h" #include "mandoc_aux.h" +#include "mandoc.h" +#include "tbl.h" #include "libmandoc.h" -#include "libroff.h" +#include "tbl_int.h" static void getdata(struct tbl_node *, struct tbl_span *, int, const char *, int *); @@ -40,10 +43,20 @@ static void getdata(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { - struct tbl_dat *dat; + struct tbl_dat *dat, *pdat; struct tbl_cell *cp; + struct tbl_span *pdp; 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. */ cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; @@ -61,38 +74,73 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, if (dp->layout->last->col + 1 < dp->opts->cols) { cp = mandoc_calloc(1, sizeof(*cp)); cp->pos = TBL_CELL_LEFT; + cp->spacing = SIZE_MAX; dp->layout->last->next = cp; cp->col = dp->layout->last->col + 1; dp->layout->last = cp; } else { - mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, - ln, *pos, p + *pos); - while (p[*pos]) + mandoc_msg(MANDOCERR_TBLDATA_EXTRA, + ln, sv, "%s", p + sv); + while (p[*pos] != '\0') (*pos)++; return; } } - dat = mandoc_calloc(1, sizeof(*dat)); + dat = mandoc_malloc(sizeof(*dat)); dat->layout = cp; + dat->next = NULL; + dat->string = NULL; + dat->hspans = 0; + dat->vspans = 0; + dat->block = 0; 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) if (cp->pos == TBL_CELL_SPAN) - dat->spans++; + 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; - sv = *pos; - while (p[*pos] && p[*pos] != tbl->opts.tab) - (*pos)++; - /* * Check for a continued-data scope opening. This consists of a * trailing `T{' at the end of the line. Subsequent lines, @@ -106,7 +154,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, dat->string = mandoc_strndup(p + sv, *pos - sv); - if (p[*pos]) + if (p[*pos] != '\0') (*pos)++; if ( ! strcmp(dat->string, "_")) @@ -125,10 +173,10 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, dat->layout->pos == TBL_CELL_DOWN) && dat->pos == TBL_DATA_DATA && *dat->string != '\0') mandoc_msg(MANDOCERR_TBLDATA_SPAN, - tbl->parse, ln, sv, dat->string); + ln, sv, "%s", dat->string); } -int +void tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_dat *dat; @@ -143,10 +191,10 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, pos++; while (p[pos] != '\0') getdata(tbl, tbl->last_span, ln, p, &pos); - return 1; + return; } else if (p[pos] == '\0') { tbl->part = TBL_PART_DATA; - return 1; + return; } /* Fallthrough: T} is part of a word. */ @@ -164,10 +212,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, dat->string = mandoc_strdup(p + pos); if (dat->layout->pos == TBL_CELL_DOWN) - mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, - ln, pos, dat->string); - - return 0; + mandoc_msg(MANDOCERR_TBLDATA_SPAN, + ln, pos, "%s", dat->string); } static struct tbl_span * @@ -196,9 +242,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, { struct tbl_row *rp; struct tbl_cell *cp; - struct tbl_span *sp, *spi; - struct tbl_dat *dp; - int have_data, spans; + struct tbl_span *sp; rp = (sp = tbl->last_span) == NULL ? tbl->first_row : sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ? @@ -206,66 +250,53 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, assert(rp != NULL); - sp = newspan(tbl, ln, rp); - - if ( ! strcmp(p, "_")) { - sp->pos = TBL_SPAN_HORIZ; - return; - } else if ( ! strcmp(p, "=")) { - sp->pos = TBL_SPAN_DHORIZ; - return; - } - sp->pos = TBL_SPAN_DATA; - - while (p[pos] != '\0') - getdata(tbl, sp, ln, p, &pos); - - /* - * If this span contains some data, - * make sure at least part of it gets printed. - */ - - have_data = 0; - cp = rp->first; - for (dp = sp->first; dp != NULL; dp = dp->next) { - if (dp->pos == TBL_DATA_DATA && *dp->string != '\0') { - if (cp == NULL || - (cp->pos != TBL_CELL_HORIZ && - cp->pos != TBL_CELL_DHORIZ)) - return; - have_data = 1; + if (p[1] == '\0') { + switch (p[0]) { + case '.': + /* + * Empty request lines must be handled here + * 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; } - spans = dp->spans; - while (spans-- >= 0) { - if (cp != NULL) - cp = cp->next; - } } - if (have_data == 0 || rp->next == NULL) - return; /* - * There is some data, but it would all get lost - * due to horizontal lines in the layout. - * Insert an empty span to consume the layout row. + * 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. */ - tbl->last_span = sp->prev; - spi = newspan(tbl, ln, rp); - spi->pos = TBL_SPAN_DATA; - spi->next = sp; - tbl->last_span = sp; - sp->prev = spi; - sp->layout = rp->next; - cp = sp->layout->first; - for (dp = sp->first; dp != NULL; dp = dp->next) { - dp->layout = cp; - dp->spans = 0; + 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) - cp = cp->next; - while (cp != NULL && cp->pos == TBL_CELL_SPAN) { - dp->spans++; - cp = cp->next; - } + break; + sp = newspan(tbl, ln, rp); + sp->pos = TBL_SPAN_DATA; + rp = rp->next; } + + /* Process a real data row. */ + + sp = newspan(tbl, ln, rp); + sp->pos = TBL_SPAN_DATA; + while (p[pos] != '\0') + getdata(tbl, sp, ln, p, &pos); }