From aa8dd33de6ae0205289c952afa6f6c257139beba Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 17 Oct 2021 20:48:28 +0000 Subject: Simplify the code building lists of spans, no output change intended. A comment in the code claimed that the list of spans would be sorted, but the sorting did not actually work. The layout "LSSS,LLSL" resulted in the list "0-3, 1-2", whereas the layout "LLSL,LSSS" resulted in the list "1-2, 0-3". Since sorting serves no purpose, just leave the list unsorted. --- out.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/out.c b/out.c index 797a252a..9e0d704a 100644 --- a/out.c +++ b/out.c @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.83 2021/09/28 17:06:59 schwarze Exp $ */ +/* $Id: out.c,v 1.84 2021/10/17 20:48:28 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 @@ -149,7 +149,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first, * 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) @@ -190,16 +189,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first, 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; @@ -554,5 +553,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col, 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; } -- cgit v1.2.3-56-ge451