diff options
| -rw-r--r-- | regress/tbl/data/block_width.out_ascii | 2 | ||||
| -rw-r--r-- | regress/tbl/layout/center.out_ascii | 2 | ||||
| -rw-r--r-- | regress/tbl/layout/spacing.out_ascii | 2 | ||||
| -rw-r--r-- | regress/tbl/layout/span.out_ascii | 2 | ||||
| -rw-r--r-- | regress/tbl/mod/expand.out_ascii | 2 | ||||
| -rw-r--r-- | regress/tbl/mod/font.out_ascii | 2 | ||||
| -rw-r--r-- | tbl_term.c | 13 |
7 files changed, 7 insertions, 18 deletions
diff --git a/regress/tbl/data/block_width.out_ascii b/regress/tbl/data/block_width.out_ascii index 7058f54e..6600b7c0 100644 --- a/regress/tbl/data/block_width.out_ascii +++ b/regress/tbl/data/block_width.out_ascii @@ -61,6 +61,6 @@ DDEESSCCRRIIPPTTIIOONN | | | | | | | | 90 | +--+---+---+---+---+---+---+-----------+ leaked tab settings: - b c d e f g h + b c d e f g h OpenBSD July 4, 2017 OpenBSD diff --git a/regress/tbl/layout/center.out_ascii b/regress/tbl/layout/center.out_ascii index 3196fff6..80e48d54 100644 --- a/regress/tbl/layout/center.out_ascii +++ b/regress/tbl/layout/center.out_ascii @@ -18,7 +18,7 @@ DDEESSCCRRIIPPTTIIOONN ***** ***** ***** leaked tab settings: - a b c de + a b c de diff --git a/regress/tbl/layout/spacing.out_ascii b/regress/tbl/layout/spacing.out_ascii index 3d51d7d5..5eba1d80 100644 --- a/regress/tbl/layout/spacing.out_ascii +++ b/regress/tbl/layout/spacing.out_ascii @@ -32,7 +32,7 @@ DDEESSCCRRIIPPTTIIOONN |a || b | +---++---+ leaked tab settings: - a b cdef + a b c d e f diff --git a/regress/tbl/layout/span.out_ascii b/regress/tbl/layout/span.out_ascii index bc4badca..83d163f2 100644 --- a/regress/tbl/layout/span.out_ascii +++ b/regress/tbl/layout/span.out_ascii @@ -37,7 +37,7 @@ DDEESSCCRRIIPPTTIIOONN |a | b | c | d | e | +--+---+---+---+---+ leaked tab settings: - a b c d e f + a b c d e f diff --git a/regress/tbl/mod/expand.out_ascii b/regress/tbl/mod/expand.out_ascii index 41bf9869..6feeee25 100644 --- a/regress/tbl/mod/expand.out_ascii +++ b/regress/tbl/mod/expand.out_ascii @@ -97,7 +97,7 @@ DDEESSCCRRIIPPTTIIOONN x x x x x 123456789012345678901234567890123456789012 x leaked tab settings: - a b c d e f g h + a b c d e f g h diff --git a/regress/tbl/mod/font.out_ascii b/regress/tbl/mod/font.out_ascii index 4e431870..3a6ca0d9 100644 --- a/regress/tbl/mod/font.out_ascii +++ b/regress/tbl/mod/font.out_ascii @@ -15,7 +15,7 @@ DDEESSCCRRIIPPTTIIOONN | _a_n_d | so | oonn | +-------+-------+--------+ leaked tab settings: - a b c de + a b c d e @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.73 2020/01/11 16:26:08 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.74 2020/10/25 18:28:23 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2020 Ingo Schwarze <schwarze@openbsd.org> @@ -190,17 +190,6 @@ 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; |