=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.58 retrieving revision 1.72 diff -u -p -r1.58 -r1.72 --- mandoc/out.c 2015/01/28 02:23:49 1.58 +++ mandoc/out.c 2018/08/18 20:18:14 1.72 @@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.58 2015/01/28 02:23:49 schwarze Exp $ */ +/* $Id: out.c,v 1.72 2018/08/18 20:18:14 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2014, 2015 Ingo Schwarze + * Copyright (c) 2011,2014,2015,2017,2018 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 @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -29,9 +30,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,10 +42,10 @@ 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 2 on complete success, 1 when a conversion was done, - * but there was trailing garbage, and 0 on total 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; @@ -51,7 +53,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof dst->unit = def == SCALE_MAX ? SCALE_BU : def; dst->scale = strtod(src, &endptr); if (endptr == src) - return(0); + return NULL; switch (*endptr++) { case 'c': @@ -84,17 +86,14 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof case 'v': dst->unit = SCALE_VS; break; - case '\0': - endptr--; - /* FALLTHROUGH */ default: + endptr--; if (SCALE_MAX == def) - return(0); + return NULL; dst->unit = def; break; } - - return(*endptr == '\0' ? 2 : 1); + return endptr; } /* @@ -105,8 +104,9 @@ 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; @@ -140,18 +140,35 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp spans = dp->spans; if (1 < spans) continue; - icol = dp->layout->head->ident; - if (maxcol < icol) - maxcol = icol; + icol = dp->layout->col; + while (maxcol < icol) + tbl->cols[++maxcol].spacing = SIZE_MAX; col = tbl->cols + icol; col->flags |= dp->layout->flags; if (dp->layout->flags & TBL_CELL_WIGN) 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; + if (dp->layout->spacing != SIZE_MAX && + (col->spacing == SIZE_MAX || + col->spacing < dp->layout->spacing)) + col->spacing = dp->layout->spacing; + tblcalc_data(tbl, col, opts, dp, + dp->block == 0 ? 0 : + dp->layout->width ? dp->layout->width : + rmargin ? (rmargin + sp->opts->cols / 2) + / (sp->opts->cols + 1) : 0); } } /* + * Align numbers with text. * 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. @@ -161,6 +178,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp ewidth = xwidth = 0; for (icol = 0; icol <= maxcol; 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) + col->spacing = 3; if (col->flags & TBL_CELL_EQUAL) { necol++; if (ewidth < col->width) @@ -184,7 +207,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; } @@ -196,10 +219,13 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp * Distribute the available width evenly. */ - if (nxcol && totalwidth) { - xwidth = totalwidth - xwidth - 3*maxcol - + 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 @@ -232,7 +258,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp 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; @@ -240,20 +266,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); @@ -262,22 +284,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 @@ -285,7 +325,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co const struct tbl_opts *opts, const struct tbl_dat *dp) { int i; - size_t sz, psz, ssz, d; + size_t sz, ssz, d; const char *str; char *cp; char buf[2]; @@ -307,17 +347,15 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co buf[0] = opts->decimal; buf[1] = '\0'; - psz = (*tbl->slen)(buf, tbl->arg); - if (NULL != (cp = strrchr(str, opts->decimal))) { buf[1] = '\0'; for (ssz = 0, i = 0; cp != &str[i]; i++) { buf[0] = str[i]; ssz += (*tbl->slen)(buf, tbl->arg); } - d = ssz + psz; + d = ssz; } else - d = sz + psz; + d = sz; /* Adjust the settings for this column. */ @@ -325,10 +363,10 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co sz += col->decimal - d; d = col->decimal; } else - col->width += d - col->decimal; + col->nwidth += d - col->decimal; - if (sz > col->width) - col->width = sz; + if (sz > col->nwidth) + col->nwidth = sz; if (d > col->decimal) col->decimal = d; }