version 1.48, 2014/04/20 16:46:05 |
version 1.52, 2014/10/14 02:16:06 |
|
|
/* $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 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014 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 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
Line 112 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 110 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
case '\0': |
case '\0': |
if (SCALE_MAX == def) |
if (SCALE_MAX == def) |
return(0); |
return(0); |
unit = SCALE_BU; |
unit = SCALE_EN; |
break; |
break; |
case 'u': |
case 'u': |
unit = SCALE_BU; |
unit = SCALE_BU; |
Line 128 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 126 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
} |
} |
|
|
/* FIXME: do this in the caller. */ |
/* FIXME: do this in the caller. */ |
if ((dst->scale = atof(buf)) < 0) |
if ((dst->scale = atof(buf)) < 0.0) |
dst->scale = 0; |
dst->scale = 0.0; |
dst->unit = unit; |
dst->unit = unit; |
return(1); |
return(1); |
} |
} |
Line 141 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 139 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, |
|
size_t totalwidth) |
{ |
{ |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
|
size_t ewidth, xwidth; |
int spans; |
int spans; |
|
int icol, maxcol, necol, nxcol; |
|
|
/* |
/* |
* Allocate the master column specifiers. These will hold the |
* Allocate the master column specifiers. These will hold the |
Line 157 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 158 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
tbl->cols = mandoc_calloc((size_t)sp->opts->cols, |
tbl->cols = mandoc_calloc((size_t)sp->opts->cols, |
sizeof(struct roffcol)); |
sizeof(struct roffcol)); |
|
|
for ( ; sp; sp = sp->next) { |
for (maxcol = 0; sp; sp = sp->next) { |
if (TBL_SPAN_DATA != sp->pos) |
if (TBL_SPAN_DATA != sp->pos) |
continue; |
continue; |
spans = 1; |
spans = 1; |
Line 172 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 173 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
spans = dp->spans; |
spans = dp->spans; |
if (1 < spans) |
if (1 < spans) |
continue; |
continue; |
assert(dp->layout); |
icol = dp->layout->head->ident; |
col = &tbl->cols[dp->layout->head->ident]; |
if (maxcol < icol) |
|
maxcol = icol; |
|
col = tbl->cols + icol; |
|
col->flags |= dp->layout->flags; |
|
if (dp->layout->flags & TBL_CELL_WIGN) |
|
continue; |
tblcalc_data(tbl, col, sp->opts, dp); |
tblcalc_data(tbl, col, sp->opts, dp); |
|
} |
|
} |
|
|
|
/* |
|
* Count columns to equalize and columns to maximize. |
|
* Find maximum width of the columns to equalize. |
|
* Find total width of the columns *not* to maximize. |
|
*/ |
|
|
|
necol = nxcol = 0; |
|
ewidth = xwidth = 0; |
|
for (icol = 0; icol <= maxcol; icol++) { |
|
col = tbl->cols + icol; |
|
if (col->flags & TBL_CELL_EQUAL) { |
|
necol++; |
|
if (ewidth < col->width) |
|
ewidth = col->width; |
|
} |
|
if (col->flags & TBL_CELL_WMAX) |
|
nxcol++; |
|
else |
|
xwidth += col->width; |
|
} |
|
|
|
/* |
|
* Equalize columns, if requested for any of them. |
|
* Update total width of the columns not to maximize. |
|
*/ |
|
|
|
if (necol) { |
|
for (icol = 0; icol <= maxcol; icol++) { |
|
col = tbl->cols + icol; |
|
if ( ! (col->flags & TBL_CELL_EQUAL)) |
|
continue; |
|
if (col->width == ewidth) |
|
continue; |
|
if (nxcol && totalwidth) |
|
xwidth += ewidth - col->width; |
|
col->width = ewidth; |
|
} |
|
} |
|
|
|
/* |
|
* If there are any columns to maximize, find the total |
|
* available width, deducting 3n margins between columns. |
|
* Distribute the available width evenly. |
|
*/ |
|
|
|
if (nxcol && totalwidth) { |
|
xwidth = totalwidth - 3*maxcol - xwidth; |
|
for (icol = 0; icol <= maxcol; icol++) { |
|
col = tbl->cols + icol; |
|
if ( ! (col->flags & TBL_CELL_WMAX)) |
|
continue; |
|
col->width = xwidth / nxcol--; |
|
xwidth -= col->width; |
} |
} |
} |
} |
} |
} |