summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2022-08-28 10:57:53 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2022-08-28 10:57:53 +0000
commit567b967f353b64fd2c139a1a48cd015332fe8255 (patch)
tree561d80db7df6d1241ec8649e06f3e082041b7536
parent6e070f3296c5b08eccab2b6c540fa403866f0b55 (diff)
Stop skipping vertical space after boxed tables.
Skipping such space used to be a bug in GNU tbl(1), and a kludge was added to mandoc to produce identical output. The bug was fixed in groff commit 8818c07c Jul 30 2022 gbranden@ https://savannah.gnu.org/bugs/index.php?49390 Consequently, now is the time to get rid of the kludge.
-rw-r--r--usr.bin/mandoc/tbl_term.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c
index f20aec9adb6..a8f9c24fd4f 100644
--- a/usr.bin/mandoc/tbl_term.c
+++ b/usr.bin/mandoc/tbl_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tbl_term.c,v 1.65 2022/04/26 14:46:30 schwarze Exp $ */
+/* $OpenBSD: tbl_term.c,v 1.66 2022/08/28 10:57:52 schwarze Exp $ */
/*
* Copyright (c) 2011-2022 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -544,15 +544,11 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
tp->flags &= ~TERMP_MULTICOL;
tp->tcol->rmargin = tp->maxrmargin;
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, sp, NULL, TBL_OPT_BOX);
- tp->skipvsp = 1;
- }
if (tp->enc == TERMENC_ASCII &&
- sp->opts->opts & TBL_OPT_DBOX) {
+ sp->opts->opts & TBL_OPT_DBOX)
tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX);
- tp->skipvsp = 2;
- }
assert(tp->tbl.cols);
free(tp->tbl.cols);
tp->tbl.cols = NULL;