From ef4cc03dbb7deeb4329a74e97c09433301435a54 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 8 Apr 2022 16:53:45 +0000 Subject: When calculating the with of spanned columns, which for example matters for centering text spanning multiple tbl(7) columns, correctly account for the spacing between columns instead of wrongly assuming the default spacing of 3n. Patch from Simon Branch . --- tbl_term.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tbl_term.c b/tbl_term.c index eac12558..d83a97b8 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.75 2021/08/10 12:55:04 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.76 2022/04/08 16:53:45 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011-2021 Ingo Schwarze @@ -820,8 +820,11 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp, width = col->width; ic = dp->layout->col; hspans = dp->hspans; - while (hspans--) - width += tp->tbl.cols[++ic].width + 3; + while (hspans--) { + width += tp->tbl.cols[ic].spacing; + ic++; + width += tp->tbl.cols[ic].width; + } padr = width > len ? width - len : 0; padl = 0; -- cgit v1.2.3-56-ge451