summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2021-09-07 14:50:57 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2021-09-07 14:50:57 +0000
commita7fb1673780336c62922928999b8d7cfff8e6c3d (patch)
treea472994907a4ce4312cd1f581e5c04c6f9901bf2 /regress
parent24bbda3384768122e14323f0baa1e358e1de60ca (diff)
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 'regress')
-rw-r--r--regress/usr.bin/mandoc/tbl/layout/span.in13
-rw-r--r--regress/usr.bin/mandoc/tbl/layout/span.out_ascii10
2 files changed, 20 insertions, 3 deletions
diff --git a/regress/usr.bin/mandoc/tbl/layout/span.in b/regress/usr.bin/mandoc/tbl/layout/span.in
index 84a71f8a115..d02d2361714 100644
--- a/regress/usr.bin/mandoc/tbl/layout/span.in
+++ b/regress/usr.bin/mandoc/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/usr.bin/mandoc/tbl/layout/span.out_ascii b/regress/usr.bin/mandoc/tbl/layout/span.out_ascii
index 2372e6028d0..adc57cf2e8a 100644
--- a/regress/usr.bin/mandoc/tbl/layout/span.out_ascii
+++ b/regress/usr.bin/mandoc/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)