Simplify the code building lists of spans, no output change intended.

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 1aa0c0e366320d4068639a2d6ec11e674685230e..9e0d704a1a39aab68170704a86a28dd26872f821 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.81 2021/09/07 14:56:35 schwarze Exp $ */
+/*     $Id: out.c,v 1.84 2021/10/17 20:48:28 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
@@ -149,7 +149,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                 * to data cells in the data section.
                 */
 
-               gp = &first_group;
                for (dp = sp->first; dp != NULL; dp = dp->next) {
                        icol = dp->layout->col;
                        while (maxcol < icol + dp->hspans)
@@ -190,16 +189,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                                continue;
 
                        /*
-                        * Build an ordered, singly linked list
+                        * Build a singly linked list
                         * of all groups of columns joined by spans,
                         * recording the minimum width for each group.
                         */
 
-                       while (*gp != NULL && ((*gp)->startcol < icol ||
-                           (*gp)->endcol < icol + dp->hspans))
+                       gp = &first_group;
+                       while (*gp != NULL && ((*gp)->startcol != icol ||
+                           (*gp)->endcol != icol + dp->hspans))
                                gp = &(*gp)->next;
-                       if (*gp == NULL || (*gp)->startcol > icol ||
-                            (*gp)->endcol > icol + dp->hspans) {
+                       if (*gp == NULL) {
                                g = mandoc_malloc(sizeof(*g));
                                g->next = *gp;
                                g->wanted = width;
@@ -278,12 +277,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
 
                min1 = min2 = SIZE_MAX;
                for (icol = 0; icol <= maxcol; icol++) {
-                       if (min1 > colwidth[icol]) {
+                       width = colwidth[icol];
+                       if (min1 > width) {
                                min2 = min1;
-                               min1 = colwidth[icol];
-                       } else if (min1 < colwidth[icol] &&
-                           min2 > colwidth[icol])
-                               min2 = colwidth[icol];
+                               min1 = width;
+                       } else if (min1 < width && min2 > width)
+                               min2 = width;
                }
 
                /*
@@ -296,7 +295,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                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;
@@ -305,26 +304,22 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                                width = min2;
                        if (wanted > width)
                                wanted = width;
-                       for (icol = g->startcol; icol <= g->endcol; icol++)
-                               if (colwidth[icol] == min1 ||
-                                   (colwidth[icol] < min2 &&
-                                    colwidth[icol] > width))
-                                       colwidth[icol] = width;
                }
 
-               /* Record the effect of the widening on the group list. */
+               /* Record the effect of the widening. */
 
                gp = &first_group;
                while ((g = *gp) != NULL) {
                        done = 0;
                        for (icol = g->startcol; icol <= g->endcol; icol++) {
-                               if (colwidth[icol] != wanted ||
-                                   tbl->cols[icol].width == wanted)
+                               if (colwidth[icol] != min1)
                                        continue;
                                if (g->wanted <= wanted - min1) {
+                                       tbl->cols[icol].width += g->wanted;
                                        done = 1;
                                        break;
                                }
+                               tbl->cols[icol].width = wanted;
                                g->wanted -= wanted - min1;
                        }
                        if (done) {
@@ -333,12 +328,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                        } else
                                gp = &(*gp)->next;
                }
-
-               /* Record the effect of the widening on the columns. */
-
-               for (icol = 0; icol <= maxcol; icol++)
-                       if (colwidth[icol] == wanted)
-                               tbl->cols[icol].width = wanted;
        }
        free(colwidth);
 
@@ -564,5 +553,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                col->nwidth = totsz;
        if (col->nwidth > col->width)
                col->width = col->nwidth;
+       fprintf(stderr, "N=%zu D=%zu I=%zu T=%zu %s\n",
+           col->nwidth, col->decimal, intsz, totsz, dp->string);
        return totsz;
 }