diff options
| -rw-r--r-- | regress/tbl/data/Makefile | 11 | ||||
| -rw-r--r-- | regress/tbl/data/escz.in | 14 | ||||
| -rw-r--r-- | regress/tbl/data/escz.out_ascii | 14 | ||||
| -rw-r--r-- | regress/tbl/data/escz_end.in | 14 | ||||
| -rw-r--r-- | regress/tbl/data/escz_end.out_ascii | 14 | ||||
| -rw-r--r-- | tbl_term.c | 3 |
6 files changed, 65 insertions, 5 deletions
diff --git a/regress/tbl/data/Makefile b/regress/tbl/data/Makefile index b1dcfa08..6db686b9 100644 --- a/regress/tbl/data/Makefile +++ b/regress/tbl/data/Makefile @@ -1,13 +1,16 @@ -# $OpenBSD: Makefile,v 1.5 2019/07/18 14:38:47 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2022/04/26 14:46:30 schwarze Exp $ REGRESS_TARGETS = blankline block_empty block_unclosed block_width -REGRESS_TARGETS += block_wrap empty insert +REGRESS_TARGETS += block_wrap empty escz escz_end insert LINT_TARGETS = block_unclosed empty insert -# groff-1.22.3 defect: +# groff-1.23.0 defects: # - When a table ends in the middle of a block, # GNU eqn produces no output whatsoever for the whole table. +# - When a table cell ends with a no-advance escape sequence, +# the next cell is appended to the current cell instead of +# aligning it to the next column. -SKIP_GROFF = block_unclosed +SKIP_GROFF = block_unclosed escz_end .include <bsd.regress.mk> diff --git a/regress/tbl/data/escz.in b/regress/tbl/data/escz.in new file mode 100644 index 00000000..406df48f --- /dev/null +++ b/regress/tbl/data/escz.in @@ -0,0 +1,14 @@ +.\" $OpenBSD: escz.in,v 1.1 2022/04/26 14:46:30 schwarze Exp $ +.TH TBL-DATA-ESCZ 1 "April 26, 2022" +.SH NAME +tbl-data-escz \- non-advancing glyph at the end of a tbl(7) cell +.SH DESCRIPTION +initial text +.TS +tab(:); +LL. +a:b +c\zd:e +.TE +.sp +final text diff --git a/regress/tbl/data/escz.out_ascii b/regress/tbl/data/escz.out_ascii new file mode 100644 index 00000000..486ab3d0 --- /dev/null +++ b/regress/tbl/data/escz.out_ascii @@ -0,0 +1,14 @@ +TBL-DATA-ESCZ(1) General Commands Manual TBL-DATA-ESCZ(1) + +NNAAMMEE + tbl-data-escz - non-advancing glyph at the end of a tbl(7) cell + +DDEESSCCRRIIPPTTIIOONN + initial text + + a b + cd e + + final text + +OpenBSD April 26, 2022 TBL-DATA-ESCZ(1) diff --git a/regress/tbl/data/escz_end.in b/regress/tbl/data/escz_end.in new file mode 100644 index 00000000..5149f5d6 --- /dev/null +++ b/regress/tbl/data/escz_end.in @@ -0,0 +1,14 @@ +.\" $OpenBSD: escz_end.in,v 1.1 2022/04/26 14:46:30 schwarze Exp $ +.TH TBL-DATA-ESCZ_END 1 "April 26, 2022" +.SH NAME +tbl-data-escz_end \- z escape sequence at the end of a tbl(7) cell +.SH DESCRIPTION +initial text +.TS +tab(:); +LLL. +a:b:c +d\z:e:f +.TE +.sp +final text diff --git a/regress/tbl/data/escz_end.out_ascii b/regress/tbl/data/escz_end.out_ascii new file mode 100644 index 00000000..f195c9c2 --- /dev/null +++ b/regress/tbl/data/escz_end.out_ascii @@ -0,0 +1,14 @@ +TBL-DATA-ESCZ_END(1) General Commands Manual TBL-DATA-ESCZ_END(1) + +NNAAMMEE + tbl-data-escz_end - z escape sequence at the end of a tbl(7) cell + +DDEESSCCRRIIPPTTIIOONN + initial text + + a b c + d e f + + final text + +OpenBSD April 26, 2022 TBL-DATA-ESCZ_END(1) @@ -1,6 +1,6 @@ /* $Id$ */ /* - * Copyright (c) 2011-2021 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2011-2022 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * * Permission to use, copy, modify, and distribute this software for any @@ -293,6 +293,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) } tp->tcol++; tp->col = 0; + tp->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); if (dp != NULL && (ic || sp->layout->first->pos != TBL_CELL_SPAN)) { |