aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/out.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2021-09-07 14:56:35 +0000
committerIngo Schwarze <schwarze@openbsd.org>2021-09-07 14:56:35 +0000
commit75a58ff911d520ea8c88e364a1303f81abb898cf (patch)
treeb613ef77951e9243b100304f5df7e428b120e4fc /out.c
parent91034a4641d1b04af942e64bdde7bf87e1f66a92 (diff)
downloadmandoc-75a58ff911d520ea8c88e364a1303f81abb898cf.tar.gz
mandoc-75a58ff911d520ea8c88e364a1303f81abb898cf.tar.zst
mandoc-75a58ff911d520ea8c88e364a1303f81abb898cf.zip
Correctly calculate required column widths for tables containing
cells that horizontally span columns which contains "n" (number) formatted cells on other rows. This requires updating total column widths from "n" formatted cells before starting width distribution from the spanning cells to their constituent columns.
Diffstat (limited to 'out.c')
-rw-r--r--out.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/out.c b/out.c
index bf7342ec..1aa0c0e3 100644
--- a/out.c
+++ b/out.c
@@ -1,7 +1,8 @@
-/* $Id: out.c,v 1.80 2021/08/10 12:55:03 schwarze Exp $ */
+/* $Id: out.c,v 1.81 2021/09/07 14:56:35 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
+ * Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -354,8 +355,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
col = tbl->cols + icol;
if (col->width > col->nwidth)
col->decimal += (col->width - col->nwidth) / 2;
- else
- col->width = col->nwidth;
if (col->flags & TBL_CELL_EQUAL) {
necol++;
if (ewidth < col->width)
@@ -563,5 +562,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
if (totsz > col->nwidth)
col->nwidth = totsz;
+ if (col->nwidth > col->width)
+ col->width = col->nwidth;
return totsz;
}