=================================================================== RCS file: /cvs/mandoc/tbl_term.c,v retrieving revision 1.29 retrieving revision 1.62 diff -u -p -r1.29 -r1.62 --- mandoc/tbl_term.c 2014/10/13 23:31:46 1.29 +++ mandoc/tbl_term.c 2018/11/28 04:47:51 1.62 @@ -1,7 +1,7 @@ -/* $Id: tbl_term.c,v 1.29 2014/10/13 23:31:46 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.62 2018/11/28 04:47:51 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2012, 2014 Ingo Schwarze + * Copyright (c) 2011-2018 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 @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -28,277 +29,672 @@ #include "out.h" #include "term.h" +#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \ + (cp)->pos == TBL_CELL_DHORIZ) + +/* Flags for tbl_hrule(). */ +#define HRULE_DBOX (1 << 0) /* Top and bottom, ASCII mode only. */ +#define HRULE_DATA (1 << 1) /* In the middle of the table. */ +#define HRULE_DOWN (1 << 2) /* Allow downward branches. */ +#define HRULE_UP (1 << 3) /* Allow upward branches. */ +#define HRULE_ENDS (1 << 4) /* Also generate left and right ends. */ + + static size_t term_tbl_len(size_t, void *); static size_t term_tbl_strlen(const char *, void *); -static void tbl_char(struct termp *, char, size_t); +static size_t term_tbl_sulen(const struct roffsu *, void *); static void tbl_data(struct termp *, const struct tbl_opts *, + const struct tbl_cell *, const struct tbl_dat *, const struct roffcol *); -static size_t tbl_rulewidth(struct termp *, const struct tbl_head *); -static void tbl_hframe(struct termp *, const struct tbl_span *, int); +static void tbl_direct_border(struct termp *, int, size_t); +static void tbl_fill_border(struct termp *, int, size_t); +static void tbl_fill_char(struct termp *, char, size_t); +static void tbl_fill_string(struct termp *, const char *, size_t); +static void tbl_hrule(struct termp *, const struct tbl_span *, int); static void tbl_literal(struct termp *, const struct tbl_dat *, const struct roffcol *); static void tbl_number(struct termp *, const struct tbl_opts *, const struct tbl_dat *, const struct roffcol *); -static void tbl_hrule(struct termp *, const struct tbl_span *); -static void tbl_vrule(struct termp *, const struct tbl_head *); static void tbl_word(struct termp *, const struct tbl_dat *); +/* + * The following border-character tables are indexed + * by ternary (3-based) numbers, as opposed to binary or decimal. + * Each ternary digit describes the line width in one direction: + * 0 means no line, 1 single or light line, 2 double or heavy line. + */ + +/* Positional values of the four directions. */ +#define BRIGHT 1 +#define BDOWN 3 +#define BLEFT (3 * 3) +#define BUP (3 * 3 * 3) +#define BHORIZ (BLEFT + BRIGHT) + +/* Code points to use for each combination of widths. */ +static const int borders_utf8[81] = { + 0x0020, 0x2576, 0x257a, /* 000 right */ + 0x2577, 0x250c, 0x250d, /* 001 down */ + 0x257b, 0x250e, 0x250f, /* 002 */ + 0x2574, 0x2500, 0x257c, /* 010 left */ + 0x2510, 0x252c, 0x252e, /* 011 left down */ + 0x2512, 0x2530, 0x2532, /* 012 */ + 0x2578, 0x257e, 0x2501, /* 020 left */ + 0x2511, 0x252d, 0x252f, /* 021 left down */ + 0x2513, 0x2531, 0x2533, /* 022 */ + 0x2575, 0x2514, 0x2515, /* 100 up */ + 0x2502, 0x251c, 0x251d, /* 101 up down */ + 0x257d, 0x251f, 0x2522, /* 102 */ + 0x2518, 0x2534, 0x2536, /* 110 up left */ + 0x2524, 0x253c, 0x253e, /* 111 all */ + 0x2527, 0x2541, 0x2546, /* 112 */ + 0x2519, 0x2535, 0x2537, /* 120 up left */ + 0x2525, 0x253d, 0x253f, /* 121 all */ + 0x252a, 0x2545, 0x2548, /* 122 */ + 0x2579, 0x2516, 0x2517, /* 200 up */ + 0x257f, 0x251e, 0x2521, /* 201 up down */ + 0x2503, 0x2520, 0x2523, /* 202 */ + 0x251a, 0x2538, 0x253a, /* 210 up left */ + 0x2526, 0x2540, 0x2544, /* 211 all */ + 0x2528, 0x2542, 0x254a, /* 212 */ + 0x251b, 0x2539, 0x253b, /* 220 up left */ + 0x2529, 0x2543, 0x2547, /* 221 all */ + 0x252b, 0x2549, 0x254b, /* 222 */ +}; + +/* ASCII approximations for these code points, compatible with groff. */ +static const int borders_ascii[81] = { + ' ', '-', '=', /* 000 right */ + '|', '+', '+', /* 001 down */ + '|', '+', '+', /* 002 */ + '-', '-', '=', /* 010 left */ + '+', '+', '+', /* 011 left down */ + '+', '+', '+', /* 012 */ + '=', '=', '=', /* 020 left */ + '+', '+', '+', /* 021 left down */ + '+', '+', '+', /* 022 */ + '|', '+', '+', /* 100 up */ + '|', '+', '+', /* 101 up down */ + '|', '+', '+', /* 102 */ + '+', '+', '+', /* 110 up left */ + '+', '+', '+', /* 111 all */ + '+', '+', '+', /* 112 */ + '+', '+', '+', /* 120 up left */ + '+', '+', '+', /* 121 all */ + '+', '+', '+', /* 122 */ + '|', '+', '+', /* 200 up */ + '|', '+', '+', /* 201 up down */ + '|', '+', '+', /* 202 */ + '+', '+', '+', /* 210 up left */ + '+', '+', '+', /* 211 all */ + '+', '+', '+', /* 212 */ + '+', '+', '+', /* 220 up left */ + '+', '+', '+', /* 221 all */ + '+', '+', '+', /* 222 */ +}; + +/* Either of the above according to the selected output encoding. */ +static const int *borders_locale; + + static size_t -term_tbl_strlen(const char *p, void *arg) +term_tbl_sulen(const struct roffsu *su, void *arg) { + int i; - return(term_strlen((const struct termp *)arg, p)); + i = term_hen((const struct termp *)arg, su); + return i > 0 ? i : 0; } static size_t -term_tbl_len(size_t sz, void *arg) +term_tbl_strlen(const char *p, void *arg) { + return term_strlen((const struct termp *)arg, p); +} - return(term_len((const struct termp *)arg, sz)); +static size_t +term_tbl_len(size_t sz, void *arg) +{ + return term_len((const struct termp *)arg, sz); } + void term_tbl(struct termp *tp, const struct tbl_span *sp) { - const struct tbl_head *hp; + const struct tbl_cell *cp, *cpn, *cpp, *cps; const struct tbl_dat *dp; - struct roffcol *col; - int spans; - size_t rmargin, maxrmargin; + static size_t offset; + size_t coloff, tsz; + int hspans, ic, more; + int dvert, fc, horiz, line, uvert; - rmargin = tp->rmargin; - maxrmargin = tp->maxrmargin; - - tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN; - /* Inhibit printing of spaces: we do padding ourselves. */ - tp->flags |= TERMP_NONOSPACE; - tp->flags |= TERMP_NOSPACE; + tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE; /* * The first time we're invoked for a given table block, * calculate the table widths and decimal positions. */ - if (TBL_SPAN_FIRST & sp->flags) { - term_flushln(tp); + if (tp->tbl.cols == NULL) { + borders_locale = tp->enc == TERMENC_UTF8 ? + borders_utf8 : borders_ascii; tp->tbl.len = term_tbl_len; tp->tbl.slen = term_tbl_strlen; + tp->tbl.sulen = term_tbl_sulen; tp->tbl.arg = tp; - tblcalc(&tp->tbl, sp); - } + tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); - /* Horizontal frame at the start of boxed tables. */ + /* Tables leak .ta settings to subsequent text. */ - if (TBL_SPAN_FIRST & sp->flags) { - if (TBL_OPT_DBOX & sp->opts->opts) - tbl_hframe(tp, sp, 1); - if (TBL_OPT_DBOX & sp->opts->opts || - TBL_OPT_BOX & sp->opts->opts) - tbl_hframe(tp, sp, 0); - } + term_tab_set(tp, NULL); + coloff = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || + sp->opts->lvert; + for (ic = 0; ic < sp->opts->cols; ic++) { + coloff += tp->tbl.cols[ic].width; + term_tab_iset(coloff); + coloff += tp->tbl.cols[ic].spacing; + } - /* Vertical frame at the start of each row. */ + /* Center the table as a whole. */ - if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts || - sp->head->vert) - term_word(tp, TBL_SPAN_HORIZ == sp->pos || - TBL_SPAN_DHORIZ == sp->pos ? "+" : "|"); + offset = tp->tcol->offset; + if (sp->opts->opts & TBL_OPT_CENTRE) { + tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) + ? 2 : !!sp->opts->lvert + !!sp->opts->rvert; + for (ic = 0; ic + 1 < sp->opts->cols; ic++) + tsz += tp->tbl.cols[ic].width + + tp->tbl.cols[ic].spacing; + if (sp->opts->cols) + tsz += tp->tbl.cols[sp->opts->cols - 1].width; + if (offset + tsz > tp->tcol->rmargin) + tsz -= 1; + tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? + (offset + tp->tcol->rmargin - tsz) / 2 : 0; + } - /* - * Now print the actual data itself depending on the span type. - * Spanner spans get a horizontal rule; data spanners have their - * data printed by matching data to header. - */ + /* Horizontal frame at the start of boxed tables. */ + if (tp->enc == TERMENC_ASCII && + sp->opts->opts & TBL_OPT_DBOX) + tbl_hrule(tp, sp, HRULE_DBOX | HRULE_ENDS); + if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) + tbl_hrule(tp, sp, HRULE_DOWN | HRULE_ENDS); + } + + /* Set up the columns. */ + + tp->flags |= TERMP_MULTICOL; + horiz = 0; switch (sp->pos) { case TBL_SPAN_HORIZ: - /* FALLTHROUGH */ case TBL_SPAN_DHORIZ: - tbl_hrule(tp, sp); + horiz = 1; + term_setcol(tp, 1); break; case TBL_SPAN_DATA: - /* Iterate over template headers. */ - dp = sp->first; - spans = 0; - for (hp = sp->head; hp; hp = hp->next) { + term_setcol(tp, sp->opts->cols + 2); + coloff = tp->tcol->offset; - /* - * If the current data header is invoked during - * a spanner ("spans" > 0), don't emit anything - * at all. - */ + /* Set up a column for a left vertical frame. */ - if (--spans >= 0) + if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || + sp->opts->lvert) + coloff++; + tp->tcol->rmargin = coloff; + + /* Set up the data columns. */ + + dp = sp->first; + hspans = 0; + for (ic = 0; ic < sp->opts->cols; ic++) { + if (hspans == 0) { + tp->tcol++; + tp->tcol->offset = coloff; + } + coloff += tp->tbl.cols[ic].width; + tp->tcol->rmargin = coloff; + if (ic + 1 < sp->opts->cols) + coloff += tp->tbl.cols[ic].spacing; + if (hspans) { + hspans--; continue; + } + if (dp == NULL) + continue; + hspans = dp->hspans; + if (ic || sp->layout->first->pos != TBL_CELL_SPAN) + dp = dp->next; + } - /* Separate columns. */ + /* Set up a column for a right vertical frame. */ - if (NULL != hp->prev) - tbl_vrule(tp, hp); + tp->tcol++; + tp->tcol->offset = coloff + 1; + tp->tcol->rmargin = tp->maxrmargin; - col = &tp->tbl.cols[hp->ident]; - tbl_data(tp, sp->opts, dp, col); + /* Spans may have reduced the number of columns. */ - /* - * Go to the next data cell and assign the - * number of subsequent spans, if applicable. - */ + tp->lasttcol = tp->tcol - tp->tcols; - if (dp) { - spans = dp->spans; - dp = dp->next; + /* Fill the buffers for all data columns. */ + + tp->tcol = tp->tcols; + cp = cpn = sp->layout->first; + dp = sp->first; + hspans = 0; + for (ic = 0; ic < sp->opts->cols; ic++) { + if (cpn != NULL) { + cp = cpn; + cpn = cpn->next; } + if (hspans) { + hspans--; + continue; + } + tp->tcol++; + tp->col = 0; + tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); + if (dp == NULL) + continue; + hspans = dp->hspans; + if (cp->pos != TBL_CELL_SPAN) + dp = dp->next; } break; } - /* Vertical frame at the end of each row. */ + do { + /* Print the vertical frame at the start of each row. */ - if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts || - sp->layout->vert) - term_word(tp, TBL_SPAN_HORIZ == sp->pos || - TBL_SPAN_DHORIZ == sp->pos ? "+" : " |"); - term_flushln(tp); + tp->tcol = tp->tcols; + uvert = dvert = sp->opts->opts & TBL_OPT_DBOX ? 2 : + sp->opts->opts & TBL_OPT_BOX ? 1 : 0; + if (sp->pos == TBL_SPAN_DATA && uvert < sp->layout->vert) + uvert = dvert = sp->layout->vert; + if (sp->next != NULL && sp->next->pos == TBL_SPAN_DATA && + dvert < sp->next->layout->vert) + dvert = sp->next->layout->vert; + if (sp->prev != NULL && uvert < sp->prev->layout->vert && + (horiz || (IS_HORIZ(sp->layout->first) && + !IS_HORIZ(sp->prev->layout->first)))) + uvert = sp->prev->layout->vert; + line = sp->pos == TBL_SPAN_DHORIZ || + sp->layout->first->pos == TBL_CELL_DHORIZ ? 2 : + sp->pos == TBL_SPAN_HORIZ || + sp->layout->first->pos == TBL_CELL_HORIZ ? 1 : 0; + fc = BUP * uvert + BDOWN * dvert + BRIGHT * line; + if (uvert > 0 || dvert > 0 || (horiz && sp->opts->lvert)) { + (*tp->advance)(tp, tp->tcols->offset); + tp->viscol = tp->tcol->offset; + tbl_direct_border(tp, fc, 1); + } + /* Print the data cells. */ + + more = 0; + if (horiz) + tbl_hrule(tp, sp, HRULE_DATA | HRULE_DOWN | HRULE_UP); + else { + cp = sp->layout->first; + cpn = sp->next == NULL ? NULL : + sp->next->layout->first; + cpp = sp->prev == NULL ? NULL : + sp->prev->layout->first; + dp = sp->first; + hspans = 0; + for (ic = 0; ic < sp->opts->cols; ic++) { + + /* + * Figure out whether to print a + * vertical line after this cell + * and advance to next layout cell. + */ + + uvert = dvert = fc = 0; + if (cp != NULL) { + cps = cp; + while (cps->next != NULL && + cps->next->pos == TBL_CELL_SPAN) + cps = cps->next; + if (sp->pos == TBL_SPAN_DATA) + uvert = dvert = cps->vert; + switch (cp->pos) { + case TBL_CELL_HORIZ: + fc = BHORIZ; + break; + case TBL_CELL_DHORIZ: + fc = BHORIZ * 2; + break; + default: + break; + } + } + if (cpp != NULL) { + if (uvert < cpp->vert && + cp != NULL && + ((IS_HORIZ(cp) && + !IS_HORIZ(cpp)) || + (cp->next != NULL && + cpp->next != NULL && + IS_HORIZ(cp->next) && + !IS_HORIZ(cpp->next)))) + uvert = cpp->vert; + cpp = cpp->next; + } + if (sp->opts->opts & TBL_OPT_ALLBOX) { + if (uvert == 0) + uvert = 1; + if (dvert == 0) + dvert = 1; + } + if (cpn != NULL) { + if (dvert == 0 || + (dvert < cpn->vert && + tp->enc == TERMENC_UTF8)) + dvert = cpn->vert; + cpn = cpn->next; + } + + /* + * Skip later cells in a span, + * figure out whether to start a span, + * and advance to next data cell. + */ + + if (hspans) { + hspans--; + cp = cp->next; + continue; + } + if (dp != NULL) { + hspans = dp->hspans; + if (ic || sp->layout->first->pos + != TBL_CELL_SPAN) + dp = dp->next; + } + + /* + * Print one line of text in the cell + * and remember whether there is more. + */ + + tp->tcol++; + if (tp->tcol->col < tp->tcol->lastcol) + term_flushln(tp); + if (tp->tcol->col < tp->tcol->lastcol) + more = 1; + + /* + * Vertical frames between data cells, + * but not after the last column. + */ + + if (fc == 0 && ((uvert == 0 && dvert == 0 && + (cp->next == NULL || + !IS_HORIZ(cp->next))) || + tp->tcol + 1 == tp->tcols + tp->lasttcol)) { + cp = cp->next; + continue; + } + + if (tp->viscol < tp->tcol->rmargin) { + (*tp->advance)(tp, tp->tcol->rmargin + - tp->viscol); + tp->viscol = tp->tcol->rmargin; + } + while (tp->viscol < tp->tcol->rmargin + + tp->tbl.cols[ic].spacing / 2) + tbl_direct_border(tp, fc, 1); + + if (tp->tcol + 1 == tp->tcols + tp->lasttcol) + continue; + + if (cp != NULL) { + switch (cp->pos) { + case TBL_CELL_HORIZ: + fc = BLEFT; + break; + case TBL_CELL_DHORIZ: + fc = BLEFT * 2; + break; + default: + fc = 0; + break; + } + cp = cp->next; + } + if (cp != NULL) { + switch (cp->pos) { + case TBL_CELL_HORIZ: + fc += BRIGHT; + break; + case TBL_CELL_DHORIZ: + fc += BRIGHT * 2; + break; + default: + break; + } + } + if (tp->tbl.cols[ic].spacing) + tbl_direct_border(tp, fc + + BUP * uvert + BDOWN * dvert, 1); + + if (tp->enc == TERMENC_UTF8) + uvert = dvert = 0; + + if (fc != 0) { + if (cp != NULL && + cp->pos == TBL_CELL_HORIZ) + fc = BHORIZ; + else if (cp != NULL && + cp->pos == TBL_CELL_DHORIZ) + fc = BHORIZ * 2; + else + fc = 0; + } + if (tp->tbl.cols[ic].spacing > 2 && + (uvert > 1 || dvert > 1 || fc != 0)) + tbl_direct_border(tp, fc + + BUP * (uvert > 1) + + BDOWN * (dvert > 1), 1); + } + } + + /* Print the vertical frame at the end of each row. */ + + uvert = dvert = sp->opts->opts & TBL_OPT_DBOX ? 2 : + sp->opts->opts & TBL_OPT_BOX ? 1 : 0; + if (sp->pos == TBL_SPAN_DATA && + uvert < sp->layout->last->vert && + sp->layout->last->col + 1 == sp->opts->cols) + uvert = dvert = sp->layout->last->vert; + if (sp->next != NULL && + dvert < sp->next->layout->last->vert && + sp->next->layout->last->col + 1 == sp->opts->cols) + dvert = sp->next->layout->last->vert; + if (sp->prev != NULL && + uvert < sp->prev->layout->last->vert && + sp->prev->layout->last->col + 1 == sp->opts->cols && + (horiz || (IS_HORIZ(sp->layout->last) && + !IS_HORIZ(sp->prev->layout->last)))) + uvert = sp->prev->layout->last->vert; + line = sp->pos == TBL_SPAN_DHORIZ || + (sp->layout->last->pos == TBL_CELL_DHORIZ && + sp->layout->last->col + 1 == sp->opts->cols) ? 2 : + sp->pos == TBL_SPAN_HORIZ || + (sp->layout->last->pos == TBL_CELL_HORIZ && + sp->layout->last->col + 1 == sp->opts->cols) ? 1 : 0; + fc = BUP * uvert + BDOWN * dvert + BLEFT * line; + if (uvert > 0 || dvert > 0 || (horiz && sp->opts->rvert)) { + if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 || + sp->layout->last->col + 1 < sp->opts->cols)) { + tp->tcol++; + (*tp->advance)(tp, + tp->tcol->offset > tp->viscol ? + tp->tcol->offset - tp->viscol : 1); + } + tbl_direct_border(tp, fc, 1); + } + (*tp->endline)(tp); + tp->viscol = 0; + } while (more); + /* - * If we're the last row, clean up after ourselves: clear the - * existing table configuration and set it to NULL. + * Clean up after this row. If it is the last line + * of the table, print the box line and clean up + * column data; otherwise, print the allbox line. */ - if (TBL_SPAN_LAST & sp->flags) { - if (TBL_OPT_DBOX & sp->opts->opts || - TBL_OPT_BOX & sp->opts->opts) { - tbl_hframe(tp, sp, 0); + term_setcol(tp, 1); + tp->flags &= ~TERMP_MULTICOL; + tp->tcol->rmargin = tp->maxrmargin; + if (sp->next == NULL) { + if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { + tbl_hrule(tp, sp, HRULE_UP | HRULE_ENDS); tp->skipvsp = 1; } - if (TBL_OPT_DBOX & sp->opts->opts) { - tbl_hframe(tp, sp, 1); + if (tp->enc == TERMENC_ASCII && + sp->opts->opts & TBL_OPT_DBOX) { + tbl_hrule(tp, sp, HRULE_DBOX | HRULE_ENDS); tp->skipvsp = 2; } assert(tp->tbl.cols); free(tp->tbl.cols); tp->tbl.cols = NULL; - } + tp->tcol->offset = offset; + } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX && + (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA || + sp->next->next != NULL)) + tbl_hrule(tp, sp, + HRULE_DATA | HRULE_DOWN | HRULE_UP | HRULE_ENDS); tp->flags &= ~TERMP_NONOSPACE; - tp->rmargin = rmargin; - tp->maxrmargin = maxrmargin; - } -/* - * Horizontal rules extend across the entire table. - * Calculate the width by iterating over columns. - */ -static size_t -tbl_rulewidth(struct termp *tp, const struct tbl_head *hp) -{ - size_t width; - - width = tp->tbl.cols[hp->ident].width; - - /* Account for leading blanks. */ - if (hp->prev) - width += 2 - hp->vert; - - /* Account for trailing blank. */ - width++; - - return(width); -} - -/* - * Rules inside the table can be single or double - * and have crossings with vertical rules marked with pluses. - */ static void -tbl_hrule(struct termp *tp, const struct tbl_span *sp) +tbl_hrule(struct termp *tp, const struct tbl_span *sp, int flags) { - const struct tbl_head *hp; - char c; + const struct tbl_cell *cp, *cpn, *cpp; + const struct roffcol *col; + int cross, dvert, line, linewidth, uvert; - c = '-'; - if (TBL_SPAN_DHORIZ == sp->pos) - c = '='; - - for (hp = sp->head; hp; hp = hp->next) { - if (hp->prev && hp->vert) - tbl_char(tp, '+', hp->vert); - tbl_char(tp, c, tbl_rulewidth(tp, hp)); + cp = sp->layout->first; + cpn = cpp = NULL; + if (flags & HRULE_DATA) { + linewidth = sp->pos == TBL_SPAN_DHORIZ ? 2 : 1; + cpn = sp->next == NULL ? NULL : sp->next->layout->first; + if (cpn == cp) + cpn = NULL; + } else + linewidth = tp->enc == TERMENC_UTF8 && + sp->opts->opts & TBL_OPT_DBOX ? 2 : 1; + if (tp->viscol == 0) { + (*tp->advance)(tp, tp->tcols->offset); + tp->viscol = tp->tcols->offset; } -} - -/* - * Rules above and below the table are always single - * and have an additional plus at the beginning and end. - * For double frames, this function is called twice, - * and the outer one does not have crossings. - */ -static void -tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer) -{ - const struct tbl_head *hp; - - term_word(tp, "+"); - for (hp = sp->head; hp; hp = hp->next) { - if (hp->prev && hp->vert) - tbl_char(tp, (outer ? '-' : '+'), hp->vert); - tbl_char(tp, '-', tbl_rulewidth(tp, hp)); + if (flags & HRULE_ENDS) + tbl_direct_border(tp, linewidth * (BRIGHT + + (flags & (HRULE_UP | HRULE_DBOX) ? BUP : 0) + + (flags & (HRULE_DOWN | HRULE_DBOX) ? BDOWN : 0)), 1); + else { + cpp = sp->prev == NULL ? NULL : sp->prev->layout->first; + if (cpp == cp) + cpp = NULL; } - term_word(tp, "+"); - term_flushln(tp); + for (;;) { + col = tp->tbl.cols + cp->col; + line = cpn == NULL || cpn->pos != TBL_CELL_DOWN ? + BHORIZ * linewidth : 0; + tbl_direct_border(tp, line, col->width + col->spacing / 2); + uvert = dvert = 0; + if (flags & HRULE_UP && + (tp->enc == TERMENC_ASCII || sp->pos == TBL_SPAN_DATA || + (sp->prev != NULL && sp->prev->layout == sp->layout))) + uvert = cp->vert; + if (flags & HRULE_DOWN) + dvert = cp->vert; + if ((cp = cp->next) == NULL) + break; + if (cpp != NULL) { + if (uvert < cpp->vert) + uvert = cpp->vert; + cpp = cpp->next; + } + if (cpn != NULL) { + if (dvert < cpn->vert) + dvert = cpn->vert; + cpn = cpn->next; + } + if (sp->opts->opts & TBL_OPT_ALLBOX) { + if (flags & HRULE_UP && uvert == 0) + uvert = 1; + if (flags & HRULE_DOWN && dvert == 0) + dvert = 1; + } + cross = BHORIZ * linewidth + BUP * uvert + BDOWN * dvert; + if (col->spacing) + tbl_direct_border(tp, cross, 1); + if (col->spacing > 2) + tbl_direct_border(tp, tp->enc == TERMENC_ASCII && + (uvert > 1 || dvert > 1) ? cross : line, 1); + if (col->spacing > 4) + tbl_direct_border(tp, line, (col->spacing - 3) / 2); + } + if (flags & HRULE_ENDS) { + tbl_direct_border(tp, linewidth * (BLEFT + + (flags & (HRULE_UP | HRULE_DBOX) ? BUP : 0) + + (flags & (HRULE_DOWN | HRULE_DBOX) ? BDOWN : 0)), 1); + (*tp->endline)(tp); + tp->viscol = 0; + } } static void tbl_data(struct termp *tp, const struct tbl_opts *opts, - const struct tbl_dat *dp, - const struct roffcol *col) + const struct tbl_cell *cp, const struct tbl_dat *dp, + const struct roffcol *col) { - - if (NULL == dp) { - tbl_char(tp, ASCII_NBRSP, col->width); + switch (cp->pos) { + case TBL_CELL_HORIZ: + tbl_fill_border(tp, BHORIZ, col->width); return; + case TBL_CELL_DHORIZ: + tbl_fill_border(tp, BHORIZ * 2, col->width); + return; + default: + break; } - assert(dp->layout); + if (dp == NULL) + return; + switch (dp->pos) { case TBL_DATA_NONE: - tbl_char(tp, ASCII_NBRSP, col->width); return; case TBL_DATA_HORIZ: - /* FALLTHROUGH */ case TBL_DATA_NHORIZ: - tbl_char(tp, '-', col->width); + tbl_fill_border(tp, BHORIZ, col->width); return; case TBL_DATA_NDHORIZ: - /* FALLTHROUGH */ case TBL_DATA_DHORIZ: - tbl_char(tp, '=', col->width); + tbl_fill_border(tp, BHORIZ * 2, col->width); return; default: break; } - switch (dp->layout->pos) { - case TBL_CELL_HORIZ: - tbl_char(tp, '-', col->width); - break; - case TBL_CELL_DHORIZ: - tbl_char(tp, '=', col->width); - break; + switch (cp->pos) { case TBL_CELL_LONG: - /* FALLTHROUGH */ case TBL_CELL_CENTRE: - /* FALLTHROUGH */ case TBL_CELL_LEFT: - /* FALLTHROUGH */ case TBL_CELL_RIGHT: tbl_literal(tp, dp, col); break; @@ -306,55 +702,72 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts tbl_number(tp, opts, dp, col); break; case TBL_CELL_DOWN: - tbl_char(tp, ASCII_NBRSP, col->width); + case TBL_CELL_SPAN: break; default: abort(); - /* NOTREACHED */ } } static void -tbl_vrule(struct termp *tp, const struct tbl_head *hp) +tbl_fill_string(struct termp *tp, const char *cp, size_t len) { + size_t i, sz; - tbl_char(tp, ASCII_NBRSP, 1); - if (0 < hp->vert) - tbl_char(tp, '|', hp->vert); - if (2 > hp->vert) - tbl_char(tp, ASCII_NBRSP, 2 - hp->vert); + sz = term_strlen(tp, cp); + for (i = 0; i < len; i += sz) + term_word(tp, cp); } static void -tbl_char(struct termp *tp, char c, size_t len) +tbl_fill_char(struct termp *tp, char c, size_t len) { - size_t i, sz; - char cp[2]; + char cp[2]; cp[0] = c; cp[1] = '\0'; + tbl_fill_string(tp, cp, len); +} - sz = term_strlen(tp, cp); +static void +tbl_fill_border(struct termp *tp, int c, size_t len) +{ + char buf[12]; - for (i = 0; i < len; i += sz) - term_word(tp, cp); + if ((c = borders_locale[c]) > 127) { + (void)snprintf(buf, sizeof(buf), "\\[u%04x]", c); + tbl_fill_string(tp, buf, len); + } else + tbl_fill_char(tp, c, len); } static void +tbl_direct_border(struct termp *tp, int c, size_t len) +{ + size_t i, sz; + + c = borders_locale[c]; + sz = (*tp->width)(tp, c); + for (i = 0; i < len; i += sz) { + (*tp->letter)(tp, c); + tp->viscol += sz; + } +} + +static void tbl_literal(struct termp *tp, const struct tbl_dat *dp, const struct roffcol *col) { - struct tbl_head *hp; - size_t width, len, padl, padr; - int spans; + size_t len, padl, padr, width; + int ic, hspans; assert(dp->string); len = term_strlen(tp, dp->string); - - hp = dp->layout->head->next; width = col->width; - for (spans = dp->spans; spans--; hp = hp->next) - width += tp->tbl.cols[hp->ident].width + 3; + ic = dp->layout->col; + hspans = dp->hspans; + while (hspans--) + width += tp->tbl.cols[++ic].width + 3; padr = width > len ? width - len : 0; padl = 0; @@ -378,9 +791,9 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp break; } - tbl_char(tp, ASCII_NBRSP, padl); + tbl_fill_char(tp, ASCII_NBRSP, padl); tbl_word(tp, dp); - tbl_char(tp, ASCII_NBRSP, padr); + tbl_fill_char(tp, ASCII_NBRSP, padr); } static void @@ -388,49 +801,74 @@ tbl_number(struct termp *tp, const struct tbl_opts *op const struct tbl_dat *dp, const struct roffcol *col) { - char *cp; + const char *cp, *lastdigit, *lastpoint; + size_t intsz, padl, totsz; char buf[2]; - size_t sz, psz, ssz, d, padl; - int i; /* - * See calc_data_number(). Left-pad by taking the offset of our - * and the maximum decimal; right-pad by the remaining amount. + * Almost the same code as in tblcalc_number(): + * First find the position of the decimal point. */ assert(dp->string); + lastdigit = lastpoint = NULL; + for (cp = dp->string; cp[0] != '\0'; cp++) { + if (cp[0] == '\\' && cp[1] == '&') { + lastdigit = lastpoint = cp; + break; + } else if (cp[0] == opts->decimal && + (isdigit((unsigned char)cp[1]) || + (cp > dp->string && isdigit((unsigned char)cp[-1])))) + lastpoint = cp; + else if (isdigit((unsigned char)cp[0])) + lastdigit = cp; + } - sz = term_strlen(tp, dp->string); + /* Then measure both widths. */ - buf[0] = opts->decimal; - buf[1] = '\0'; + padl = 0; + totsz = term_strlen(tp, dp->string); + if (lastdigit != NULL) { + if (lastpoint == NULL) + lastpoint = lastdigit + 1; + intsz = 0; + buf[1] = '\0'; + for (cp = dp->string; cp < lastpoint; cp++) { + buf[0] = cp[0]; + intsz += term_strlen(tp, buf); + } - psz = term_strlen(tp, buf); + /* + * Pad left to match the decimal position, + * but avoid exceeding the total column width. + */ - if (NULL != (cp = strrchr(dp->string, opts->decimal))) { - buf[1] = '\0'; - for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { - buf[0] = dp->string[i]; - ssz += term_strlen(tp, buf); + if (col->decimal > intsz && col->width > totsz) { + padl = col->decimal - intsz; + if (padl + totsz > col->width) + padl = col->width - totsz; } - d = ssz + psz; - } else - d = sz + psz; - padl = col->decimal - d; + /* If it is not a number, simply center the string. */ - tbl_char(tp, ASCII_NBRSP, padl); + } else if (col->width > totsz) + padl = (col->width - totsz) / 2; + + tbl_fill_char(tp, ASCII_NBRSP, padl); tbl_word(tp, dp); - if (col->width > sz + padl) - tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); + + /* Pad right to fill the column. */ + + if (col->width > padl + totsz) + tbl_fill_char(tp, ASCII_NBRSP, col->width - padl - totsz); } static void tbl_word(struct termp *tp, const struct tbl_dat *dp) { - const void *prev_font; + int prev_font; - prev_font = term_fontq(tp); + prev_font = tp->fonti; if (dp->layout->flags & TBL_CELL_BOLD) term_fontpush(tp, TERMFONT_BOLD); else if (dp->layout->flags & TBL_CELL_ITALIC)