===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/mandoc/out.c	2021/09/28 17:06:17	1.55
--- src/usr.bin/mandoc/out.c	2021/10/17 20:47:54	1.56
***************
*** 1,4 ****
! /*	$OpenBSD: out.c,v 1.55 2021/09/28 17:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
--- 1,4 ----
! /*	$OpenBSD: out.c,v 1.56 2021/10/17 20:47:54 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
***************
*** 147,153 ****
  		 * 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)
--- 147,152 ----
***************
*** 188,203 ****
  				continue;
  
  			/*
! 			 * Build an ordered, 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 = &(*gp)->next;
! 			if (*gp == NULL || (*gp)->startcol > icol ||
!                             (*gp)->endcol > icol + dp->hspans) {
  				g = mandoc_malloc(sizeof(*g));
  				g->next = *gp;
  				g->wanted = width;
--- 187,202 ----
  				continue;
  
  			/*
! 			 * Build a singly linked list
  			 * of all groups of columns joined by spans,
  			 * recording the minimum width for each group.
  			 */
  
! 			gp = &first_group;
! 			while (*gp != NULL && ((*gp)->startcol != icol ||
! 			    (*gp)->endcol != icol + dp->hspans))
  				gp = &(*gp)->next;
! 			if (*gp == NULL) {
  				g = mandoc_malloc(sizeof(*g));
  				g->next = *gp;
  				g->wanted = width;