===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.84
retrieving revision 1.86
diff -u -p -r1.84 -r1.86
--- mandoc/out.c	2021/10/17 20:48:28	1.84
+++ mandoc/out.c	2025/01/05 18:14:39	1.86
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.84 2021/10/17 20:48:28 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;
@@ -159,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 &&
@@ -247,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));
@@ -326,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);
@@ -553,7 +545,5 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 		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;
 }