=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.50 retrieving revision 1.57 diff -u -p -r1.50 -r1.57 --- mandoc/out.c 2014/08/10 23:54:41 1.50 +++ mandoc/out.c 2014/12/23 13:48:57 1.57 @@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.50 2014/08/10 23:54:41 schwarze Exp $ */ +/* $Id: out.c,v 1.57 2014/12/23 13:48:57 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 @@ -20,8 +20,6 @@ #include #include -#include -#include #include #include #include @@ -39,97 +37,64 @@ static void tblcalc_number(struct rofftbl *, struct ro /* - * 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((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': - unit = SCALE_CM; + case 'M': + dst->unit = SCALE_MM; break; - case 'i': - unit = SCALE_IN; + case 'm': + dst->unit = SCALE_EM; break; + case 'n': + dst->unit = SCALE_EN; + break; case 'P': - unit = SCALE_PC; + dst->unit = SCALE_PC; break; case 'p': - unit = SCALE_PT; + dst->unit = SCALE_PT; break; - case 'f': - unit = SCALE_FS; + case 'u': + dst->unit = SCALE_BU; break; case 'v': - unit = SCALE_VS; + dst->unit = SCALE_VS; break; - case 'm': - unit = SCALE_EM; - break; 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); } - /* FIXME: do this in the caller. */ - if ((dst->scale = atof(buf)) < 0.0) - dst->scale = 0.0; - dst->unit = unit; - return(1); + return(*endptr == '\0' ? 2 : 1); } /* @@ -139,11 +104,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 @@ -155,7 +123,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp 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,9 +138,70 @@ 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; } } }