version 1.80, 2021/08/10 12:55:03 |
version 1.82, 2021/09/07 17:07:58 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 |
|
* Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 122 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 123 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
struct tbl_colgroup *first_group, **gp, *g; |
struct tbl_colgroup *first_group, **gp, *g; |
size_t *colwidth; |
|
size_t ewidth, min1, min2, wanted, width, xwidth; |
size_t ewidth, min1, min2, wanted, width, xwidth; |
int done, icol, maxcol, necol, nxcol, quirkcol; |
int done, icol, maxcol, necol, nxcol, quirkcol; |
|
|
Line 256 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 256 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
gp = &(*gp)->next; |
gp = &(*gp)->next; |
} |
} |
|
|
colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth)); |
|
while (first_group != NULL) { |
while (first_group != NULL) { |
|
|
/* |
/* |
* Rebuild the array of the widths of all columns |
|
* participating in spans that require expansion. |
|
*/ |
|
|
|
for (icol = 0; icol <= maxcol; icol++) |
|
colwidth[icol] = SIZE_MAX; |
|
for (g = first_group; g != NULL; g = g->next) |
|
for (icol = g->startcol; icol <= g->endcol; icol++) |
|
colwidth[icol] = tbl->cols[icol].width; |
|
|
|
/* |
|
* Find the smallest and second smallest column width |
* Find the smallest and second smallest column width |
* among the columns which may need expamsion. |
* among the columns which may need expamsion. |
*/ |
*/ |
|
|
min1 = min2 = SIZE_MAX; |
min1 = min2 = SIZE_MAX; |
for (icol = 0; icol <= maxcol; icol++) { |
for (icol = 0; icol <= maxcol; icol++) { |
if (min1 > colwidth[icol]) { |
width = tbl->cols[icol].width; |
|
if (min1 > width) { |
min2 = min1; |
min2 = min1; |
min1 = colwidth[icol]; |
min1 = width; |
} else if (min1 < colwidth[icol] && |
} else if (min1 < width && min2 > width) |
min2 > colwidth[icol]) |
min2 = width; |
min2 = colwidth[icol]; |
|
} |
} |
|
|
/* |
/* |
Line 304 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 292 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
width = min2; |
width = min2; |
if (wanted > width) |
if (wanted > width) |
wanted = width; |
wanted = width; |
for (icol = g->startcol; icol <= g->endcol; icol++) |
|
if (colwidth[icol] == min1 || |
|
(colwidth[icol] < min2 && |
|
colwidth[icol] > width)) |
|
colwidth[icol] = width; |
|
} |
} |
|
|
/* Record the effect of the widening on the group list. */ |
/* Record the effect of the widening. */ |
|
|
gp = &first_group; |
gp = &first_group; |
while ((g = *gp) != NULL) { |
while ((g = *gp) != NULL) { |
done = 0; |
done = 0; |
for (icol = g->startcol; icol <= g->endcol; icol++) { |
for (icol = g->startcol; icol <= g->endcol; icol++) { |
if (colwidth[icol] != wanted || |
if (tbl->cols[icol].width != min1) |
tbl->cols[icol].width == wanted) |
|
continue; |
continue; |
if (g->wanted <= wanted - min1) { |
if (g->wanted <= wanted - min1) { |
|
tbl->cols[icol].width += g->wanted; |
done = 1; |
done = 1; |
break; |
break; |
} |
} |
|
tbl->cols[icol].width = wanted; |
g->wanted -= wanted - min1; |
g->wanted -= wanted - min1; |
} |
} |
if (done) { |
if (done) { |
Line 332 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 316 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
} else |
} else |
gp = &(*gp)->next; |
gp = &(*gp)->next; |
} |
} |
|
|
/* Record the effect of the widening on the columns. */ |
|
|
|
for (icol = 0; icol <= maxcol; icol++) |
|
if (colwidth[icol] == wanted) |
|
tbl->cols[icol].width = wanted; |
|
} |
} |
free(colwidth); |
|
|
|
/* |
/* |
* Align numbers with text. |
* Align numbers with text. |
Line 354 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 331 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
col = tbl->cols + icol; |
col = tbl->cols + icol; |
if (col->width > col->nwidth) |
if (col->width > col->nwidth) |
col->decimal += (col->width - col->nwidth) / 2; |
col->decimal += (col->width - col->nwidth) / 2; |
else |
|
col->width = col->nwidth; |
|
if (col->flags & TBL_CELL_EQUAL) { |
if (col->flags & TBL_CELL_EQUAL) { |
necol++; |
necol++; |
if (ewidth < col->width) |
if (ewidth < col->width) |
Line 563 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 538 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
|
|
if (totsz > col->nwidth) |
if (totsz > col->nwidth) |
col->nwidth = totsz; |
col->nwidth = totsz; |
|
if (col->nwidth > col->width) |
|
col->width = col->nwidth; |
return totsz; |
return totsz; |
} |
} |