version 1.63, 2017/05/01 20:54:59 |
version 1.68, 2017/06/14 18:23:37 |
|
|
#include "out.h" |
#include "out.h" |
|
|
static void tblcalc_data(struct rofftbl *, struct roffcol *, |
static void tblcalc_data(struct rofftbl *, struct roffcol *, |
const struct tbl_opts *, const struct tbl_dat *); |
const struct tbl_opts *, const struct tbl_dat *, |
|
size_t); |
static void tblcalc_literal(struct rofftbl *, struct roffcol *, |
static void tblcalc_literal(struct rofftbl *, struct roffcol *, |
const struct tbl_dat *); |
const struct tbl_dat *, size_t); |
static void tblcalc_number(struct rofftbl *, struct roffcol *, |
static void tblcalc_number(struct rofftbl *, struct roffcol *, |
const struct tbl_opts *, const struct tbl_dat *); |
const struct tbl_opts *, const struct tbl_dat *); |
|
|
Line 40 static void tblcalc_number(struct rofftbl *, struct ro |
|
Line 41 static void tblcalc_number(struct rofftbl *, struct ro |
|
* Parse the *src string and store a scaling unit into *dst. |
* Parse the *src string and store a scaling unit into *dst. |
* If the string doesn't specify the unit, use the default. |
* If the string doesn't specify the unit, use the default. |
* If no default is specified, fail. |
* If no default is specified, fail. |
* Return 2 on complete success, 1 when a conversion was done, |
* Return a pointer to the byte after the last byte used, |
* but there was trailing garbage, and 0 on total failure. |
* or NULL on total failure. |
*/ |
*/ |
int |
const char * |
a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) |
a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) |
{ |
{ |
char *endptr; |
char *endptr; |
Line 51 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 52 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 NULL; |
|
|
switch (*endptr++) { |
switch (*endptr++) { |
case 'c': |
case 'c': |
Line 84 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 85 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
case 'v': |
case 'v': |
dst->unit = SCALE_VS; |
dst->unit = SCALE_VS; |
break; |
break; |
case '\0': |
|
endptr--; |
|
/* FALLTHROUGH */ |
|
default: |
default: |
|
endptr--; |
if (SCALE_MAX == def) |
if (SCALE_MAX == def) |
return 0; |
return NULL; |
dst->unit = def; |
dst->unit = def; |
break; |
break; |
} |
} |
|
return endptr; |
return *endptr == '\0' ? 2 : 1; |
|
} |
} |
|
|
/* |
/* |
Line 105 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 103 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
*/ |
*/ |
void |
void |
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, |
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, |
size_t totalwidth) |
size_t offset, size_t rmargin) |
{ |
{ |
|
struct roffsu su; |
const struct tbl_opts *opts; |
const struct tbl_opts *opts; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
Line 147 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 146 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
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, opts, dp); |
if (dp->layout->wstr != NULL && |
|
dp->layout->width == 0 && |
|
a2roffsu(dp->layout->wstr, &su, SCALE_EN) |
|
!= NULL) |
|
dp->layout->width = |
|
(*tbl->sulen)(&su, tbl->arg); |
|
if (col->width < dp->layout->width) |
|
col->width = dp->layout->width; |
|
tblcalc_data(tbl, col, opts, dp, |
|
dp->block == 0 ? 0 : |
|
dp->layout->width ? dp->layout->width : |
|
rmargin ? rmargin / (sp->opts->cols + 1) : 0); |
} |
} |
} |
} |
|
|
Line 184 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 194 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
continue; |
continue; |
if (col->width == ewidth) |
if (col->width == ewidth) |
continue; |
continue; |
if (nxcol && totalwidth) |
if (nxcol && rmargin) |
xwidth += ewidth - col->width; |
xwidth += ewidth - col->width; |
col->width = ewidth; |
col->width = ewidth; |
} |
} |
Line 196 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 206 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
* Distribute the available width evenly. |
* Distribute the available width evenly. |
*/ |
*/ |
|
|
if (nxcol && totalwidth) { |
if (nxcol && rmargin) { |
xwidth += 3*maxcol + |
xwidth += 3*maxcol + |
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? |
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? |
2 : !!opts->lvert + !!opts->rvert); |
2 : !!opts->lvert + !!opts->rvert); |
if (xwidth >= totalwidth) |
if (rmargin <= offset + xwidth) |
return; |
return; |
xwidth = totalwidth - xwidth; |
xwidth = rmargin - offset - xwidth; |
|
|
/* |
/* |
* Emulate a bug in GNU tbl width calculation that |
* Emulate a bug in GNU tbl width calculation that |
Line 235 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 245 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
|
|
static void |
static void |
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) |
const struct tbl_opts *opts, const struct tbl_dat *dp, size_t mw) |
{ |
{ |
size_t sz; |
size_t sz; |
|
|
Line 252 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 262 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
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); |
tblcalc_literal(tbl, col, dp, mw); |
break; |
break; |
case TBL_CELL_NUMBER: |
case TBL_CELL_NUMBER: |
tblcalc_number(tbl, col, opts, dp); |
tblcalc_number(tbl, col, opts, dp); |
Line 266 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 276 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
|
|
static void |
static void |
tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, |
tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, |
const struct tbl_dat *dp) |
const struct tbl_dat *dp, size_t mw) |
{ |
{ |
size_t sz; |
const char *str; /* Beginning of the first line. */ |
const char *str; |
const char *beg; /* Beginning of the current line. */ |
|
char *end; /* End of the current line. */ |
|
size_t lsz; /* Length of the current line. */ |
|
size_t wsz; /* Length of the current word. */ |
|
|
str = dp->string ? dp->string : ""; |
if (dp->string == NULL || *dp->string == '\0') |
sz = (*tbl->slen)(str, tbl->arg); |
return; |
|
str = mw ? mandoc_strdup(dp->string) : dp->string; |
if (col->width < sz) |
lsz = 0; |
col->width = sz; |
for (beg = str; beg != NULL && *beg != '\0'; beg = end) { |
|
end = mw ? strchr(beg, ' ') : NULL; |
|
if (end != NULL) { |
|
*end++ = '\0'; |
|
while (*end == ' ') |
|
end++; |
|
} |
|
wsz = (*tbl->slen)(beg, tbl->arg); |
|
if (mw && lsz && lsz + 1 + wsz <= mw) |
|
lsz += 1 + wsz; |
|
else |
|
lsz = wsz; |
|
if (col->width < lsz) |
|
col->width = lsz; |
|
} |
|
if (mw) |
|
free((void *)str); |
} |
} |
|
|
static void |
static void |