=================================================================== RCS file: /cvs/mandoc/tbl.c,v retrieving revision 1.2 retrieving revision 1.16 diff -u -p -r1.2 -r1.16 --- mandoc/tbl.c 2010/12/28 10:55:24 1.2 +++ mandoc/tbl.c 2011/01/01 23:00:46 1.16 @@ -1,6 +1,6 @@ -/* $Id: tbl.c,v 1.2 2010/12/28 10:55:24 kristaps Exp $ */ +/* $Id: tbl.c,v 1.16 2011/01/01 23:00:46 kristaps Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include #include @@ -24,33 +25,12 @@ #include "libmandoc.h" #include "libroff.h" -enum tbl_part { - TBL_PART_OPTS, /* in options (first line) */ - TBL_PART_LAYOUT, /* describing layout */ - TBL_PART_DATA /* creating data rows */ -}; +static void tbl_calc(struct tbl *); +static void tbl_calc_data(struct tbl *, struct tbl_dat *); +static void tbl_calc_data_literal(struct tbl_dat *); +static void tbl_calc_data_number(struct tbl *, struct tbl_dat *); +static void tbl_calc_data_spanner(struct tbl_dat *); - -struct tbl { - enum tbl_part part; -}; - -static void tbl_init(struct tbl *); -static void tbl_clear(struct tbl *); - -static void -tbl_clear(struct tbl *tbl) -{ - -} - -static void -tbl_init(struct tbl *tbl) -{ - - tbl->part = TBL_PART_OPTS; -} - enum rofferr tbl_read(struct tbl *tbl, int ln, const char *p, int offs) { @@ -60,35 +40,275 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o cp = &p[offs]; len = (int)strlen(cp); - if (len && TBL_PART_OPTS == tbl->part) + /* + * If we're in the options section and we don't have a + * terminating semicolon, assume we've moved directly into the + * layout section. No need to report a warning: this is, + * apparently, standard behaviour. + */ + + if (TBL_PART_OPTS == tbl->part && len) if (';' != cp[len - 1]) tbl->part = TBL_PART_LAYOUT; - - return(ROFF_CONT); + + /* Now process each logical section of the table. */ + + switch (tbl->part) { + case (TBL_PART_OPTS): + return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); + case (TBL_PART_LAYOUT): + return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); + case (TBL_PART_DATA): + break; + } + + /* + * This only returns zero if the line is empty, so we ignore it + * and continue on. + */ + return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); } struct tbl * -tbl_alloc(void) +tbl_alloc(int pos, int line, void *data, const mandocmsg msg) { struct tbl *p; - p = mandoc_malloc(sizeof(struct tbl)); - tbl_init(p); + p = mandoc_calloc(1, sizeof(struct tbl)); + p->line = line; + p->pos = pos; + p->data = data; + p->msg = msg; + p->part = TBL_PART_OPTS; + p->tab = '\t'; + p->linesize = 12; + p->decimal = '.'; return(p); } void tbl_free(struct tbl *p) { + struct tbl_row *rp; + struct tbl_cell *cp; + struct tbl_span *sp; + struct tbl_dat *dp; + struct tbl_head *hp; - tbl_clear(p); + while (NULL != (rp = p->first_row)) { + p->first_row = rp->next; + while (rp->first) { + cp = rp->first; + rp->first = cp->next; + free(cp); + } + free(rp); + } + + while (NULL != (sp = p->first_span)) { + p->first_span = sp->next; + while (sp->first) { + dp = sp->first; + sp->first = dp->next; + if (dp->string) + free(dp->string); + free(dp); + } + free(sp); + } + + while (NULL != (hp = p->first_head)) { + p->first_head = hp->next; + free(hp); + } + free(p); } void -tbl_reset(struct tbl *tbl) +tbl_restart(int line, int pos, struct tbl *tbl) { - tbl_clear(tbl); - tbl_init(tbl); + tbl->part = TBL_PART_LAYOUT; + tbl->line = line; + tbl->pos = pos; + + if (NULL == tbl->first_span || NULL == tbl->first_span->first) + TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); } + +const struct tbl_span * +tbl_span(const struct tbl *tbl) +{ + + assert(tbl); + return(tbl->last_span); +} + +void +tbl_end(struct tbl *tbl) +{ + + if (NULL == tbl->first_span || NULL == tbl->first_span->first) + TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); + else + tbl_calc(tbl); +} + +static void +tbl_calc(struct tbl *tbl) +{ + struct tbl_span *sp; + struct tbl_dat *dp; + struct tbl_head *hp; + + /* Calculate width as the max of column cells' widths. */ + + for (sp = tbl->first_span; sp; sp = sp->next) { + switch (sp->pos) { + case (TBL_DATA_HORIZ): + /* FALLTHROUGH */ + case (TBL_DATA_DHORIZ): + continue; + default: + break; + } + for (dp = sp->first; dp; dp = dp->next) + tbl_calc_data(tbl, dp); + } + + /* Calculate width as the simple spanner value. */ + + for (hp = tbl->first_head; hp; hp = hp->next) + switch (hp->pos) { + case (TBL_HEAD_VERT): + hp->width = 1; + break; + case (TBL_HEAD_DVERT): + hp->width = 2; + break; + default: + break; + } +} + +static void +tbl_calc_data(struct tbl *tbl, struct tbl_dat *data) +{ + + /* + * This is the case with overrunning cells... + */ + if (NULL == data->layout) + return; + + /* Branch down into data sub-types. */ + + switch (data->layout->pos) { + case (TBL_CELL_HORIZ): + /* FALLTHROUGH */ + case (TBL_CELL_DHORIZ): + tbl_calc_data_spanner(data); + break; + case (TBL_CELL_LONG): + /* FALLTHROUGH */ + case (TBL_CELL_CENTRE): + /* FALLTHROUGH */ + case (TBL_CELL_LEFT): + /* FALLTHROUGH */ + case (TBL_CELL_RIGHT): + tbl_calc_data_literal(data); + break; + case (TBL_CELL_NUMBER): + tbl_calc_data_number(tbl, data); + break; + default: + abort(); + /* NOTREACHED */ + } +} + +static void +tbl_calc_data_spanner(struct tbl_dat *data) +{ + + /* N.B., these are horiz spanners (not vert) so always 1. */ + data->layout->head->width = 1; +} + +static void +tbl_calc_data_number(struct tbl *tbl, struct tbl_dat *data) +{ + int sz, d; + char *dp, pnt; + + /* + * First calculate number width and decimal place (last + 1 for + * no-decimal numbers). If the stored decimal is subsequent + * 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. + */ + + /* TODO: use spacing modifier. */ + + assert(data->string); + sz = (int)strlen(data->string); + pnt = tbl->decimal; + + if (NULL == (dp = strchr(data->string, pnt))) + d = sz + 1; + else + d = (int)(dp - data->string) + 1; + + sz += 2; + + if (data->layout->head->decimal > d) { + sz += data->layout->head->decimal - d; + d = data->layout->head->decimal; + } else + data->layout->head->width += + d - data->layout->head->decimal; + + if (sz > data->layout->head->width) + data->layout->head->width = sz; + if (d > data->layout->head->decimal) + data->layout->head->decimal = d; +} + +static void +tbl_calc_data_literal(struct tbl_dat *data) +{ + int sz, bufsz; + + /* + * Calculate our width and use the spacing, with a minimum + * spacing dictated by position (centre, e.g,. gets a space on + * either side, while right/left get a single adjacent space). + */ + + assert(data->string); + sz = (int)strlen(data->string); + + switch (data->layout->pos) { + case (TBL_CELL_LONG): + /* FALLTHROUGH */ + case (TBL_CELL_CENTRE): + bufsz = 2; + break; + default: + bufsz = 1; + break; + } + + if (data->layout->spacing) + bufsz = bufsz > data->layout->spacing ? + bufsz : data->layout->spacing; + + sz += bufsz; + if (data->layout->head->width < sz) + data->layout->head->width = sz; +} + +