=================================================================== RCS file: /cvs/mandoc/tbl_term.c,v retrieving revision 1.53 retrieving revision 1.60 diff -u -p -r1.53 -r1.60 --- mandoc/tbl_term.c 2017/06/16 20:01:06 1.53 +++ mandoc/tbl_term.c 2018/08/19 23:10:28 1.60 @@ -1,7 +1,7 @@ -/* $Id: tbl_term.c,v 1.53 2017/06/16 20:01:06 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.60 2018/08/19 23:10:28 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons - * Copyright (c) 2011,2012,2014,2015,2017 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 @@ -51,7 +52,10 @@ static void tbl_word(struct termp *, const struct tbl_ static size_t term_tbl_sulen(const struct roffsu *su, void *arg) { - return term_hen((const struct termp *)arg, su); + int i; + + i = term_hen((const struct termp *)arg, su); + return i > 0 ? i : 0; } static size_t @@ -93,15 +97,28 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); + /* Tables leak .ta settings to subsequent text. */ + + 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; + } + /* Center the table as a whole. */ 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 < sp->opts->cols; ic++) - tsz += tp->tbl.cols[ic].width + 3; - tsz -= 3; + 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 ? @@ -148,9 +165,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) } coloff += tp->tbl.cols[ic].width; tp->tcol->rmargin = coloff; - coloff++; if (ic + 1 < sp->opts->cols) - coloff += 2; + coloff += tp->tbl.cols[ic].spacing; if (spans) { spans--; continue; @@ -158,13 +174,14 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) if (dp == NULL) continue; spans = dp->spans; - dp = dp->next; + if (ic || sp->layout->first->pos != TBL_CELL_SPAN) + dp = dp->next; } /* Set up a column for a right vertical frame. */ tp->tcol++; - tp->tcol->offset = coloff; + tp->tcol->offset = coloff + 1; tp->tcol->rmargin = tp->maxrmargin; /* Spans may have reduced the number of columns. */ @@ -192,7 +209,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) if (dp == NULL) continue; spans = dp->spans; - dp = dp->next; + if (cp->pos != TBL_CELL_SPAN) + dp = dp->next; } break; } @@ -292,7 +310,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) } if (dp != NULL) { spans = dp->spans; - dp = dp->next; + if (ic || sp->layout->first->pos + != TBL_CELL_SPAN) + dp = dp->next; } /* @@ -316,13 +336,13 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) tp->tcol + 1 == tp->tcols + tp->lasttcol)) continue; - if (tp->tcol->rmargin > tp->viscol) { + if (tp->viscol < tp->tcol->rmargin) { (*tp->advance)(tp, tp->tcol->rmargin - tp->viscol); tp->viscol = tp->tcol->rmargin; } - - if (tp->tcol->rmargin + 1 > tp->viscol) { + while (tp->viscol < tp->tcol->rmargin + + tp->tbl.cols[ic].spacing / 2) { (*tp->letter)(tp, fc); tp->viscol++; } @@ -342,11 +362,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) break; } } + if (tp->tbl.cols[ic].spacing) { + (*tp->letter)(tp, fc == ' ' ? '|' : + vert ? '+' : fc); + tp->viscol++; + } - (*tp->letter)(tp, - fc == ' ' ? '|' : vert ? '+' : fc); - tp->viscol++; - if (fc != ' ') { if (cp != NULL && cp->pos == TBL_CELL_HORIZ) @@ -357,7 +378,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) else fc = ' '; } - if (vert > 1 || fc != ' ') { + if (tp->tbl.cols[ic].spacing > 2 && + (vert > 1 || fc != ' ')) { (*tp->letter)(tp, fc == ' ' ? '|' : vert > 1 ? '+' : fc); tp->viscol++; @@ -437,14 +459,13 @@ static void tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) { const struct tbl_cell *cp, *cpn, *cpp; + const struct roffcol *col; int vert; - char line, cross; + char cross, line, stdcross, stdline; - line = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; - cross = (kind < 3) ? '+' : '-'; + stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; + stdcross = (kind < 3) ? '+' : '-'; - if (kind) - term_word(tp, "+"); cp = sp->layout->first; cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first; if (cpp == cp) @@ -452,8 +473,19 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp, cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first; if (cpn == cp) cpn = NULL; + if (kind) + term_word(tp, + cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); for (;;) { - tbl_char(tp, line, tp->tbl.cols[cp->col].width + 1); + col = tp->tbl.cols + cp->col; + if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) { + line = stdline; + cross = stdcross; + } else { + line = ' '; + cross = (kind < 3) ? '|' : ' '; + } + tbl_char(tp, line, col->width + col->spacing / 2); vert = cp->vert; if ((cp = cp->next) == NULL) break; @@ -467,15 +499,23 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp, vert = cpn->vert; cpn = cpn->next; } + if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) { + line = stdline; + cross = stdcross; + } else + line = ' '; if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) vert = 1; - if (vert) - tbl_char(tp, cross, vert); - if (vert < 2) - tbl_char(tp, line, 2 - vert); + if (col->spacing) + tbl_char(tp, vert ? cross : line, 1); + if (col->spacing > 2) + tbl_char(tp, vert > 1 ? cross : line, 1); + if (col->spacing > 4) + tbl_char(tp, line, (col->spacing - 3) / 2); } if (kind) { - term_word(tp, "+"); + term_word(tp, + cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); term_flushln(tp); } } @@ -496,14 +536,11 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts break; } - if (dp == NULL) { - tbl_char(tp, ASCII_NBRSP, col->width); + if (dp == NULL) return; - } switch (dp->pos) { case TBL_DATA_NONE: - tbl_char(tp, ASCII_NBRSP, col->width); return; case TBL_DATA_HORIZ: case TBL_DATA_NHORIZ: @@ -528,7 +565,7 @@ 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(); @@ -597,44 +634,66 @@ 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 ((cp = strrchr(dp->string, opts->decimal)) != NULL) { - 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; - if (col->decimal > d && col->width > sz) { - padl = col->decimal - d; - if (padl + sz > col->width) - padl = col->width - sz; - tbl_char(tp, ASCII_NBRSP, padl); - } else - padl = 0; + /* If it is not a number, simply center the string. */ + + } else if (col->width > totsz) + padl = (col->width - totsz) / 2; + + tbl_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_char(tp, ASCII_NBRSP, col->width - padl - totsz); } static void