-/* $Id: tbl_term.c,v 1.2 2011/01/03 13:59:21 kristaps Exp $ */
+/* $Id: tbl_term.c,v 1.19 2011/01/25 12:07:30 schwarze Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include "out.h"
#include "term.h"
-/* FIXME: `n' modifier doesn't always do the right thing. */
-/* FIXME: `n' modifier doesn't use the cell-spacing buffer. */
-
-static inline void tbl_char(struct termp *, char, int);
-static void tbl_hframe(struct termp *,
- const struct tbl_span *);
-static void tbl_data_number(struct termp *,
- const struct tbl *,
- const struct tbl_dat *,
- const struct termp_tbl *);
-static void tbl_data_literal(struct termp *,
- const struct tbl_dat *,
- const struct termp_tbl *);
-static void tbl_data_spanner(struct termp *,
- const struct tbl_dat *,
- const struct termp_tbl *);
-static void tbl_data(struct termp *, const struct tbl *,
- const struct tbl_dat *,
- const struct termp_tbl *);
-static void tbl_spanner(struct termp *,
- const struct tbl_head *);
-static void tbl_hrule(struct termp *,
- const struct tbl_span *);
-static void tbl_vframe(struct termp *,
- const struct tbl *);
-static void tbl_calc(const struct tbl_span *,
- struct termp_tbl *);
-static void tbl_calc_data(const struct tbl *,
- const struct tbl_dat *,
- struct termp_tbl *);
-static void tbl_calc_data_literal(const struct tbl_dat *,
- struct termp_tbl *);
-static void tbl_calc_data_number(const struct tbl *,
- const struct tbl_dat *,
- struct termp_tbl *);
+static size_t term_tbl_len(size_t, void *);
+static size_t term_tbl_strlen(const char *, void *);
+static void tbl_char(struct termp *, char, size_t);
+static void tbl_data(struct termp *, const struct tbl *,
+ const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_hframe(struct termp *, const struct tbl_span *);
+static void tbl_literal(struct termp *, const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_number(struct termp *, const struct tbl *,
+ const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_hrule(struct termp *, const struct tbl_span *);
+static void tbl_vframe(struct termp *, const struct tbl *);
+static void tbl_vrule(struct termp *, const struct tbl_head *);
+
+
+static size_t
+term_tbl_strlen(const char *p, void *arg)
+{
+
+ return(term_strlen((const struct termp *)arg, p));
+}
+
+static size_t
+term_tbl_len(size_t sz, void *arg)
+{
+
+ return(term_len((const struct termp *)arg, sz));
+}
void
term_tbl(struct termp *tp, const struct tbl_span *sp)
{
- const struct tbl_head *hp;
- const struct tbl_dat *dp;
+ const struct tbl_head *hp;
+ const struct tbl_dat *dp;
+ struct roffcol *col;
+ int spans;
+ size_t rmargin, maxrmargin;
+
+ rmargin = tp->rmargin;
+ maxrmargin = tp->maxrmargin;
+
+ tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN;
+
+ /* Inhibit printing of spaces: we do padding ourselves. */
+
+ tp->flags |= TERMP_NONOSPACE;
+ tp->flags |= TERMP_NOSPACE;
+
+ /*
+ * The first time we're invoked for a given table block,
+ * calculate the table widths and decimal positions.
+ */
if (TBL_SPAN_FIRST & sp->flags) {
- assert(NULL == tp->tbl);
- tp->tbl = calloc
- (sp->tbl->cols, sizeof(struct termp_tbl));
- if (NULL == tp->tbl) {
- perror(NULL);
- exit(EXIT_FAILURE);
- }
- tbl_calc(sp, tp->tbl);
term_flushln(tp);
+
+ tp->tbl.len = term_tbl_len;
+ tp->tbl.slen = term_tbl_strlen;
+ tp->tbl.arg = tp;
+
+ tblcalc(&tp->tbl, sp);
}
+ /* Horizontal frame at the start of boxed tables. */
+
if (TBL_SPAN_FIRST & sp->flags)
tbl_hframe(tp, sp);
- tp->flags |= TERMP_NONOSPACE;
- tp->flags |= TERMP_NOSPACE;
+ /* Vertical frame at the start of each row. */
tbl_vframe(tp, sp->tbl);
+ /*
+ * Now print the actual data itself depending on the span type.
+ * Spanner spans get a horizontal rule; data spanners have their
+ * data printed by matching data to header.
+ */
+
switch (sp->pos) {
case (TBL_SPAN_HORIZ):
/* FALLTHROUGH */
case (TBL_SPAN_DHORIZ):
tbl_hrule(tp, sp);
- tbl_vframe(tp, sp->tbl);
- term_newln(tp);
- goto end;
- default:
break;
- }
+ case (TBL_SPAN_DATA):
+ /* Iterate over template headers. */
+ dp = sp->first;
+ spans = 0;
+ for (hp = sp->head; hp; hp = hp->next) {
+ /*
+ * If the current data header is invoked during
+ * a spanner ("spans" > 0), don't emit anything
+ * at all.
+ */
+ switch (hp->pos) {
+ case (TBL_HEAD_VERT):
+ /* FALLTHROUGH */
+ case (TBL_HEAD_DVERT):
+ if (spans <= 0)
+ tbl_vrule(tp, hp);
+ continue;
+ case (TBL_HEAD_DATA):
+ break;
+ }
- dp = sp->first;
- for (hp = sp->head; hp; hp = hp->next) {
- switch (hp->pos) {
- case (TBL_HEAD_VERT):
- /* FALLTHROUGH */
- case (TBL_HEAD_DVERT):
- tbl_spanner(tp, hp);
- break;
- case (TBL_HEAD_DATA):
- tbl_data(tp, sp->tbl, dp, &tp->tbl[hp->ident]);
- if (dp)
+ if (--spans >= 0)
+ continue;
+
+ col = &tp->tbl.cols[hp->ident];
+ tbl_data(tp, sp->tbl, dp, col);
+
+ /*
+ * Go to the next data cell and assign the
+ * number of subsequent spans, if applicable.
+ */
+
+ if (dp) {
+ spans = dp->spans;
dp = dp->next;
- break;
- default:
- abort();
- /* NOTREACHED */
+ }
}
+ break;
}
tbl_vframe(tp, sp->tbl);
term_flushln(tp);
-end:
+ /*
+ * If we're the last row, clean up after ourselves: clear the
+ * existing table configuration and set it to NULL.
+ */
+
if (TBL_SPAN_LAST & sp->flags) {
tbl_hframe(tp, sp);
- assert(tp->tbl);
- free(tp->tbl);
- tp->tbl = NULL;
+ assert(tp->tbl.cols);
+ free(tp->tbl.cols);
+ tp->tbl.cols = NULL;
}
tp->flags &= ~TERMP_NONOSPACE;
+ tp->rmargin = rmargin;
+ tp->maxrmargin = maxrmargin;
}
{
const struct tbl_head *hp;
char c;
- int width;
+ size_t width;
/*
* An hrule extends across the entire table and is demarked by a
/* FIXME: don't use `+' between data and a spanner! */
for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
+ width = tp->tbl.cols[hp->ident].width;
switch (hp->pos) {
case (TBL_HEAD_DATA):
+ if (hp->next)
+ width += 2;
tbl_char(tp, c, width);
break;
case (TBL_HEAD_DVERT):
tbl_hframe(struct termp *tp, const struct tbl_span *sp)
{
const struct tbl_head *hp;
- int width;
+ size_t width;
if ( ! (TBL_OPT_BOX & sp->tbl->opts ||
TBL_OPT_DBOX & sp->tbl->opts))
return;
- tp->flags |= TERMP_NONOSPACE;
- tp->flags |= TERMP_NOSPACE;
-
/*
* Print out the horizontal part of a frame or double frame. A
* double frame has an unbroken `-' outer line the width of the
if (TBL_OPT_DBOX & sp->tbl->opts) {
term_word(tp, "+");
for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
+ width = tp->tbl.cols[hp->ident].width;
tbl_char(tp, '-', width);
}
term_word(tp, "+");
term_word(tp, "+");
for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
+ width = tp->tbl.cols[hp->ident].width;
switch (hp->pos) {
case (TBL_HEAD_DATA):
tbl_char(tp, '-', width);
static void
tbl_data(struct termp *tp, const struct tbl *tbl,
const struct tbl_dat *dp,
- const struct termp_tbl *tbp)
+ const struct roffcol *col)
{
- enum tbl_cellt pos;
if (NULL == dp) {
- tbl_char(tp, ASCII_NBRSP, tbp->width);
+ tbl_char(tp, ASCII_NBRSP, col->width);
return;
}
+ assert(dp->layout);
switch (dp->pos) {
+ case (TBL_DATA_NONE):
+ tbl_char(tp, ASCII_NBRSP, col->width);
+ return;
case (TBL_DATA_HORIZ):
/* FALLTHROUGH */
+ case (TBL_DATA_NHORIZ):
+ tbl_char(tp, '-', col->width);
+ return;
+ case (TBL_DATA_NDHORIZ):
+ /* FALLTHROUGH */
case (TBL_DATA_DHORIZ):
- tbl_data_spanner(tp, dp, tbp);
+ tbl_char(tp, '=', col->width);
return;
default:
break;
}
- pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT;
-
- switch (pos) {
+ switch (dp->layout->pos) {
case (TBL_CELL_HORIZ):
- /* FALLTHROUGH */
+ tbl_char(tp, '-', col->width);
+ break;
case (TBL_CELL_DHORIZ):
- tbl_data_spanner(tp, dp, tbp);
+ tbl_char(tp, '=', col->width);
break;
case (TBL_CELL_LONG):
/* FALLTHROUGH */
case (TBL_CELL_LEFT):
/* FALLTHROUGH */
case (TBL_CELL_RIGHT):
- tbl_data_literal(tp, dp, tbp);
+ tbl_literal(tp, dp, col);
break;
case (TBL_CELL_NUMBER):
- tbl_data_number(tp, tbl, dp, tbp);
+ tbl_number(tp, tbl, dp, col);
+ break;
+ case (TBL_CELL_DOWN):
+ tbl_char(tp, ASCII_NBRSP, col->width);
break;
default:
abort();
/* NOTREACHED */
}
}
+
static void
-tbl_spanner(struct termp *tp, const struct tbl_head *hp)
+tbl_vrule(struct termp *tp, const struct tbl_head *hp)
{
switch (hp->pos) {
static void
tbl_vframe(struct termp *tp, const struct tbl *tbl)
{
- /* Always just a single vertical line. */
if (TBL_OPT_BOX & tbl->opts || TBL_OPT_DBOX & tbl->opts)
term_word(tp, "|");
}
-
-static inline void
-tbl_char(struct termp *tp, char c, int len)
+static void
+tbl_char(struct termp *tp, char c, size_t len)
{
- int i;
+ size_t i, sz;
char cp[2];
cp[0] = c;
cp[1] = '\0';
- for (i = 0; i < len; i++)
- term_word(tp, cp);
-}
-
-static void
-tbl_data_spanner(struct termp *tp,
- const struct tbl_dat *dp,
- const struct termp_tbl *tblp)
-{
+ sz = term_strlen(tp, cp);
- switch (dp->pos) {
- case (TBL_DATA_HORIZ):
- case (TBL_DATA_NHORIZ):
- tbl_char(tp, '-', tblp->width);
- break;
- case (TBL_DATA_DHORIZ):
- case (TBL_DATA_NDHORIZ):
- tbl_char(tp, '=', tblp->width);
- break;
- default:
- break;
- }
+ for (i = 0; i < len; i += sz)
+ term_word(tp, cp);
}
static void
-tbl_data_literal(struct termp *tp,
- const struct tbl_dat *dp,
- const struct termp_tbl *tblp)
+tbl_literal(struct termp *tp, const struct tbl_dat *dp,
+ const struct roffcol *col)
{
- int padl, padr;
- enum tbl_cellt pos;
+ size_t padl, padr, ssz;
padl = padr = 0;
- pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT;
+ assert(dp->string);
+
+ ssz = term_len(tp, 1);
- switch (pos) {
+ switch (dp->layout->pos) {
case (TBL_CELL_LONG):
- padl = 1;
- padr = tblp->width - (int)strlen(dp->string) - 1;
+ padl = ssz;
+ padr = col->width - term_strlen(tp, dp->string) - ssz;
break;
case (TBL_CELL_CENTRE):
- padl = tblp->width - (int)strlen(dp->string);
- if (padl % 2)
- padr++;
- padl /= 2;
- padr += padl;
+ padr = col->width - term_strlen(tp, dp->string);
+ if (3 > padr)
+ break;
+ padl = (padr - 1) / 2;
+ padr -= padl;
break;
case (TBL_CELL_RIGHT):
- padl = tblp->width - (int)strlen(dp->string);
+ padl = col->width - term_strlen(tp, dp->string);
break;
default:
- padr = tblp->width - (int)strlen(dp->string);
+ padr = col->width - term_strlen(tp, dp->string);
break;
}
tbl_char(tp, ASCII_NBRSP, padl);
term_word(tp, dp->string);
- tbl_char(tp, ASCII_NBRSP, padr);
+ tbl_char(tp, ASCII_NBRSP, padr + 2);
}
static void
-tbl_data_number(struct termp *tp, const struct tbl *tbl,
+tbl_number(struct termp *tp, const struct tbl *tbl,
const struct tbl_dat *dp,
- const struct termp_tbl *tblp)
+ const struct roffcol *col)
{
- char *decp, pnt;
- int d, padl, sz;
+ char *cp;
+ char buf[2];
+ size_t sz, psz, ssz, d, padl;
+ int i;
/*
* See calc_data_number(). Left-pad by taking the offset of our
* and the maximum decimal; right-pad by the remaining amount.
*/
- sz = (int)strlen(dp->string);
- pnt = tbl->decimal;
-
- if (NULL == (decp = strchr(dp->string, pnt))) {
- d = sz + 1;
- } else {
- d = (int)(decp - dp->string) + 1;
- }
-
- assert(d <= tblp->decimal);
- assert(sz - d <= tblp->width - tblp->decimal);
-
- padl = tblp->decimal - d + 1;
- assert(tblp->width - sz - padl);
-
- tbl_char(tp, ASCII_NBRSP, padl);
- term_word(tp, dp->string);
- tbl_char(tp, ASCII_NBRSP, tblp->width - sz - padl);
-}
-
-static void
-tbl_calc(const struct tbl_span *sp, struct termp_tbl *tblp)
-{
- const struct tbl_dat *dp;
- const struct tbl_head *hp;
- struct termp_tbl *p;
+ assert(dp->string);
- /* Calculate width as the max of column cells' widths. */
+ sz = term_strlen(tp, dp->string);
- hp = sp->head;
+ buf[0] = tbl->decimal;
+ buf[1] = '\0';
- for ( ; 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) {
- if (NULL == dp->layout)
- continue;
- p = &tblp[dp->layout->head->ident];
- tbl_calc_data(sp->tbl, dp, p);
- }
- }
-
- /* Calculate width as the simple spanner value. */
+ psz = term_strlen(tp, buf);
- for ( ; hp; hp = hp->next)
- switch (hp->pos) {
- case (TBL_HEAD_VERT):
- tblp[hp->ident].width = 1;
- break;
- case (TBL_HEAD_DVERT):
- tblp[hp->ident].width = 2;
- break;
- default:
- break;
+ if (NULL != (cp = strrchr(dp->string, tbl->decimal))) {
+ buf[1] = '\0';
+ for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
+ buf[0] = dp->string[i];
+ ssz += term_strlen(tp, buf);
}
-}
-
-static void
-tbl_calc_data(const struct tbl *tbl,
- const struct tbl_dat *dp,
- struct termp_tbl *tblp)
-{
-
- /* Branch down into data sub-types. */
-
- switch (dp->layout->pos) {
- case (TBL_CELL_HORIZ):
- /* FALLTHROUGH */
- case (TBL_CELL_DHORIZ):
- tblp->width = 1;
- break;
- case (TBL_CELL_LONG):
- /* FALLTHROUGH */
- case (TBL_CELL_CENTRE):
- /* FALLTHROUGH */
- case (TBL_CELL_LEFT):
- /* FALLTHROUGH */
- case (TBL_CELL_RIGHT):
- tbl_calc_data_literal(dp, tblp);
- break;
- case (TBL_CELL_NUMBER):
- tbl_calc_data_number(tbl, dp, tblp);
- break;
- default:
- abort();
- /* NOTREACHED */
- }
-}
-
-static void
-tbl_calc_data_number(const struct tbl *tbl,
- const struct tbl_dat *dp, struct termp_tbl *tblp)
-{
- int sz, d;
- char *cp, 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(dp->string);
- sz = (int)strlen(dp->string);
- pnt = tbl->decimal;
-
- if (NULL == (cp = strchr(dp->string, pnt)))
- d = sz + 1;
- else
- d = (int)(cp - dp->string) + 1;
-
- sz += 2;
-
- if (tblp->decimal > d) {
- sz += tblp->decimal - d;
- d = tblp->decimal;
+ d = ssz + psz;
} else
- tblp->width += d - tblp->decimal;
+ d = sz + psz;
- if (sz > tblp->width)
- tblp->width = sz;
- if (d > tblp->decimal)
- tblp->decimal = d;
-}
-
-static void
-tbl_calc_data_literal(const struct tbl_dat *dp, struct termp_tbl *tblp)
-{
- int sz, bufsz;
+ sz += term_len(tp, 2);
+ d += term_len(tp, 1);
- /*
- * 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).
- */
+ padl = col->decimal - d;
- assert(dp->string);
- sz = (int)strlen(dp->string);
-
- switch (dp->layout->pos) {
- case (TBL_CELL_LONG):
- /* FALLTHROUGH */
- case (TBL_CELL_CENTRE):
- bufsz = 2;
- break;
- default:
- bufsz = 1;
- break;
- }
-
- if (dp->layout->spacing)
- bufsz = bufsz > dp->layout->spacing ?
- bufsz : dp->layout->spacing;
-
- sz += bufsz;
- if (tblp->width < sz)
- tblp->width = sz;
+ tbl_char(tp, ASCII_NBRSP, padl);
+ term_word(tp, dp->string);
+ tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
}
+
git.ckatri.com / mandoc.git / blobdiff