From 61b0e532b2dce0a91cf3ea67d346645a61a88cdd Mon Sep 17 00:00:00 2001 From: schwarze Date: Sun, 28 Aug 2022 10:57:52 +0000 Subject: [PATCH] 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. --- usr.bin/mandoc/tbl_term.c | 10 +++------- 1 file 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 * Copyright (c) 2009, 2011 Kristaps Dzonsons @@ -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; -- 2.20.1