-/* $Id: out.c,v 1.83 2021/09/28 17:06:59 schwarze Exp $ */
+/* $Id: out.c,v 1.85 2021/10/17 21:05:54 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
* 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)
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;
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));
*gp = g->next;
free(g);
} else
- gp = &(*gp)->next;
+ gp = &g->next;
}
}
free(colwidth);