version 1.68, 2017/06/14 18:23:37 |
version 1.72, 2018/08/18 20:18:14 |
|
|
/* $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 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011,2014,2015,2017,2018 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 <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
#include <stdint.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
Line 140 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 141 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
if (1 < spans) |
if (1 < spans) |
continue; |
continue; |
icol = dp->layout->col; |
icol = dp->layout->col; |
if (maxcol < icol) |
while (maxcol < icol) |
maxcol = icol; |
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) |
Line 154 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 155 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
(*tbl->sulen)(&su, tbl->arg); |
(*tbl->sulen)(&su, tbl->arg); |
if (col->width < dp->layout->width) |
if (col->width < dp->layout->width) |
col->width = dp->layout->width; |
col->width = dp->layout->width; |
|
if (dp->layout->spacing != SIZE_MAX && |
|
(col->spacing == SIZE_MAX || |
|
col->spacing < dp->layout->spacing)) |
|
col->spacing = dp->layout->spacing; |
tblcalc_data(tbl, col, opts, dp, |
tblcalc_data(tbl, col, 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 + 1) : 0); |
rmargin ? (rmargin + sp->opts->cols / 2) |
|
/ (sp->opts->cols + 1) : 0); |
} |
} |
} |
} |
|
|
/* |
/* |
|
* 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. |
* Find total width of the columns *not* to maximize. |
* Find total width of the columns *not* to maximize. |
Line 171 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 178 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
ewidth = xwidth = 0; |
ewidth = xwidth = 0; |
for (icol = 0; icol <= maxcol; icol++) { |
for (icol = 0; icol <= maxcol; icol++) { |
col = tbl->cols + icol; |
col = tbl->cols + icol; |
|
if (col->width > col->nwidth) |
|
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 312 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 325 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
const struct tbl_opts *opts, const struct tbl_dat *dp) |
const struct tbl_opts *opts, const struct tbl_dat *dp) |
{ |
{ |
int i; |
int i; |
size_t sz, psz, ssz, d; |
size_t sz, ssz, d; |
const char *str; |
const char *str; |
char *cp; |
char *cp; |
char buf[2]; |
char buf[2]; |
Line 334 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 347 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
buf[0] = opts->decimal; |
buf[0] = opts->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
psz = (*tbl->slen)(buf, tbl->arg); |
|
|
|
if (NULL != (cp = strrchr(str, opts->decimal))) { |
if (NULL != (cp = strrchr(str, opts->decimal))) { |
buf[1] = '\0'; |
buf[1] = '\0'; |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
buf[0] = str[i]; |
buf[0] = str[i]; |
ssz += (*tbl->slen)(buf, tbl->arg); |
ssz += (*tbl->slen)(buf, tbl->arg); |
} |
} |
d = ssz + psz; |
d = ssz; |
} else |
} else |
d = sz + psz; |
d = sz; |
|
|
/* Adjust the settings for this column. */ |
/* Adjust the settings for this column. */ |
|
|
Line 352 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 363 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
sz += col->decimal - d; |
sz += col->decimal - d; |
d = col->decimal; |
d = col->decimal; |
} else |
} else |
col->width += d - col->decimal; |
col->nwidth += d - col->decimal; |
|
|
if (sz > col->width) |
if (sz > col->nwidth) |
col->width = sz; |
col->nwidth = sz; |
if (d > col->decimal) |
if (d > col->decimal) |
col->decimal = d; |
col->decimal = d; |
} |
} |