Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 4529d5b1d358125eda0acd26d22c9ee09a9c568a..797a252abfeb6748d50d2ef23b97e33f4fbada55 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,8 @@
-/*     $Id: out.c,v 1.79 2019/12/31 22:58:41 schwarze Exp $ */
+/*     $Id: out.c,v 1.83 2021/09/28 17:06:59 schwarze Exp $ */
 /*
  * 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
@@ -22,11 +23,13 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "mandoc_aux.h"
+#include "mandoc.h"
 #include "tbl.h"
 #include "out.h"
 
@@ -275,12 +278,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;
                }
 
                /*
@@ -293,7 +296,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;
@@ -302,26 +305,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) {
@@ -330,12 +329,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);
 
@@ -352,8 +345,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                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)
@@ -561,5 +552,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        if (totsz > col->nwidth)
                col->nwidth = totsz;
+       if (col->nwidth > col->width)
+               col->width = col->nwidth;
        return totsz;
 }