===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.75
retrieving revision 1.78
diff -u -p -r1.75 -r1.78
--- mandoc/out.c	2018/11/29 01:55:02	1.75
+++ mandoc/out.c	2019/03/29 21:27:06	1.78
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.75 2018/11/29 01:55:02 schwarze Exp $ */
+/*	$Id: out.c,v 1.78 2019/03/29 21:27:06 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -27,7 +27,7 @@
 #include <time.h>
 
 #include "mandoc_aux.h"
-#include "mandoc.h"
+#include "tbl.h"
 #include "out.h"
 
 struct	tbl_colgroup {
@@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 		gp = &first_group;
 		for (dp = sp->first; dp != NULL; dp = dp->next) {
 			icol = dp->layout->col;
-			while (icol > maxcol)
+			while (maxcol < icol + dp->hspans)
 				tbl->cols[++maxcol].spacing = SIZE_MAX;
 			col = tbl->cols + icol;
 			col->flags |= dp->layout->flags;