From a951e29478bd5be4d2e27779d5dc6cb19032bd9e Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Tue, 31 Dec 2019 22:58:41 +0000
Subject: When all cells in a tbl(1) column are empty, set the column width to
 1n rather than to 0n, in the same way as groff does. This fixes misformatting
 reported by bentley@ in xkeyboard-config(7).

---
 regress/tbl/layout/Makefile           |  4 +--
 regress/tbl/layout/emptycol.in        | 49 +++++++++++++++++++++++++++++++++++
 regress/tbl/layout/emptycol.out_ascii | 46 ++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 regress/tbl/layout/emptycol.in
 create mode 100644 regress/tbl/layout/emptycol.out_ascii

(limited to 'regress/tbl')

diff --git a/regress/tbl/layout/Makefile b/regress/tbl/layout/Makefile
index a56cbc2f..1009d96e 100644
--- a/regress/tbl/layout/Makefile
+++ b/regress/tbl/layout/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/11 15:40:41 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2019/12/31 22:49:17 schwarze Exp $
 
-REGRESS_TARGETS	 = center complex empty emptyline
+REGRESS_TARGETS	 = center complex empty emptycol emptyline
 REGRESS_TARGETS	+= lines lines-nogroff numbers shortlines span
 LINT_TARGETS	 = complex empty
 
diff --git a/regress/tbl/layout/emptycol.in b/regress/tbl/layout/emptycol.in
new file mode 100644
index 00000000..090d9004
--- /dev/null
+++ b/regress/tbl/layout/emptycol.in
@@ -0,0 +1,49 @@
+.\" $OpenBSD: emptycol.in,v 1.1 2019/12/31 22:49:17 schwarze Exp $
+.TH TBL-LAYOUT-EMPTYCOL 1 "December 31, 2019"
+.SH NAME
+tbl-layout-emptycol \- empty columns in tables
+.SH DESCRIPTION
+missing final column:
+.TS
+allbox tab(:);
+L L L
+L L.
+1:2
+a:b
+.TE
+.sp
+empty final column:
+.TS
+allbox tab(:);
+L L L
+L L.
+1:2:
+a:b
+.TE
+.sp
+final column with zero-width content:
+.TS
+allbox tab(:);
+L L L
+L L.
+1:2:\&
+a:b
+.TE
+.sp
+empty middle column:
+.TS
+allbox tab(:);
+L L L
+L.
+1::3
+a
+.TE
+.sp
+span crossing empty middle column:
+.TS
+allbox tab(:);
+L L L
+L S S.
+1::3
+span
+.TE
diff --git a/regress/tbl/layout/emptycol.out_ascii b/regress/tbl/layout/emptycol.out_ascii
new file mode 100644
index 00000000..b1372b7b
--- /dev/null
+++ b/regress/tbl/layout/emptycol.out_ascii
@@ -0,0 +1,46 @@
+TBL-LAYOUT-EMPTYCOL(1)      General Commands Manual     TBL-LAYOUT-EMPTYCOL(1)
+
+
+
+NNAAMMEE
+       tbl-layout-emptycol - empty columns in tables
+
+DDEESSCCRRIIPPTTIIOONN
+       missing final column:
+
+       +--+---+---+
+       |1 | 2 |   |
+       +--+---+---+
+       |a | b |   |
+       +--+---+---+
+       empty final column:
+
+       +--+---+---+
+       |1 | 2 |   |
+       +--+---+---+
+       |a | b |   |
+       +--+---+---+
+       final column with zero-width content:
+
+       +--+---+---+
+       |1 | 2 |   |
+       +--+---+---+
+       |a | b |   |
+       +--+---+---+
+       empty middle column:
+
+       +--+---+---+
+       |1 |   | 3 |
+       +--+---+---+
+       |a |   |   |
+       +--+---+---+
+       span crossing empty middle column:
+
+       +--+---+---+
+       |1 |   | 3 |
+       +--+---+---+
+       |span      |
+       +----------+
+
+
+OpenBSD                        December 31, 2019        TBL-LAYOUT-EMPTYCOL(1)
-- 
cgit