=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.46 retrieving revision 1.55 diff -u -p -r1.46 -r1.55 --- mandoc/out.c 2013/10/05 20:30:05 1.46 +++ mandoc/out.c 2014/12/23 03:28:01 1.55 @@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.46 2013/10/05 20:30:05 schwarze Exp $ */ +/* $Id: out.c,v 1.55 2014/12/23 03:28:01 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011 Ingo Schwarze + * 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 @@ -15,19 +15,16 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include -#include -#include #include #include #include +#include "mandoc_aux.h" #include "mandoc.h" #include "out.h" @@ -38,87 +35,58 @@ static void tblcalc_literal(struct rofftbl *, struct r 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 1 on success and 0 on failure. */ int a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) { - char buf[BUFSIZ], hasd; - int i; + char *endptr; + double scale; enum roffscale unit; - if ('\0' == *src) + scale = strtod(src, &endptr); + if (endptr == src || (endptr[0] != '\0' && endptr[1] != '\0')) return(0); - i = hasd = 0; - - switch (*src) { - case ('+'): - src++; - break; - case ('-'): - buf[i++] = *src++; - break; - default: - break; - } - - if ('\0' == *src) - return(0); - - while (i < BUFSIZ) { - if ( ! isdigit((unsigned 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'): + switch (*endptr) { + case 'c': unit = SCALE_CM; break; - case ('i'): + case 'i': unit = SCALE_IN; break; - case ('P'): + case 'P': unit = SCALE_PC; break; - case ('p'): + case 'p': unit = SCALE_PT; break; - case ('f'): + case 'f': unit = SCALE_FS; break; - case ('v'): + case 'v': unit = SCALE_VS; break; - case ('m'): + case 'm': unit = SCALE_EM; break; - case ('\0'): + case '\0': if (SCALE_MAX == def) return(0); - unit = SCALE_BU; + unit = def; break; - case ('u'): + case 'u': unit = SCALE_BU; break; - case ('M'): + case 'M': unit = SCALE_MM; break; - case ('n'): + case 'n': unit = SCALE_EN; break; default: @@ -126,8 +94,9 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof } /* FIXME: do this in the caller. */ - if ((dst->scale = atof(buf)) < 0) - dst->scale = 0; + if (scale < 0.0) + scale = 0.0; + dst->scale = scale; dst->unit = unit; return(1); } @@ -139,11 +108,14 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof * used for the actual width calculations. */ void -tblcalc(struct rofftbl *tbl, const struct tbl_span *sp) +tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, + size_t totalwidth) { const struct tbl_dat *dp; struct roffcol *col; + size_t ewidth, xwidth; int spans; + int icol, maxcol, necol, nxcol; /* * Allocate the master column specifiers. These will hold the @@ -152,10 +124,10 @@ 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)); + tbl->cols = mandoc_calloc((size_t)sp->opts->cols, + sizeof(struct roffcol)); - for ( ; sp; sp = sp->next) { + for (maxcol = -1; sp; sp = sp->next) { if (TBL_SPAN_DATA != sp->pos) continue; spans = 1; @@ -170,11 +142,72 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp spans = dp->spans; if (1 < spans) continue; - assert(dp->layout); - col = &tbl->cols[dp->layout->head->ident]; + 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); } } + + /* + * 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. + */ + + 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; + } + + /* + * Equalize columns, if requested for any of them. + * Update total width of the columns not to maximize. + */ + + 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 there are any columns to maximize, find the total + * available width, deducting 3n margins between columns. + * Distribute the available width evenly. + */ + + 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; + } + } } static void @@ -186,26 +219,26 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col, /* Branch down into data sub-types. */ 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); if (col->width < sz) col->width = sz; 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); break; - case (TBL_CELL_NUMBER): + case TBL_CELL_NUMBER: tblcalc_number(tbl, col, opts, dp); break; - case (TBL_CELL_DOWN): + case TBL_CELL_DOWN: break; default: abort(); @@ -231,7 +264,7 @@ static void tblcalc_number(struct rofftbl *tbl, struct roffcol *col, const struct tbl_opts *opts, const struct tbl_dat *dp) { - int i; + int i; size_t sz, psz, ssz, d; const char *str; char *cp;