-/* $Id: tbl_term.c,v 1.5 2011/01/03 15:07:59 kristaps Exp $ */
+/* $Id: tbl_term.c,v 1.43 2015/10/12 00:08:16 schwarze Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012, 2014, 2015 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
* 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 <sys/types.h>
#include <assert.h>
#include <stdio.h>
#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(struct termp *,
- const struct tbl_span *);
-static void tbl_calc_data(struct termp *,
- const struct tbl *,
- const struct tbl_dat *,
- struct termp_tbl *);
-static void tbl_calc_data_literal(struct termp *,
- const struct tbl_dat *,
- struct termp_tbl *);
-static void tbl_calc_data_number(struct termp *,
- 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_opts *,
+ const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_literal(struct termp *, const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_number(struct termp *, const struct tbl_opts *,
+ const struct tbl_dat *,
+ const struct roffcol *);
+static void tbl_hrule(struct termp *, const struct tbl_span *, int);
+static void tbl_word(struct termp *, const struct tbl_dat *);
+
+
+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_cell *cp;
+ const struct tbl_dat *dp;
+ static size_t offset;
+ size_t rmargin, maxrmargin, tsz;
+ int ic, horiz, spans, vert;
+
+ rmargin = tp->rmargin;
+ maxrmargin = tp->maxrmargin;
+
+ tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN;
/* Inhibit printing of spaces: we do padding ourselves. */
tp->flags |= TERMP_NOSPACE;
/*
- * The first time we're invoked for a given table block, create
- * the termp_tbl structure. This contains the column
- * configuration for the entire table, e.g., table-wide column
- * width, decimal point, etc.
+ * 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);
+ if (tp->tbl.cols == NULL) {
+ tp->tbl.len = term_tbl_len;
+ tp->tbl.slen = term_tbl_strlen;
+ tp->tbl.arg = tp;
+
+ tblcalc(&tp->tbl, sp, rmargin - tp->offset);
+
+ /* Center the table as a whole. */
+
+ offset = tp->offset;
+ if (sp->opts->opts & TBL_OPT_CENTRE) {
+ tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)
+ ? 2 : !!sp->opts->lvert + !!sp->opts->rvert;
+ for (ic = 0; ic < sp->opts->cols; ic++)
+ tsz += tp->tbl.cols[ic].width + 3;
+ tsz -= 3;
+ if (offset + tsz > rmargin)
+ tsz -= 1;
+ tp->offset = (offset + rmargin > tsz) ?
+ (offset + rmargin - tsz) / 2 : 0;
}
- tbl_calc(tp, sp);
- /* Flush out any preceding data. */
- term_flushln(tp);
- }
-
- /* Horizontal frame at the start of boxed tables. */
+ /* Horizontal frame at the start of boxed tables. */
- if (TBL_SPAN_FIRST & sp->flags)
- tbl_hframe(tp, sp);
+ if (sp->opts->opts & TBL_OPT_DBOX)
+ tbl_hrule(tp, sp, 2);
+ if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
+ tbl_hrule(tp, sp, 1);
+ }
/* Vertical frame at the start of each row. */
- tbl_vframe(tp, sp->tbl);
+ horiz = sp->pos == TBL_SPAN_HORIZ || sp->pos == TBL_SPAN_DHORIZ;
+
+ if (sp->layout->vert ||
+ (sp->prev != NULL && sp->prev->layout->vert) ||
+ sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))
+ term_word(tp, horiz ? "+" : "|");
+ else if (sp->opts->lvert)
+ tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1);
/*
* 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.
+ * Match data cells to column numbers.
*/
- switch (sp->pos) {
- case (TBL_SPAN_HORIZ):
- /* FALLTHROUGH */
- case (TBL_SPAN_DHORIZ):
- tbl_hrule(tp, sp);
- break;
- case (TBL_SPAN_DATA):
- /* Iterate over template headers. */
+ if (sp->pos == TBL_SPAN_DATA) {
+ cp = sp->layout->first;
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);
+ spans = 0;
+ for (ic = 0; ic < sp->opts->cols; ic++) {
+
+ /*
+ * Remeber whether we need a vertical bar
+ * after this cell.
+ */
+
+ vert = cp == NULL ? 0 : cp->vert;
+
+ /*
+ * Print the data and advance to the next cell.
+ */
+
+ if (spans == 0) {
+ tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic);
+ if (dp != NULL) {
+ spans = dp->spans;
+ dp = dp->next;
+ }
+ } else
+ spans--;
+ if (cp != NULL)
+ cp = cp->next;
+
+ /*
+ * Separate columns, except in the middle
+ * of spans and after the last cell.
+ */
+
+ if (ic + 1 == sp->opts->cols || spans)
continue;
- case (TBL_HEAD_DATA):
- break;
- }
- tbl_data(tp, sp->tbl, dp,
- &tp->tbl[hp->ident]);
-
- /* Go to the next data cell. */
- if (dp)
- dp = dp->next;
+
+ tbl_char(tp, ASCII_NBRSP, 1);
+ if (vert > 0)
+ tbl_char(tp, '|', vert);
+ if (vert < 2)
+ tbl_char(tp, ASCII_NBRSP, 2 - vert);
}
- break;
- }
+ } else if (horiz)
+ tbl_hrule(tp, sp, 0);
- tbl_vframe(tp, sp->tbl);
+ /* Vertical frame at the end of each row. */
+
+ if (sp->layout->last->vert ||
+ (sp->prev != NULL && sp->prev->layout->last->vert) ||
+ (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))
+ term_word(tp, horiz ? "+" : " |");
+ else if (sp->opts->rvert)
+ tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1);
term_flushln(tp);
/*
* 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;
+ if (sp->next == NULL) {
+ if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
+ tbl_hrule(tp, sp, 1);
+ tp->skipvsp = 1;
+ }
+ if (sp->opts->opts & TBL_OPT_DBOX) {
+ tbl_hrule(tp, sp, 2);
+ tp->skipvsp = 2;
+ }
+ assert(tp->tbl.cols);
+ free(tp->tbl.cols);
+ tp->tbl.cols = NULL;
+ tp->offset = offset;
}
tp->flags &= ~TERMP_NONOSPACE;
-
+ tp->rmargin = rmargin;
+ tp->maxrmargin = maxrmargin;
}
+/*
+ * Kinds of horizontal rulers:
+ * 0: inside the table (single or double line with crossings)
+ * 1: inner frame (single line with crossings and ends)
+ * 2: outer frame (single line without crossings with ends)
+ */
static void
-tbl_hrule(struct termp *tp, const struct tbl_span *sp)
-{
- const struct tbl_head *hp;
- char c;
- int width;
-
- /*
- * An hrule extends across the entire table and is demarked by a
- * standalone `_' or whatnot in lieu of a table row. Spanning
- * headers are marked by a `+', as are table boundaries.
- */
-
- c = '-';
- if (TBL_SPAN_DHORIZ == sp->pos)
- c = '=';
-
- /* FIXME: don't use `+' between data and a spanner! */
-
- for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
- switch (hp->pos) {
- case (TBL_HEAD_DATA):
- tbl_char(tp, c, width);
- break;
- case (TBL_HEAD_DVERT):
- tbl_char(tp, '+', width);
- /* FALLTHROUGH */
- case (TBL_HEAD_VERT):
- tbl_char(tp, '+', width);
- break;
- default:
- abort();
- /* NOTREACHED */
- }
- }
-}
-
-static void
-tbl_hframe(struct termp *tp, const struct tbl_span *sp)
+tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind)
{
- const struct tbl_head *hp;
- int width;
-
- if ( ! (TBL_OPT_BOX & sp->tbl->opts ||
- TBL_OPT_DBOX & sp->tbl->opts))
- return;
-
- tp->flags |= TERMP_NONOSPACE;
- tp->flags |= TERMP_NOSPACE;
+ const struct tbl_cell *c1, *c2;
+ int vert;
+ char line, cross;
- /*
- * Print out the horizontal part of a frame or double frame. A
- * double frame has an unbroken `-' outer line the width of the
- * table, bordered by `+'. The frame (or inner frame, in the
- * case of the double frame) is a `-' bordered by `+' and broken
- * by `+' whenever a span is encountered.
- */
+ line = (kind == 0 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
+ cross = (kind < 2) ? '+' : '-';
- if (TBL_OPT_DBOX & sp->tbl->opts) {
+ if (kind)
term_word(tp, "+");
- for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
- tbl_char(tp, '-', width);
+ c1 = sp->layout->first;
+ c2 = sp->prev == NULL ? NULL : sp->prev->layout->first;
+ if (c2 == c1)
+ c2 = NULL;
+ for (;;) {
+ tbl_char(tp, line, tp->tbl.cols[c1->col].width + 1);
+ vert = c1->vert;
+ if ((c1 = c1->next) == NULL)
+ break;
+ if (c2 != NULL) {
+ if (vert < c2->vert)
+ vert = c2->vert;
+ c2 = c2->next;
}
+ if (vert)
+ tbl_char(tp, cross, vert);
+ if (vert < 2)
+ tbl_char(tp, line, 2 - vert);
+ }
+ if (kind) {
term_word(tp, "+");
term_flushln(tp);
}
-
- term_word(tp, "+");
- for (hp = sp->head; hp; hp = hp->next) {
- width = tp->tbl[hp->ident].width;
- switch (hp->pos) {
- case (TBL_HEAD_DATA):
- tbl_char(tp, '-', width);
- break;
- default:
- tbl_char(tp, '+', width);
- break;
- }
- }
- term_word(tp, "+");
- term_flushln(tp);
}
static void
-tbl_data(struct termp *tp, const struct tbl *tbl,
- const struct tbl_dat *dp,
- const struct termp_tbl *tbp)
+tbl_data(struct termp *tp, const struct tbl_opts *opts,
+ const struct tbl_dat *dp,
+ const struct roffcol *col)
{
- enum tbl_cellt pos;
- if (NULL == dp) {
- tbl_char(tp, ASCII_NBRSP, tbp->width);
+ if (dp == NULL) {
+ tbl_char(tp, ASCII_NBRSP, col->width);
return;
}
switch (dp->pos) {
- case (TBL_DATA_HORIZ):
- /* FALLTHROUGH */
- case (TBL_DATA_DHORIZ):
- tbl_data_spanner(tp, dp, tbp);
+ case TBL_DATA_NONE:
+ tbl_char(tp, ASCII_NBRSP, col->width);
+ return;
+ case TBL_DATA_HORIZ:
+ case TBL_DATA_NHORIZ:
+ tbl_char(tp, '-', col->width);
+ return;
+ case TBL_DATA_NDHORIZ:
+ case TBL_DATA_DHORIZ:
+ tbl_char(tp, '=', col->width);
return;
default:
break;
}
-
- pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT;
-
- switch (pos) {
- case (TBL_CELL_HORIZ):
- /* FALLTHROUGH */
- case (TBL_CELL_DHORIZ):
- tbl_data_spanner(tp, dp, tbp);
+
+ switch (dp->layout->pos) {
+ case TBL_CELL_HORIZ:
+ tbl_char(tp, '-', col->width);
break;
- case (TBL_CELL_LONG):
- /* FALLTHROUGH */
- case (TBL_CELL_CENTRE):
- /* FALLTHROUGH */
- case (TBL_CELL_LEFT):
- /* FALLTHROUGH */
- case (TBL_CELL_RIGHT):
- tbl_data_literal(tp, dp, tbp);
+ case TBL_CELL_DHORIZ:
+ tbl_char(tp, '=', col->width);
break;
- case (TBL_CELL_NUMBER):
- tbl_data_number(tp, tbl, dp, tbp);
+ case TBL_CELL_LONG:
+ case TBL_CELL_CENTRE:
+ case TBL_CELL_LEFT:
+ case TBL_CELL_RIGHT:
+ tbl_literal(tp, dp, col);
break;
- default:
- abort();
- /* NOTREACHED */
- }
-}
-static void
-tbl_spanner(struct termp *tp, const struct tbl_head *hp)
-{
-
- switch (hp->pos) {
- case (TBL_HEAD_VERT):
- term_word(tp, "|");
+ case TBL_CELL_NUMBER:
+ tbl_number(tp, opts, dp, col);
break;
- case (TBL_HEAD_DVERT):
- term_word(tp, "||");
+ case TBL_CELL_DOWN:
+ tbl_char(tp, ASCII_NBRSP, col->width);
break;
default:
- break;
+ abort();
}
}
static void
-tbl_vframe(struct termp *tp, const struct tbl *tbl)
+tbl_char(struct termp *tp, char c, size_t len)
{
- /* 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)
-{
- int i, sz;
+ size_t i, sz;
char cp[2];
cp[0] = c;
}
static void
-tbl_data_spanner(struct termp *tp,
- const struct tbl_dat *dp,
- const struct termp_tbl *tblp)
-{
-
- 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;
- }
-}
-
-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, ssz;
- enum tbl_cellt pos;
+ size_t len, padl, padr, width;
+ int ic, spans;
- padl = padr = 0;
+ assert(dp->string);
+ len = term_strlen(tp, dp->string);
+ width = col->width;
+ ic = dp->layout->col;
+ spans = dp->spans;
+ while (spans--)
+ width += tp->tbl.cols[++ic].width + 3;
- pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT;
- ssz = term_len(tp, 1);
+ padr = width > len ? width - len : 0;
+ padl = 0;
- switch (pos) {
- case (TBL_CELL_LONG):
- padl = ssz;
- padr = tblp->width - term_strlen(tp, dp->string) - ssz;
+ switch (dp->layout->pos) {
+ case TBL_CELL_LONG:
+ padl = term_len(tp, 1);
+ padr = padr > padl ? padr - padl : 0;
break;
- case (TBL_CELL_CENTRE):
- padl = tblp->width - term_strlen(tp, dp->string);
- if (padl % 2)
- padr++;
- padl /= 2;
- padr += padl;
+ case TBL_CELL_CENTRE:
+ if (2 > padr)
+ break;
+ padl = padr / 2;
+ padr -= padl;
break;
- case (TBL_CELL_RIGHT):
- padl = tblp->width - term_strlen(tp, dp->string);
+ case TBL_CELL_RIGHT:
+ padl = padr;
+ padr = 0;
break;
default:
- padr = tblp->width - term_strlen(tp, dp->string);
break;
}
tbl_char(tp, ASCII_NBRSP, padl);
- term_word(tp, dp->string);
+ tbl_word(tp, dp);
tbl_char(tp, ASCII_NBRSP, padr);
}
static void
-tbl_data_number(struct termp *tp, const struct tbl *tbl,
+tbl_number(struct termp *tp, const struct tbl_opts *opts,
const struct tbl_dat *dp,
- const struct termp_tbl *tblp)
+ const struct roffcol *col)
{
- char *decp, buf[2];
- int d, padl, sz, psz, ssz, i;
+ 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 = term_strlen(tp, dp->string);
- psz = term_strlen(tp, ".");
-
- if (NULL != (decp = strchr(dp->string, tbl->decimal))) {
- buf[1] = '\0';
- for (ssz = i = 0; decp != &dp->string[i]; i++) {
- buf[0] = dp->string[i];
- ssz += term_strlen(tp, buf);
- }
- d = ssz + psz;
- } else
- d = sz + psz;
-
- assert(d <= tblp->decimal);
- assert(sz - d <= tblp->width - tblp->decimal);
-
- padl = tblp->decimal - d + term_len(tp, 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(struct termp *tp, const struct tbl_span *sp)
-{
- const struct tbl_dat *dp;
- const struct tbl_head *hp;
- struct termp_tbl *p;
-
- /* Calculate width as the max of column cells' widths. */
-
- hp = sp->head;
-
- 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 = &tp->tbl[dp->layout->head->ident];
- tbl_calc_data(tp, sp->tbl, dp, p);
- }
- }
-
- /* Calculate width as the simple spanner value. */
-
- for ( ; hp; hp = hp->next)
- switch (hp->pos) {
- case (TBL_HEAD_VERT):
- tp->tbl[hp->ident].width = term_len(tp, 1);
- break;
- case (TBL_HEAD_DVERT):
- tp->tbl[hp->ident].width = term_len(tp, 2);
- break;
- default:
- break;
- }
-}
-
-static void
-tbl_calc_data(struct termp *tp, 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(tp, dp, tblp);
- break;
- case (TBL_CELL_NUMBER):
- tbl_calc_data_number(tp, tbl, dp, tblp);
- break;
- default:
- abort();
- /* NOTREACHED */
- }
-}
-
-static void
-tbl_calc_data_number(struct termp *tp, const struct tbl *tbl,
- const struct tbl_dat *dp, struct termp_tbl *tblp)
-{
- int sz, d, psz, i, ssz;
- char *cp, buf[2];
+ assert(dp->string);
- /*
- * 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.
- */
+ sz = term_strlen(tp, dp->string);
- /* TODO: use spacing modifier. */
+ buf[0] = opts->decimal;
+ buf[1] = '\0';
- assert(dp->string);
- sz = term_strlen(tp, dp->string);
- psz = term_strlen(tp, ".");
+ psz = term_strlen(tp, buf);
- if (NULL != (cp = strchr(dp->string, tbl->decimal))) {
- buf[1] = '\0';
- for (ssz = i = 0; cp != &dp->string[i]; i++) {
+ if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
+ for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
buf[0] = dp->string[i];
ssz += term_strlen(tp, buf);
}
} else
d = sz + psz;
- sz += term_len(tp, 2);
-
- if (tblp->decimal > d) {
- sz += tblp->decimal - d;
- d = tblp->decimal;
+ if (col->decimal > d && col->width > sz) {
+ padl = col->decimal - d;
+ if (padl + sz > col->width)
+ padl = col->width - sz;
+ tbl_char(tp, ASCII_NBRSP, padl);
} else
- tblp->width += d - tblp->decimal;
-
- if (sz > tblp->width)
- tblp->width = sz;
- if (d > tblp->decimal)
- tblp->decimal = d;
+ padl = 0;
+ tbl_word(tp, dp);
+ if (col->width > sz + padl)
+ tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
}
static void
-tbl_calc_data_literal(struct termp *tp,
- const struct tbl_dat *dp,
- struct termp_tbl *tblp)
+tbl_word(struct termp *tp, const struct tbl_dat *dp)
{
- int sz, bufsz;
+ int prev_font;
- /*
- * 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).
- */
+ prev_font = tp->fonti;
+ if (dp->layout->flags & TBL_CELL_BOLD)
+ term_fontpush(tp, TERMFONT_BOLD);
+ else if (dp->layout->flags & TBL_CELL_ITALIC)
+ term_fontpush(tp, TERMFONT_UNDER);
- assert(dp->string);
- sz = term_strlen(tp, 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;
+ term_word(tp, dp->string);
- sz += bufsz;
- if (tblp->width < sz)
- tblp->width = sz;
+ term_fontpopq(tp, prev_font);
}
git.ckatri.com / mandoc.git / blobdiff