version 1.70, 2017/06/27 18:25:02 |
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 |
Line 168 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 168 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
} |
} |
|
|
/* |
/* |
|
* 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 177 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) |
if (col->spacing == SIZE_MAX || icol == maxcol) |
col->spacing = 3; |
col->spacing = 3; |
if (col->flags & TBL_CELL_EQUAL) { |
if (col->flags & TBL_CELL_EQUAL) { |
Line 320 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 342 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 360 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; |
} |
} |