version 1.56, 2014/12/23 09:31:46 |
version 1.62, 2015/10/12 00:08:16 |
|
|
/* $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 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014, 2015 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 51 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 51 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
dst->unit = def == SCALE_MAX ? SCALE_BU : def; |
dst->unit = def == SCALE_MAX ? SCALE_BU : def; |
dst->scale = strtod(src, &endptr); |
dst->scale = strtod(src, &endptr); |
if (endptr == src) |
if (endptr == src) |
return(0); |
return 0; |
|
|
switch (*endptr++) { |
switch (*endptr++) { |
case 'c': |
case 'c': |
Line 89 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 89 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
if (SCALE_MAX == def) |
if (SCALE_MAX == def) |
return(0); |
return 0; |
dst->unit = def; |
dst->unit = def; |
break; |
break; |
} |
} |
|
|
/* FIXME: do this in the caller. */ |
return *endptr == '\0' ? 2 : 1; |
if (dst->scale < 0.0) |
|
dst->scale = 0.0; |
|
return(*endptr == '\0' ? 2 : 1); |
|
} |
} |
|
|
/* |
/* |
|
|
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, |
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, |
size_t totalwidth) |
size_t totalwidth) |
{ |
{ |
|
const struct tbl_opts *opts; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
size_t ewidth, xwidth; |
size_t ewidth, xwidth; |
int spans; |
int spans; |
int icol, maxcol, necol, nxcol; |
int icol, maxcol, necol, nxcol, quirkcol; |
|
|
/* |
/* |
* Allocate the master column specifiers. These will hold the |
* Allocate the master column specifiers. These will hold the |
Line 125 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 123 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
assert(NULL == tbl->cols); |
assert(NULL == tbl->cols); |
tbl->cols = mandoc_calloc((size_t)sp->opts->cols, |
tbl->cols = mandoc_calloc((size_t)sp->opts->cols, |
sizeof(struct roffcol)); |
sizeof(struct roffcol)); |
|
opts = sp->opts; |
|
|
for (maxcol = -1; sp; sp = sp->next) { |
for (maxcol = -1; sp; sp = sp->next) { |
if (TBL_SPAN_DATA != sp->pos) |
if (TBL_SPAN_DATA != sp->pos) |
Line 141 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 140 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
spans = dp->spans; |
spans = dp->spans; |
if (1 < spans) |
if (1 < spans) |
continue; |
continue; |
icol = dp->layout->head->ident; |
icol = dp->layout->col; |
if (maxcol < icol) |
if (maxcol < icol) |
maxcol = icol; |
maxcol = icol; |
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; |
tblcalc_data(tbl, col, sp->opts, dp); |
tblcalc_data(tbl, col, opts, dp); |
} |
} |
} |
} |
|
|
Line 198 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 197 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
*/ |
*/ |
|
|
if (nxcol && totalwidth) { |
if (nxcol && totalwidth) { |
xwidth = totalwidth - 3*maxcol - xwidth; |
xwidth = totalwidth - xwidth - 3*maxcol - |
|
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? |
|
2 : !!opts->lvert + !!opts->rvert); |
|
|
|
/* |
|
* Emulate a bug in GNU tbl width calculation that |
|
* manifests itself for large numbers of x-columns. |
|
* Emulating it for 5 x-columns gives identical |
|
* behaviour for up to 6 x-columns. |
|
*/ |
|
|
|
if (nxcol == 5) { |
|
quirkcol = xwidth % nxcol + 2; |
|
if (quirkcol != 3 && quirkcol != 4) |
|
quirkcol = -1; |
|
} else |
|
quirkcol = -1; |
|
|
|
necol = 0; |
|
ewidth = 0; |
for (icol = 0; icol <= maxcol; icol++) { |
for (icol = 0; icol <= maxcol; icol++) { |
col = tbl->cols + icol; |
col = tbl->cols + icol; |
if ( ! (col->flags & TBL_CELL_WMAX)) |
if ( ! (col->flags & TBL_CELL_WMAX)) |
continue; |
continue; |
col->width = xwidth / nxcol--; |
col->width = (double)xwidth * ++necol / nxcol |
xwidth -= col->width; |
- ewidth + 0.4995; |
|
if (necol == quirkcol) |
|
col->width--; |
|
ewidth += col->width; |
} |
} |
} |
} |
} |
} |
Line 219 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 240 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
|
|
switch (dp->layout->pos) { |
switch (dp->layout->pos) { |
case TBL_CELL_HORIZ: |
case TBL_CELL_HORIZ: |
/* FALLTHROUGH */ |
|
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->width < sz) |
col->width = sz; |
col->width = sz; |
break; |
break; |
case TBL_CELL_LONG: |
case TBL_CELL_LONG: |
/* FALLTHROUGH */ |
|
case TBL_CELL_CENTRE: |
case TBL_CELL_CENTRE: |
/* FALLTHROUGH */ |
|
case TBL_CELL_LEFT: |
case TBL_CELL_LEFT: |
/* FALLTHROUGH */ |
|
case TBL_CELL_RIGHT: |
case TBL_CELL_RIGHT: |
tblcalc_literal(tbl, col, dp); |
tblcalc_literal(tbl, col, dp); |
break; |
break; |
Line 241 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 258 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
} |
} |
|
|