* mandoc: Correctly calculate required column widths for tables containing
@ 2021-09-07 14:56 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2021-09-07 14:56 UTC (permalink / raw)
To: source
Log Message:
-----------
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.
Modified Files:
--------------
mandoc:
out.c
mandoc/regress/tbl/layout:
span.in
span.out_ascii
Revision Data
-------------
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -Lout.c -Lout.c -u -p -r1.80 -r1.81
--- out.c
+++ out.c
@@ -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 struc
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, stru
if (totsz > col->nwidth)
col->nwidth = totsz;
+ if (col->nwidth > col->width)
+ col->width = col->nwidth;
return totsz;
}
Index: span.in
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/tbl/layout/span.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lregress/tbl/layout/span.in -Lregress/tbl/layout/span.in -u -p -r1.5 -r1.6
--- regress/tbl/layout/span.in
+++ 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
@@ -48,6 +48,15 @@ R R R R R.
a:b:c:d:e
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:
Index: span.out_ascii
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/tbl/layout/span.out_ascii,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lregress/tbl/layout/span.out_ascii -Lregress/tbl/layout/span.out_ascii -u -p -r1.6 -r1.7
--- regress/tbl/layout/span.out_ascii
+++ regress/tbl/layout/span.out_ascii
@@ -34,7 +34,15 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+--+---+---+---+---+
|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)
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-07 14:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07 14:56 mandoc: Correctly calculate required column widths for tables containing schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).