version 1.46, 2017/06/08 18:11:22 |
version 1.49, 2017/06/12 20:45:18 |
Line 68 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 68 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
const struct tbl_cell *cp; |
const struct tbl_cell *cp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
static size_t offset; |
static size_t offset; |
size_t tsz; |
size_t coloff, tsz; |
int ic, horiz, spans, vert; |
int ic, horiz, spans, vert, more; |
|
char fc; |
|
|
/* Inhibit printing of spaces: we do padding ourselves. */ |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE | TERMP_BRNEVER; |
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE; |
|
|
/* |
/* |
* The first time we're invoked for a given table block, |
* The first time we're invoked for a given table block, |
Line 86 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 87 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tp->tbl.sulen = term_tbl_sulen; |
tp->tbl.sulen = term_tbl_sulen; |
tp->tbl.arg = tp; |
tp->tbl.arg = tp; |
|
|
tblcalc(&tp->tbl, sp, tp->tcol->rmargin - tp->tcol->offset); |
tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); |
|
|
/* Center the table as a whole. */ |
/* Center the table as a whole. */ |
|
|
Line 111 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 112 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tbl_hrule(tp, sp, 1); |
tbl_hrule(tp, sp, 1); |
} |
} |
|
|
/* Vertical frame at the start of each row. */ |
/* Set up the columns. */ |
|
|
horiz = sp->pos == TBL_SPAN_HORIZ || sp->pos == TBL_SPAN_DHORIZ; |
tp->flags |= TERMP_MULTICOL; |
|
horiz = 0; |
|
switch (sp->pos) { |
|
case TBL_SPAN_HORIZ: |
|
case TBL_SPAN_DHORIZ: |
|
horiz = 1; |
|
term_setcol(tp, 1); |
|
break; |
|
case TBL_SPAN_DATA: |
|
term_setcol(tp, sp->opts->cols + 2); |
|
coloff = tp->tcol->offset; |
|
|
if (sp->layout->vert || |
/* Set up a column for a left vertical frame. */ |
(sp->prev != NULL && sp->prev->layout->vert) || |
|
sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)) |
|
term_word(tp, horiz ? "+" : "|"); |
|
else if (sp->opts->lvert) |
|
tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1); |
|
|
|
/* |
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
* Now print the actual data itself depending on the span type. |
sp->opts->lvert) |
* Match data cells to column numbers. |
coloff++; |
*/ |
tp->tcol->rmargin = coloff; |
|
|
if (sp->pos == TBL_SPAN_DATA) { |
/* Set up the data columns. */ |
cp = sp->layout->first; |
|
dp = sp->first; |
dp = sp->first; |
spans = 0; |
spans = 0; |
for (ic = 0; ic < sp->opts->cols; ic++) { |
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
if (spans == 0) { |
|
tp->tcol++; |
|
tp->tcol->offset = coloff; |
|
} |
|
coloff += tp->tbl.cols[ic].width; |
|
tp->tcol->rmargin = coloff; |
|
coloff++; |
|
if (ic + 1 < sp->opts->cols) |
|
coloff += 2; |
|
if (spans) { |
|
spans--; |
|
continue; |
|
} |
|
if (dp == NULL) |
|
continue; |
|
spans = dp->spans; |
|
dp = dp->next; |
|
} |
|
|
/* |
/* Set up a column for a right vertical frame. */ |
* Remeber whether we need a vertical bar |
|
* after this cell. |
|
*/ |
|
|
|
vert = cp == NULL ? 0 : cp->vert; |
tp->tcol++; |
|
tp->tcol->offset = coloff; |
|
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
|
sp->opts->rvert) |
|
coloff++; |
|
tp->tcol->rmargin = coloff; |
|
|
/* |
/* Spans may have reduced the number of columns. */ |
* Print the data and advance to the next cell. |
|
*/ |
|
|
|
if (spans == 0) { |
tp->lasttcol = tp->tcol - tp->tcols; |
tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic); |
|
if (dp != NULL) { |
|
spans = dp->spans; |
|
dp = dp->next; |
|
} |
|
} else |
|
spans--; |
|
if (cp != NULL) |
|
cp = cp->next; |
|
|
|
/* |
/* Fill the buffers for all data columns. */ |
* Separate columns, except in the middle |
|
* of spans and after the last cell. |
|
*/ |
|
|
|
if (ic + 1 == sp->opts->cols || spans) |
tp->tcol = tp->tcols; |
|
dp = sp->first; |
|
spans = 0; |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
if (spans) { |
|
spans--; |
continue; |
continue; |
|
} |
|
tp->tcol++; |
|
tp->col = 0; |
|
tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic); |
|
if (dp == NULL) |
|
continue; |
|
spans = dp->spans; |
|
dp = dp->next; |
|
} |
|
break; |
|
} |
|
|
tbl_char(tp, ASCII_NBRSP, 1); |
do { |
if (vert > 0) |
/* Print the vertical frame at the start of each row. */ |
tbl_char(tp, '|', vert); |
|
if (vert < 2) |
tp->tcol = tp->tcols; |
tbl_char(tp, ASCII_NBRSP, 2 - vert); |
fc = '\0'; |
|
if (sp->layout->vert || |
|
(sp->prev != NULL && sp->prev->layout->vert) || |
|
sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)) |
|
fc = horiz ? '+' : '|'; |
|
else if (horiz && sp->opts->lvert) |
|
fc = '-'; |
|
if (fc != '\0') { |
|
(*tp->advance)(tp, tp->tcols->offset); |
|
(*tp->letter)(tp, fc); |
|
tp->viscol = tp->tcol->offset + 1; |
} |
} |
} else if (horiz) |
|
tbl_hrule(tp, sp, 0); |
|
|
|
/* Vertical frame at the end of each row. */ |
/* Print the data cells. */ |
|
|
if (sp->layout->last->vert || |
more = 0; |
(sp->prev != NULL && sp->prev->layout->last->vert) || |
if (horiz) { |
(sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))) |
tbl_hrule(tp, sp, 0); |
term_word(tp, horiz ? "+" : " |"); |
term_flushln(tp); |
else if (sp->opts->rvert) |
} else { |
tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1); |
cp = sp->layout->first; |
term_flushln(tp); |
dp = sp->first; |
|
spans = 0; |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
if (spans == 0) { |
|
tp->tcol++; |
|
if (dp != NULL) { |
|
spans = dp->spans; |
|
dp = dp->next; |
|
} |
|
if (tp->tcol->col < tp->tcol->lastcol) |
|
term_flushln(tp); |
|
if (tp->tcol->col < tp->tcol->lastcol) |
|
more = 1; |
|
if (tp->tcol + 1 == |
|
tp->tcols + tp->lasttcol) |
|
continue; |
|
} else |
|
spans--; |
|
|
|
/* Vertical frames between data cells. */ |
|
|
|
if (cp != NULL) { |
|
vert = cp->vert; |
|
cp = cp->next; |
|
} else |
|
vert = 0; |
|
if (sp->opts->opts & TBL_OPT_ALLBOX) |
|
vert = 1; |
|
if (vert == 0) |
|
continue; |
|
|
|
if (tp->tcol->rmargin + 1 > tp->viscol) { |
|
(*tp->advance)(tp, tp->tcol->rmargin |
|
+ 1 - tp->viscol); |
|
tp->viscol = tp->tcol->rmargin + 1; |
|
} |
|
while (vert--) { |
|
(*tp->letter)(tp, '|'); |
|
tp->viscol++; |
|
} |
|
} |
|
} |
|
|
|
/* Print the vertical frame at the end of each row. */ |
|
|
|
fc = '\0'; |
|
if (sp->layout->last->vert || |
|
(sp->prev != NULL && sp->prev->layout->last->vert) || |
|
(sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))) |
|
fc = horiz ? '+' : '|'; |
|
else if (horiz && sp->opts->rvert) |
|
fc = '-'; |
|
if (fc != '\0') { |
|
if (horiz == 0) { |
|
tp->tcol++; |
|
(*tp->advance)(tp, |
|
tp->tcol->offset > tp->viscol ? |
|
tp->tcol->offset - tp->viscol : 1); |
|
} |
|
(*tp->letter)(tp, fc); |
|
} |
|
(*tp->endline)(tp); |
|
tp->viscol = 0; |
|
} while (more); |
|
|
/* |
/* |
* If we're the last row, clean up after ourselves: clear the |
* If we're the last row, clean up after ourselves: clear the |
* existing table configuration and set it to NULL. |
* existing table configuration and set it to NULL. |
*/ |
*/ |
|
|
|
term_setcol(tp, 1); |
|
tp->flags &= ~TERMP_MULTICOL; |
|
tp->tcol->rmargin = tp->maxrmargin; |
if (sp->next == NULL) { |
if (sp->next == NULL) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
tbl_hrule(tp, sp, 1); |
tbl_hrule(tp, sp, 1); |
Line 200 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 302 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
free(tp->tbl.cols); |
free(tp->tbl.cols); |
tp->tbl.cols = NULL; |
tp->tbl.cols = NULL; |
tp->tcol->offset = offset; |
tp->tcol->offset = offset; |
} |
} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX) |
tp->flags &= ~(TERMP_NONOSPACE | TERMP_BRNEVER); |
tbl_hrule(tp, sp, 1); |
|
|
|
tp->flags &= ~TERMP_NONOSPACE; |
} |
} |
|
|
/* |
/* |
Line 236 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 340 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
vert = c2->vert; |
vert = c2->vert; |
c2 = c2->next; |
c2 = c2->next; |
} |
} |
|
if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) |
|
vert = 1; |
if (vert) |
if (vert) |
tbl_char(tp, cross, vert); |
tbl_char(tp, cross, vert); |
if (vert < 2) |
if (vert < 2) |