* mandoc: Revert part of the previous diff to fix a regression (another
@ 2021-09-28 17:07 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2021-09-28 17:07 UTC (permalink / raw)
To: source
Log Message:
-----------
Revert part of the previous diff to fix a regression (another endless loop)
reported by Michael <Stapelberg at Debian> in the Linux md(4) manual.
The reason the colwidth[] array is needed is not that it stores widths
different from those in tbl->cols[].width, but that only part of the
columns participate in the comparisons, i.e. only those intersecting
at least one span the still requires width distribution.
Modified Files:
--------------
mandoc:
out.c
Revision Data
-------------
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -Lout.c -Lout.c -u -p -r1.82 -r1.83
--- out.c
+++ out.c
@@ -123,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struc
const struct tbl_dat *dp;
struct roffcol *col;
struct tbl_colgroup *first_group, **gp, *g;
+ size_t *colwidth;
size_t ewidth, min1, min2, wanted, width, xwidth;
int done, icol, maxcol, necol, nxcol, quirkcol;
@@ -256,16 +257,28 @@ tblcalc(struct rofftbl *tbl, const struc
gp = &(*gp)->next;
}
+ colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
while (first_group != NULL) {
/*
+ * Rebuild the array of the widths of all columns
+ * participating in spans that require expansion.
+ */
+
+ for (icol = 0; icol <= maxcol; icol++)
+ colwidth[icol] = SIZE_MAX;
+ for (g = first_group; g != NULL; g = g->next)
+ for (icol = g->startcol; icol <= g->endcol; icol++)
+ colwidth[icol] = tbl->cols[icol].width;
+
+ /*
* Find the smallest and second smallest column width
* among the columns which may need expamsion.
*/
min1 = min2 = SIZE_MAX;
for (icol = 0; icol <= maxcol; icol++) {
- width = tbl->cols[icol].width;
+ width = colwidth[icol];
if (min1 > width) {
min2 = min1;
min1 = width;
@@ -283,7 +296,7 @@ tblcalc(struct rofftbl *tbl, const struc
for (g = first_group; g != NULL; g = g->next) {
necol = 0;
for (icol = g->startcol; icol <= g->endcol; icol++)
- if (tbl->cols[icol].width == min1)
+ if (colwidth[icol] == min1)
necol++;
if (necol == 0)
continue;
@@ -300,7 +313,7 @@ tblcalc(struct rofftbl *tbl, const struc
while ((g = *gp) != NULL) {
done = 0;
for (icol = g->startcol; icol <= g->endcol; icol++) {
- if (tbl->cols[icol].width != min1)
+ if (colwidth[icol] != min1)
continue;
if (g->wanted <= wanted - min1) {
tbl->cols[icol].width += g->wanted;
@@ -317,6 +330,7 @@ tblcalc(struct rofftbl *tbl, const struc
gp = &(*gp)->next;
}
}
+ free(colwidth);
/*
* Align numbers with text.
--
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-28 17:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 17:07 mandoc: Revert part of the previous diff to fix a regression (another 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).