=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.7 retrieving revision 1.56 diff -u -p -r1.7 -r1.56 --- mandoc/out.c 2009/10/22 18:59:00 1.7 +++ mandoc/out.c 2014/12/23 09:31:46 1.56 @@ -1,6 +1,7 @@ -/* $Id: out.c,v 1.7 2009/10/22 18:59:00 kristaps Exp $ */ +/* $Id: out.c,v 1.56 2014/12/23 09:31:46 schwarze Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2011, 2014 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 @@ -14,155 +15,299 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + #include #include -#include -#include #include #include #include +#include "mandoc_aux.h" +#include "mandoc.h" #include "out.h" -#ifdef __linux__ -extern size_t strlcat(char *, const char *, size_t); -#endif +static void tblcalc_data(struct rofftbl *, struct roffcol *, + const struct tbl_opts *, const struct tbl_dat *); +static void tblcalc_literal(struct rofftbl *, struct roffcol *, + const struct tbl_dat *); +static void tblcalc_number(struct rofftbl *, struct roffcol *, + const struct tbl_opts *, const struct tbl_dat *); -/* - * Convert a `scaling unit' to a consistent form, or fail. Scaling - * units are documented in groff.7, mdoc.7, man.7. + +/* + * 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. */ int a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) { - char buf[BUFSIZ], hasd; - int i; - enum roffscale unit; + char *endptr; - if ('\0' == *src) + dst->unit = def == SCALE_MAX ? SCALE_BU : def; + dst->scale = strtod(src, &endptr); + if (endptr == src) return(0); - i = hasd = 0; - - switch (*src) { - case ('+'): - src++; + switch (*endptr++) { + case 'c': + dst->unit = SCALE_CM; break; - case ('-'): - buf[i++] = *src++; + case 'i': + dst->unit = SCALE_IN; break; - default: + case 'f': + dst->unit = SCALE_FS; break; - } - - if ('\0' == *src) - return(0); - - while (i < BUFSIZ) { - if ( ! isdigit((u_char)*src)) { - if ('.' != *src) - break; - else if (hasd) - break; - else - hasd = 1; - } - buf[i++] = *src++; - } - - if (BUFSIZ == i || (*src && *(src + 1))) - return(0); - - buf[i] = '\0'; - - switch (*src) { - case ('c'): - unit = SCALE_CM; + case 'M': + dst->unit = SCALE_MM; break; - case ('i'): - unit = SCALE_IN; + case 'm': + dst->unit = SCALE_EM; break; - case ('P'): - unit = SCALE_PC; + case 'n': + dst->unit = SCALE_EN; break; - case ('p'): - unit = SCALE_PT; + case 'P': + dst->unit = SCALE_PC; break; - case ('f'): - unit = SCALE_FS; + case 'p': + dst->unit = SCALE_PT; break; - case ('v'): - unit = SCALE_VS; + case 'u': + dst->unit = SCALE_BU; break; - case ('m'): - unit = SCALE_EM; + case 'v': + dst->unit = SCALE_VS; break; - case ('\0'): + case '\0': + endptr--; + /* FALLTHROUGH */ + default: if (SCALE_MAX == def) return(0); - unit = SCALE_BU; + dst->unit = def; break; - case ('u'): - unit = SCALE_BU; - break; - case ('M'): - unit = SCALE_MM; - break; - case ('n'): - unit = SCALE_EN; - break; - default: - return(0); } - if ((dst->scale = atof(buf)) < 0) - dst->scale = 0; - dst->unit = unit; - dst->pt = hasd; - - return(1); + /* FIXME: do this in the caller. */ + if (dst->scale < 0.0) + dst->scale = 0.0; + return(*endptr == '\0' ? 2 : 1); } - /* - * Correctly writes the time in nroff form, which differs from standard - * form in that a space isn't printed in lieu of the extra %e field for - * single-digit dates. + * Calculate the abstract widths and decimal positions of columns in a + * table. This routine allocates the columns structures then runs over + * all rows and cells in the table. The function pointers in "tbl" are + * used for the actual width calculations. */ void -time2a(time_t t, char *dst, size_t sz) +tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, + size_t totalwidth) { - struct tm tm; - char buf[5]; - char *p; - size_t nsz; + const struct tbl_dat *dp; + struct roffcol *col; + size_t ewidth, xwidth; + int spans; + int icol, maxcol, necol, nxcol; - assert(sz > 1); - localtime_r(&t, &tm); + /* + * Allocate the master column specifiers. These will hold the + * widths and decimal positions for all cells in the column. It + * must be freed and nullified by the caller. + */ - p = dst; - nsz = 0; + assert(NULL == tbl->cols); + tbl->cols = mandoc_calloc((size_t)sp->opts->cols, + sizeof(struct roffcol)); - dst[0] = '\0'; + for (maxcol = -1; sp; sp = sp->next) { + if (TBL_SPAN_DATA != sp->pos) + continue; + spans = 1; + /* + * Account for the data cells in the layout, matching it + * to data cells in the data section. + */ + for (dp = sp->first; dp; dp = dp->next) { + /* Do not used spanned cells in the calculation. */ + if (0 < --spans) + continue; + spans = dp->spans; + if (1 < spans) + continue; + icol = 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); + } + } - if (0 == (nsz = strftime(p, sz, "%B ", &tm))) - return; + /* + * 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. + */ - p += (int)nsz; - sz -= nsz; + 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; + } - if (0 == strftime(buf, sizeof(buf), "%e, ", &tm)) - return; + /* + * Equalize columns, if requested for any of them. + * Update total width of the columns not to maximize. + */ - nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz); + 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 (nsz >= sz) - return; + /* + * If there are any columns to maximize, find the total + * available width, deducting 3n margins between columns. + * Distribute the available width evenly. + */ - p += (int)nsz; - sz -= nsz; + 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; + } + } +} - (void)strftime(p, sz, "%Y", &tm); +static void +tblcalc_data(struct rofftbl *tbl, struct roffcol *col, + const struct tbl_opts *opts, const struct tbl_dat *dp) +{ + size_t sz; + + /* Branch down into data sub-types. */ + + 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); + break; + case TBL_CELL_NUMBER: + tblcalc_number(tbl, col, opts, dp); + break; + case TBL_CELL_DOWN: + break; + default: + abort(); + /* NOTREACHED */ + } } +static void +tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, + const struct tbl_dat *dp) +{ + size_t sz; + const char *str; + + str = dp->string ? dp->string : ""; + sz = (*tbl->slen)(str, tbl->arg); + + if (col->width < sz) + col->width = sz; +} + +static void +tblcalc_number(struct rofftbl *tbl, struct roffcol *col, + const struct tbl_opts *opts, const struct tbl_dat *dp) +{ + int i; + size_t sz, psz, ssz, d; + const char *str; + char *cp; + char buf[2]; + + /* + * First calculate number width and decimal place (last + 1 for + * non-decimal numbers). If the stored decimal is subsequent to + * ours, make our size longer by that difference + * (right-"shifting"); similarly, if ours is subsequent the + * stored, then extend the stored size by the difference. + * Finally, re-assign the stored values. + */ + + str = dp->string ? dp->string : ""; + sz = (*tbl->slen)(str, tbl->arg); + + /* FIXME: TBL_DATA_HORIZ et al.? */ + + 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; + } else + d = sz + psz; + + /* Adjust the settings for this column. */ + + if (col->decimal > d) { + sz += col->decimal - d; + d = col->decimal; + } else + col->width += d - col->decimal; + + if (sz > col->width) + col->width = sz; + if (d > col->decimal) + col->decimal = d; +}