diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2021-09-07 14:56:35 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2021-09-07 14:56:35 +0000 |
| commit | 5947e2465bef7a2766d48ca273c0aaa7b5dce3d2 (patch) | |
| tree | 78640b0a8665ab7dd9e2c9ab1ad58048fc876630 | |
| parent | c7ddabde0c44f6ce88a76cbaa8ede8f350172420 (diff) | |
| download | mandoc-5947e2465bef7a2766d48ca273c0aaa7b5dce3d2.tar.gz | |
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.
| -rw-r--r-- | out.c | 7 | ||||
| -rw-r--r-- | regress/tbl/layout/span.in | 13 | ||||
| -rw-r--r-- | regress/tbl/layout/span.out_ascii | 10 |
3 files changed, 24 insertions, 6 deletions
@@ -1,7 +1,8 @@ /* $Id$ */ /* * 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; } diff --git a/regress/tbl/layout/span.in b/regress/tbl/layout/span.in index 84a71f8a..d02d2361 100644 --- a/regress/tbl/layout/span.in +++ b/regress/tbl/layout/span.in @@ -1,5 +1,5 @@ -.\" $OpenBSD: span.in,v 1.5 2017/07/04 14:53:27 schwarze Exp $ -.TH TBL-LAYOUT-SPAN 1 "June 17, 2017" +.\" $OpenBSD: span.in,v 1.6 2021/09/07 14:50:56 schwarze Exp $ +.TH TBL-LAYOUT-SPAN 1 "September 7, 2021" .SH NAME tbl-layout-span \- alignment of spanned cells .SH DESCRIPTION @@ -50,6 +50,15 @@ s1:s2 a:b:c:d:e .TE .sp +.TS +allbox tab(:); +L S +L N. +x***nnnnn +a:0.01 +b:10.0 +.TE +.sp leaked tab settings: .br a b c d e f diff --git a/regress/tbl/layout/span.out_ascii b/regress/tbl/layout/span.out_ascii index 2372e602..adc57cf2 100644 --- a/regress/tbl/layout/span.out_ascii +++ b/regress/tbl/layout/span.out_ascii @@ -34,7 +34,15 @@ DDEESSCCRRIIPPTTIIOONN +--+---+---+---+---+ |a | b | c | d | e | +--+---+---+---+---+ + + +----------+ + |x***nnnnn | + +--+-------+ + |a | 0.01 | + +--+-------+ + |b | 10.0 | + +--+-------+ leaked tab settings: a b c d e f -OpenBSD June 17, 2017 TBL-LAYOUT-SPAN(1) +OpenBSD September 7, 2021 TBL-LAYOUT-SPAN(1) |