===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.83
retrieving revision 1.86
diff -u -p -r1.83 -r1.86
--- mandoc/out.c	2021/09/28 17:06:59	1.83
+++ mandoc/out.c	2025/01/05 18:14:39	1.86
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.83 2021/09/28 17:06:59 schwarze Exp $ */
+/*	$Id: out.c,v 1.86 2025/01/05 18:14:39 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
@@ -117,7 +117,6 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
     size_t offset, size_t rmargin)
 {
-	struct roffsu		 su;
 	const struct tbl_opts	*opts;
 	const struct tbl_span	*sp;
 	const struct tbl_dat	*dp;
@@ -149,7 +148,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 		 * 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)
@@ -160,13 +158,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 				continue;
 
 			/* Handle explicit width specifications. */
-
-			if (dp->layout->wstr != NULL &&
-			    dp->layout->width == 0 &&
-			    a2roffsu(dp->layout->wstr, &su, SCALE_EN)
-			    != NULL)
-				dp->layout->width =
-				    (*tbl->sulen)(&su, tbl->arg);
 			if (col->width < dp->layout->width)
 				col->width = dp->layout->width;
 			if (dp->layout->spacing != SIZE_MAX &&
@@ -190,16 +181,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 				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;
@@ -248,13 +239,13 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 				done = 1;
 				break;
 			} else
-				(*gp)->wanted -= width;
+				g->wanted -= width;
 		}
 		if (done) {
 			*gp = g->next;
 			free(g);
 		} else
-			gp = &(*gp)->next;
+			gp = &g->next;
 	}
 
 	colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
@@ -327,7 +318,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 				*gp = g->next;
 				free(g);
 			} else
-				gp = &(*gp)->next;
+				gp = &g->next;
 		}
 	}
 	free(colwidth);