version 1.73, 2018/08/19 23:10:28 |
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 |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdint.h> |
#include <stdint.h> |
|
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "tbl.h" |
#include "out.h" |
#include "out.h" |
|
|
static void tblcalc_data(struct rofftbl *, struct roffcol *, |
struct tbl_colgroup { |
|
struct tbl_colgroup *next; |
|
size_t wanted; |
|
int startcol; |
|
int endcol; |
|
}; |
|
|
|
static size_t tblcalc_data(struct rofftbl *, struct roffcol *, |
const struct tbl_opts *, const struct tbl_dat *, |
const struct tbl_opts *, const struct tbl_dat *, |
size_t); |
size_t); |
static void tblcalc_literal(struct rofftbl *, struct roffcol *, |
static size_t tblcalc_literal(struct rofftbl *, struct roffcol *, |
const struct tbl_dat *, size_t); |
const struct tbl_dat *, size_t); |
static void tblcalc_number(struct rofftbl *, struct roffcol *, |
static size_t tblcalc_number(struct rofftbl *, struct roffcol *, |
const struct tbl_opts *, const struct tbl_dat *); |
const struct tbl_opts *, const struct tbl_dat *); |
|
|
|
|
Line 104 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 114 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
* used for the actual width calculations. |
* used for the actual width calculations. |
*/ |
*/ |
void |
void |
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, |
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first, |
size_t offset, size_t rmargin) |
size_t offset, size_t rmargin) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
const struct tbl_opts *opts; |
const struct tbl_opts *opts; |
|
const struct tbl_span *sp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
size_t ewidth, xwidth; |
struct tbl_colgroup *first_group, **gp, *g; |
int spans; |
size_t ewidth, min1, min2, wanted, width, xwidth; |
int icol, maxcol, necol, nxcol, quirkcol; |
int done, icol, maxcol, necol, nxcol, quirkcol; |
|
|
/* |
/* |
* Allocate the master column specifiers. These will hold the |
* Allocate the master column specifiers. These will hold the |
Line 121 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 132 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
* must be freed and nullified by the caller. |
* must be freed and nullified by the caller. |
*/ |
*/ |
|
|
assert(NULL == tbl->cols); |
assert(tbl->cols == NULL); |
tbl->cols = mandoc_calloc((size_t)sp->opts->cols, |
tbl->cols = mandoc_calloc((size_t)sp_first->opts->cols, |
sizeof(struct roffcol)); |
sizeof(struct roffcol)); |
opts = sp->opts; |
opts = sp_first->opts; |
|
|
for (maxcol = -1; sp; sp = sp->next) { |
maxcol = -1; |
if (TBL_SPAN_DATA != sp->pos) |
first_group = NULL; |
|
for (sp = sp_first; sp != NULL; sp = sp->next) { |
|
if (sp->pos != TBL_SPAN_DATA) |
continue; |
continue; |
spans = 1; |
|
/* |
/* |
* Account for the data cells in the layout, matching it |
* Account for the data cells in the layout, matching it |
* to data cells in the data section. |
* to data cells in the data section. |
*/ |
*/ |
for (dp = sp->first; dp; dp = dp->next) { |
|
/* Do not used spanned cells in the calculation. */ |
gp = &first_group; |
if (0 < --spans) |
for (dp = sp->first; dp != NULL; dp = dp->next) { |
continue; |
|
spans = dp->spans; |
|
if (1 < spans) |
|
continue; |
|
icol = dp->layout->col; |
icol = dp->layout->col; |
while (maxcol < icol) |
while (maxcol < icol + dp->hspans) |
tbl->cols[++maxcol].spacing = SIZE_MAX; |
tbl->cols[++maxcol].spacing = SIZE_MAX; |
col = tbl->cols + icol; |
col = tbl->cols + icol; |
col->flags |= dp->layout->flags; |
col->flags |= dp->layout->flags; |
if (dp->layout->flags & TBL_CELL_WIGN) |
if (dp->layout->flags & TBL_CELL_WIGN) |
continue; |
continue; |
|
|
|
/* Handle explicit width specifications. */ |
|
|
if (dp->layout->wstr != NULL && |
if (dp->layout->wstr != NULL && |
dp->layout->width == 0 && |
dp->layout->width == 0 && |
a2roffsu(dp->layout->wstr, &su, SCALE_EN) |
a2roffsu(dp->layout->wstr, &su, SCALE_EN) |
Line 160 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 172 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
(col->spacing == SIZE_MAX || |
(col->spacing == SIZE_MAX || |
col->spacing < dp->layout->spacing)) |
col->spacing < dp->layout->spacing)) |
col->spacing = dp->layout->spacing; |
col->spacing = dp->layout->spacing; |
tblcalc_data(tbl, col, opts, dp, |
|
|
/* |
|
* Calculate an automatic width. |
|
* Except for spanning cells, apply it. |
|
*/ |
|
|
|
width = tblcalc_data(tbl, |
|
dp->hspans == 0 ? col : NULL, |
|
opts, dp, |
dp->block == 0 ? 0 : |
dp->block == 0 ? 0 : |
dp->layout->width ? dp->layout->width : |
dp->layout->width ? dp->layout->width : |
rmargin ? (rmargin + sp->opts->cols / 2) |
rmargin ? (rmargin + sp->opts->cols / 2) |
/ (sp->opts->cols + 1) : 0); |
/ (sp->opts->cols + 1) : 0); |
|
if (dp->hspans == 0) |
|
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; |
|
g->startcol = icol; |
|
g->endcol = icol + dp->hspans; |
|
*gp = g; |
|
} else if ((*gp)->wanted < width) |
|
(*gp)->wanted = width; |
} |
} |
} |
} |
|
|
/* |
/* |
|
* The minimum width of columns explicitly specified |
|
* in the layout is 1n. |
|
*/ |
|
|
|
if (maxcol < sp_first->opts->cols - 1) |
|
maxcol = sp_first->opts->cols - 1; |
|
for (icol = 0; icol <= maxcol; icol++) { |
|
col = tbl->cols + icol; |
|
if (col->width < 1) |
|
col->width = 1; |
|
|
|
/* |
|
* Column spacings are needed for span width |
|
* calculations, so set the default values now. |
|
*/ |
|
|
|
if (col->spacing == SIZE_MAX || icol == maxcol) |
|
col->spacing = 3; |
|
} |
|
|
|
/* |
|
* Replace the minimum widths with the missing widths, |
|
* and dismiss groups that are already wide enough. |
|
*/ |
|
|
|
gp = &first_group; |
|
while ((g = *gp) != NULL) { |
|
done = 0; |
|
for (icol = g->startcol; icol <= g->endcol; icol++) { |
|
width = tbl->cols[icol].width; |
|
if (icol < g->endcol) |
|
width += tbl->cols[icol].spacing; |
|
if (g->wanted <= width) { |
|
done = 1; |
|
break; |
|
} else |
|
(*gp)->wanted -= width; |
|
} |
|
if (done) { |
|
*gp = g->next; |
|
free(g); |
|
} else |
|
gp = &(*gp)->next; |
|
} |
|
|
|
while (first_group != NULL) { |
|
|
|
/* |
|
* Find the smallest and second smallest column width |
|
* among the columns which may need expamsion. |
|
*/ |
|
|
|
min1 = min2 = SIZE_MAX; |
|
for (icol = 0; icol <= maxcol; icol++) { |
|
width = tbl->cols[icol].width; |
|
if (min1 > width) { |
|
min2 = min1; |
|
min1 = width; |
|
} else if (min1 < width && min2 > width) |
|
min2 = width; |
|
} |
|
|
|
/* |
|
* Find the minimum wanted width |
|
* for any one of the narrowest columns, |
|
* and mark the columns wanting that width. |
|
*/ |
|
|
|
wanted = min2; |
|
for (g = first_group; g != NULL; g = g->next) { |
|
necol = 0; |
|
for (icol = g->startcol; icol <= g->endcol; icol++) |
|
if (tbl->cols[icol].width == min1) |
|
necol++; |
|
if (necol == 0) |
|
continue; |
|
width = min1 + (g->wanted - 1) / necol + 1; |
|
if (width > min2) |
|
width = min2; |
|
if (wanted > width) |
|
wanted = width; |
|
} |
|
|
|
/* Record the effect of the widening. */ |
|
|
|
gp = &first_group; |
|
while ((g = *gp) != NULL) { |
|
done = 0; |
|
for (icol = g->startcol; icol <= g->endcol; icol++) { |
|
if (tbl->cols[icol].width != min1) |
|
continue; |
|
if (g->wanted <= wanted - min1) { |
|
tbl->cols[icol].width += g->wanted; |
|
done = 1; |
|
break; |
|
} |
|
tbl->cols[icol].width = wanted; |
|
g->wanted -= wanted - min1; |
|
} |
|
if (done) { |
|
*gp = g->next; |
|
free(g); |
|
} else |
|
gp = &(*gp)->next; |
|
} |
|
} |
|
|
|
/* |
* Align numbers with text. |
* Align numbers with text. |
* Count columns to equalize and columns to maximize. |
* Count columns to equalize and columns to maximize. |
* Find maximum width of the columns to equalize. |
* Find maximum width of the columns to equalize. |
Line 181 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->spacing == SIZE_MAX || icol == maxcol) |
|
col->spacing = 3; |
|
if (col->flags & TBL_CELL_EQUAL) { |
if (col->flags & TBL_CELL_EQUAL) { |
necol++; |
necol++; |
if (ewidth < col->width) |
if (ewidth < col->width) |
Line 257 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 403 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
} |
} |
} |
} |
|
|
static void |
static size_t |
tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
const struct tbl_opts *opts, const struct tbl_dat *dp, size_t mw) |
const struct tbl_opts *opts, const struct tbl_dat *dp, size_t mw) |
{ |
{ |
Line 269 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 415 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
case TBL_CELL_HORIZ: |
case TBL_CELL_HORIZ: |
case TBL_CELL_DHORIZ: |
case TBL_CELL_DHORIZ: |
sz = (*tbl->len)(1, tbl->arg); |
sz = (*tbl->len)(1, tbl->arg); |
if (col->width < sz) |
if (col != NULL && col->width < sz) |
col->width = sz; |
col->width = sz; |
break; |
return sz; |
case TBL_CELL_LONG: |
case TBL_CELL_LONG: |
case TBL_CELL_CENTRE: |
case TBL_CELL_CENTRE: |
case TBL_CELL_LEFT: |
case TBL_CELL_LEFT: |
case TBL_CELL_RIGHT: |
case TBL_CELL_RIGHT: |
tblcalc_literal(tbl, col, dp, mw); |
return tblcalc_literal(tbl, col, dp, mw); |
break; |
|
case TBL_CELL_NUMBER: |
case TBL_CELL_NUMBER: |
tblcalc_number(tbl, col, opts, dp); |
return tblcalc_number(tbl, col, opts, dp); |
break; |
|
case TBL_CELL_DOWN: |
case TBL_CELL_DOWN: |
break; |
return 0; |
default: |
default: |
abort(); |
abort(); |
} |
} |
} |
} |
|
|
static void |
static size_t |
tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, |
tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, |
const struct tbl_dat *dp, size_t mw) |
const struct tbl_dat *dp, size_t mw) |
{ |
{ |
Line 297 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 441 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
char *end; /* End of the current line. */ |
char *end; /* End of the current line. */ |
size_t lsz; /* Length of the current line. */ |
size_t lsz; /* Length of the current line. */ |
size_t wsz; /* Length of the current word. */ |
size_t wsz; /* Length of the current word. */ |
|
size_t msz; /* Length of the longest line. */ |
|
|
if (dp->string == NULL || *dp->string == '\0') |
if (dp->string == NULL || *dp->string == '\0') |
return; |
return 0; |
str = mw ? mandoc_strdup(dp->string) : dp->string; |
str = mw ? mandoc_strdup(dp->string) : dp->string; |
lsz = 0; |
msz = lsz = 0; |
for (beg = str; beg != NULL && *beg != '\0'; beg = end) { |
for (beg = str; beg != NULL && *beg != '\0'; beg = end) { |
end = mw ? strchr(beg, ' ') : NULL; |
end = mw ? strchr(beg, ' ') : NULL; |
if (end != NULL) { |
if (end != NULL) { |
Line 314 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 459 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
lsz += 1 + wsz; |
lsz += 1 + wsz; |
else |
else |
lsz = wsz; |
lsz = wsz; |
if (col->width < lsz) |
if (msz < lsz) |
col->width = lsz; |
msz = lsz; |
} |
} |
if (mw) |
if (mw) |
free((void *)str); |
free((void *)str); |
|
if (col != NULL && col->width < msz) |
|
col->width = msz; |
|
return msz; |
} |
} |
|
|
static void |
static size_t |
tblcalc_number(struct rofftbl *tbl, struct roffcol *col, |
tblcalc_number(struct rofftbl *tbl, struct roffcol *col, |
const struct tbl_opts *opts, const struct tbl_dat *dp) |
const struct tbl_opts *opts, const struct tbl_dat *dp) |
{ |
{ |
Line 330 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 478 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
char buf[2]; |
char buf[2]; |
|
|
if (dp->string == NULL || *dp->string == '\0') |
if (dp->string == NULL || *dp->string == '\0') |
return; |
return 0; |
|
|
|
totsz = (*tbl->slen)(dp->string, tbl->arg); |
|
if (col == NULL) |
|
return totsz; |
|
|
/* |
/* |
* Find the last digit and |
* Find the last digit and |
* the last decimal point that is adjacent to a digit. |
* the last decimal point that is adjacent to a digit. |
Line 353 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 505 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
|
|
/* Not a number, treat as a literal string. */ |
/* Not a number, treat as a literal string. */ |
|
|
totsz = (*tbl->slen)(dp->string, tbl->arg); |
|
if (lastdigit == NULL) { |
if (lastdigit == NULL) { |
if (col->width < totsz) |
if (col != NULL && col->width < totsz) |
col->width = totsz; |
col->width = totsz; |
return; |
return totsz; |
} |
} |
|
|
/* Measure the width of the integer part. */ |
/* Measure the width of the integer part. */ |
Line 387 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; |
} |
} |