=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.55 retrieving revision 1.66 diff -u -p -r1.55 -r1.66 --- mandoc/out.c 2014/12/23 03:28:01 1.55 +++ mandoc/out.c 2017/06/12 20:14:18 1.66 @@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.55 2014/12/23 03:28:01 schwarze Exp $ */ +/* $Id: out.c,v 1.66 2017/06/12 20:14:18 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2014 Ingo Schwarze + * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,9 +29,10 @@ #include "out.h" 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 *, - const struct tbl_dat *); + const struct tbl_dat *, size_t); static void tblcalc_number(struct rofftbl *, struct roffcol *, const struct tbl_opts *, const struct tbl_dat *); @@ -40,65 +41,60 @@ static void tblcalc_number(struct rofftbl *, struct ro * Parse the *src string and store a scaling unit into *dst. * If the string doesn't specify the unit, use the default. * If no default is specified, fail. - * Return 1 on success and 0 on failure. + * Return a pointer to the byte after the last byte used, + * or NULL on total failure. */ -int +const char * a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) { char *endptr; - double scale; - enum roffscale unit; - scale = strtod(src, &endptr); - if (endptr == src || (endptr[0] != '\0' && endptr[1] != '\0')) - return(0); + dst->unit = def == SCALE_MAX ? SCALE_BU : def; + dst->scale = strtod(src, &endptr); + if (endptr == src) + return NULL; - switch (*endptr) { + switch (*endptr++) { case 'c': - unit = SCALE_CM; + dst->unit = SCALE_CM; break; case 'i': - unit = SCALE_IN; + dst->unit = SCALE_IN; break; - case 'P': - unit = SCALE_PC; - break; - case 'p': - unit = SCALE_PT; - break; case 'f': - unit = SCALE_FS; + dst->unit = SCALE_FS; break; - case 'v': - unit = SCALE_VS; + case 'M': + dst->unit = SCALE_MM; break; case 'm': - unit = SCALE_EM; + dst->unit = SCALE_EM; break; - case '\0': - if (SCALE_MAX == def) - return(0); - unit = def; + case 'n': + dst->unit = SCALE_EN; break; - case 'u': - unit = SCALE_BU; + case 'P': + dst->unit = SCALE_PC; break; - case 'M': - unit = SCALE_MM; + case 'p': + dst->unit = SCALE_PT; break; - case 'n': - unit = SCALE_EN; + case 'u': + dst->unit = SCALE_BU; break; + case 'v': + dst->unit = SCALE_VS; + break; + case '\0': + endptr--; + /* FALLTHROUGH */ default: - return(0); + if (SCALE_MAX == def) + return NULL; + dst->unit = def; + break; } - - /* FIXME: do this in the caller. */ - if (scale < 0.0) - scale = 0.0; - dst->scale = scale; - dst->unit = unit; - return(1); + return endptr; } /* @@ -109,13 +105,15 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof */ void 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_dat *dp; struct roffcol *col; size_t ewidth, xwidth; int spans; - int icol, maxcol, necol, nxcol; + int icol, maxcol, necol, nxcol, quirkcol; /* * Allocate the master column specifiers. These will hold the @@ -126,6 +124,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp assert(NULL == tbl->cols); tbl->cols = mandoc_calloc((size_t)sp->opts->cols, sizeof(struct roffcol)); + opts = sp->opts; for (maxcol = -1; sp; sp = sp->next) { if (TBL_SPAN_DATA != sp->pos) @@ -142,14 +141,24 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp spans = dp->spans; if (1 < spans) continue; - icol = dp->layout->head->ident; + icol = dp->layout->col; 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); + 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, + rmargin && dp->block ? + rmargin / (sp->opts->cols + 1) : 0); } } @@ -186,7 +195,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp continue; if (col->width == ewidth) continue; - if (nxcol && totalwidth) + if (nxcol && rmargin) xwidth += ewidth - col->width; col->width = ewidth; } @@ -198,21 +207,46 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp * Distribute the available width evenly. */ - if (nxcol && totalwidth) { - xwidth = totalwidth - 3*maxcol - xwidth; + if (nxcol && rmargin) { + xwidth += 3*maxcol + + (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? + 2 : !!opts->lvert + !!opts->rvert); + if (rmargin <= offset + xwidth) + return; + xwidth = rmargin - offset - xwidth; + + /* + * 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++) { col = tbl->cols + icol; if ( ! (col->flags & TBL_CELL_WMAX)) continue; - col->width = xwidth / nxcol--; - xwidth -= col->width; + col->width = (double)xwidth * ++necol / nxcol + - ewidth + 0.4995; + if (necol == quirkcol) + col->width--; + ewidth += col->width; } } } static void 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; @@ -220,20 +254,16 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col, switch (dp->layout->pos) { case TBL_CELL_HORIZ: - /* FALLTHROUGH */ case TBL_CELL_DHORIZ: sz = (*tbl->len)(1, tbl->arg); if (col->width < sz) col->width = sz; break; case TBL_CELL_LONG: - /* FALLTHROUGH */ case TBL_CELL_CENTRE: - /* FALLTHROUGH */ case TBL_CELL_LEFT: - /* FALLTHROUGH */ case TBL_CELL_RIGHT: - tblcalc_literal(tbl, col, dp); + tblcalc_literal(tbl, col, dp, mw); break; case TBL_CELL_NUMBER: tblcalc_number(tbl, col, opts, dp); @@ -242,22 +272,40 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col, break; default: abort(); - /* NOTREACHED */ } } static void 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; + const char *str; /* Beginning of the first line. */ + 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 : ""; - sz = (*tbl->slen)(str, tbl->arg); - - if (col->width < sz) - col->width = sz; + if (dp->string == NULL || *dp->string == '\0') + return; + str = mw ? mandoc_strdup(dp->string) : dp->string; + lsz = 0; + 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