=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.25 retrieving revision 1.45 diff -u -p -r1.25 -r1.45 --- mandoc/out.c 2010/08/24 12:18:49 1.25 +++ mandoc/out.c 2013/05/31 21:37:17 1.45 @@ -1,6 +1,7 @@ -/* $Id: out.c,v 1.25 2010/08/24 12:18:49 kristaps Exp $ */ +/* $Id: out.c,v 1.45 2013/05/31 21:37:17 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2011 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 @@ -27,8 +28,16 @@ #include #include +#include "mandoc.h" #include "out.h" +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. @@ -60,7 +69,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof return(0); while (i < BUFSIZ) { - if ( ! isdigit((u_char)*src)) { + if ( ! isdigit((unsigned char)*src)) { if ('.' != *src) break; else if (hasd) @@ -123,208 +132,153 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof return(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) { - struct tm tm; - char buf[5]; - char *p; - size_t nsz; + const struct tbl_dat *dp; + const struct tbl_head *hp; + struct roffcol *col; + int spans; - 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'; + hp = sp->head; - if (0 == (nsz = strftime(p, sz, "%B ", &tm))) - return; - - p += (int)nsz; - sz -= nsz; - - if (0 == strftime(buf, sizeof(buf), "%e, ", &tm)) - return; - - nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz); - - if (nsz >= sz) - return; - - p += (int)nsz; - sz -= nsz; - - (void)strftime(p, sz, "%Y", &tm); + for ( ; 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; + assert(dp->layout); + col = &tbl->cols[dp->layout->head->ident]; + tblcalc_data(tbl, col, sp->opts, dp); + } + } } - -int -a2roffdeco(enum roffdeco *d, const char **word, size_t *sz) +static void +tblcalc_data(struct rofftbl *tbl, struct roffcol *col, + const struct tbl_opts *opts, const struct tbl_dat *dp) { - int i, j, lim; - char term, c; - const char *wp; - enum roffdeco dd; + size_t sz; - *d = DECO_NONE; - lim = i = 0; - term = '\0'; - wp = *word; + /* Branch down into data sub-types. */ - switch ((c = wp[i++])) { - case ('('): - *d = DECO_SPECIAL; - lim = 2; - break; - case ('F'): + switch (dp->layout->pos) { + case (TBL_CELL_HORIZ): /* FALLTHROUGH */ - case ('f'): - *d = 'F' == c ? DECO_FFONT : DECO_FONT; - - switch (wp[i++]) { - case ('('): - lim = 2; - break; - case ('['): - term = ']'; - break; - case ('3'): - /* FALLTHROUGH */ - case ('B'): - *d = DECO_BOLD; - return(i); - case ('2'): - /* FALLTHROUGH */ - case ('I'): - *d = DECO_ITALIC; - return(i); - case ('P'): - *d = DECO_PREVIOUS; - return(i); - case ('1'): - /* FALLTHROUGH */ - case ('R'): - *d = DECO_ROMAN; - return(i); - default: - i--; - lim = 1; - break; - } + case (TBL_CELL_DHORIZ): + sz = (*tbl->len)(1, tbl->arg); + if (col->width < sz) + col->width = sz; break; - case ('M'): + case (TBL_CELL_LONG): /* FALLTHROUGH */ - case ('m'): + case (TBL_CELL_CENTRE): /* FALLTHROUGH */ - case ('*'): - if ('*' == c) - *d = DECO_RESERVED; - - switch (wp[i++]) { - case ('('): - lim = 2; - break; - case ('['): - term = ']'; - break; - default: - i--; - lim = 1; - break; - } - break; - case ('h'): + case (TBL_CELL_LEFT): /* FALLTHROUGH */ - case ('v'): - /* FALLTHROUGH */ - case ('s'): - j = 0; - if ('+' == wp[i] || '-' == wp[i]) { - i++; - j = 1; - } - - switch (wp[i++]) { - case ('('): - lim = 2; - break; - case ('['): - term = ']'; - break; - case ('\''): - term = '\''; - break; - case ('0'): - j = 1; - /* FALLTHROUGH */ - default: - i--; - lim = 1; - break; - } - - if ('+' == wp[i] || '-' == wp[i]) { - if (j) - return(i); - i++; - } - + case (TBL_CELL_RIGHT): + tblcalc_literal(tbl, col, dp); break; - case ('['): - *d = DECO_SPECIAL; - term = ']'; + case (TBL_CELL_NUMBER): + tblcalc_number(tbl, col, opts, dp); break; - case ('c'): - *d = DECO_NOSPACE; - return(i); - case ('z'): - *d = DECO_NONE; - if ('\\' == wp[i]) { - *word = &wp[++i]; - return(i + a2roffdeco(&dd, word, sz)); - } else - lim = 1; + case (TBL_CELL_DOWN): break; default: - *d = DECO_SSPECIAL; - i--; - lim = 1; - break; + abort(); + /* NOTREACHED */ } +} - assert(term || lim); - *word = &wp[i]; +static void +tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, + const struct tbl_dat *dp) +{ + size_t sz; + const char *str; - if (term) { - j = i; - while (wp[i] && wp[i] != term) - i++; - if ('\0' == wp[i]) { - *d = DECO_NONE; - return(i); - } + str = dp->string ? dp->string : ""; + sz = (*tbl->slen)(str, tbl->arg); - assert(i >= j); - *sz = (size_t)(i - j); + if (col->width < sz) + col->width = sz; +} - return(i + 1); - } +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]; - assert(lim > 0); - *sz = (size_t)lim; + /* + * 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. + */ - for (j = 0; wp[i] && j < lim; j++) - i++; - if (j < lim) - *d = DECO_NONE; + str = dp->string ? dp->string : ""; + sz = (*tbl->slen)(str, tbl->arg); - return(i); + /* 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; }