-/* $Id: tbl_term.c,v 1.24 2012/05/27 18:02:49 schwarze Exp $ */
+/* $Id: tbl_term.c,v 1.60 2018/08/19 23:10:28 schwarze Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2018 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 <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "out.h"
#include "term.h"
+#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \
+ (cp)->pos == TBL_CELL_DHORIZ)
+
static size_t term_tbl_len(size_t, void *);
static size_t term_tbl_strlen(const char *, void *);
+static size_t term_tbl_sulen(const struct roffsu *, void *);
static void tbl_char(struct termp *, char, size_t);
-static void tbl_data(struct termp *, const struct tbl *,
- const struct tbl_dat *,
+static void tbl_data(struct termp *, const struct tbl_opts *,
+ const struct tbl_cell *,
+ const struct tbl_dat *,
const struct roffcol *);
-static size_t tbl_rulewidth(struct termp *, const struct tbl_head *);
-static void tbl_hframe(struct termp *, const struct tbl_span *, int);
-static void tbl_literal(struct termp *, const struct tbl_dat *,
+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 *,
+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 *);
-static void tbl_vrule(struct termp *, const struct tbl_head *);
+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)
+term_tbl_sulen(const struct roffsu *su, void *arg)
{
+ int i;
- return(term_strlen((const struct termp *)arg, p));
+ i = term_hen((const struct termp *)arg, su);
+ return i > 0 ? i : 0;
}
static size_t
-term_tbl_len(size_t sz, void *arg)
+term_tbl_strlen(const char *p, void *arg)
{
+ return term_strlen((const struct termp *)arg, p);
+}
- return(term_len((const struct termp *)arg, sz));
+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_cell *cp, *cpn, *cpp;
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;
+ static size_t offset;
+ size_t coloff, tsz;
+ int ic, horiz, spans, vert, more;
+ char fc;
/* Inhibit printing of spaces: we do padding ourselves. */
- tp->flags |= TERMP_NONOSPACE;
- tp->flags |= TERMP_NOSPACE;
+ tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE;
/*
* The first time we're invoked for a given table block,
* calculate the table widths and decimal positions.
*/
- if (TBL_SPAN_FIRST & sp->flags) {
- term_flushln(tp);
-
+ if (tp->tbl.cols == NULL) {
tp->tbl.len = term_tbl_len;
tp->tbl.slen = term_tbl_strlen;
+ tp->tbl.sulen = term_tbl_sulen;
tp->tbl.arg = tp;
- tblcalc(&tp->tbl, sp);
- }
+ tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin);
- /* Horizontal frame at the start of boxed tables. */
+ /* Tables leak .ta settings to subsequent text. */
- if (TBL_SPAN_FIRST & sp->flags) {
- if (TBL_OPT_DBOX & sp->tbl->opts)
- tbl_hframe(tp, sp, 1);
- if (TBL_OPT_DBOX & sp->tbl->opts ||
- TBL_OPT_BOX & sp->tbl->opts)
- tbl_hframe(tp, sp, 0);
- }
+ term_tab_set(tp, NULL);
+ coloff = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
+ sp->opts->lvert;
+ for (ic = 0; ic < sp->opts->cols; ic++) {
+ coloff += tp->tbl.cols[ic].width;
+ term_tab_iset(coloff);
+ coloff += tp->tbl.cols[ic].spacing;
+ }
- /* Vertical frame at the start of each row. */
+ /* Center the table as a whole. */
+
+ offset = tp->tcol->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 + 1 < sp->opts->cols; ic++)
+ tsz += tp->tbl.cols[ic].width +
+ tp->tbl.cols[ic].spacing;
+ if (sp->opts->cols)
+ tsz += tp->tbl.cols[sp->opts->cols - 1].width;
+ if (offset + tsz > tp->tcol->rmargin)
+ tsz -= 1;
+ tp->tcol->offset = offset + tp->tcol->rmargin > tsz ?
+ (offset + tp->tcol->rmargin - tsz) / 2 : 0;
+ }
- if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
- term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
- TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");
+ /* Horizontal frame at the start of boxed tables. */
- /*
- * 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.
- */
+ if (sp->opts->opts & TBL_OPT_DBOX)
+ tbl_hrule(tp, sp, 3);
+ if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
+ tbl_hrule(tp, sp, 2);
+ }
+
+ /* Set up the columns. */
+ tp->flags |= TERMP_MULTICOL;
+ horiz = 0;
switch (sp->pos) {
- case (TBL_SPAN_HORIZ):
- /* FALLTHROUGH */
- case (TBL_SPAN_DHORIZ):
- tbl_hrule(tp, sp);
+ case TBL_SPAN_HORIZ:
+ case TBL_SPAN_DHORIZ:
+ horiz = 1;
+ term_setcol(tp, 1);
break;
- case (TBL_SPAN_DATA):
- /* Iterate over template headers. */
- dp = sp->first;
- spans = 0;
- for (hp = sp->head; hp; hp = hp->next) {
+ case TBL_SPAN_DATA:
+ term_setcol(tp, sp->opts->cols + 2);
+ coloff = tp->tcol->offset;
+
+ /* Set up a column for a left vertical frame. */
+
+ if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
+ sp->opts->lvert)
+ coloff++;
+ tp->tcol->rmargin = coloff;
- /*
- * If the current data header is invoked during
- * a spanner ("spans" > 0), don't emit anything
- * at all.
- */
+ /* Set up the data columns. */
- if (--spans >= 0)
+ dp = sp->first;
+ spans = 0;
+ for (ic = 0; ic < sp->opts->cols; ic++) {
+ if (spans == 0) {
+ tp->tcol++;
+ tp->tcol->offset = coloff;
+ }
+ coloff += tp->tbl.cols[ic].width;
+ tp->tcol->rmargin = coloff;
+ if (ic + 1 < sp->opts->cols)
+ coloff += tp->tbl.cols[ic].spacing;
+ if (spans) {
+ spans--;
continue;
+ }
+ if (dp == NULL)
+ continue;
+ spans = dp->spans;
+ if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
+ dp = dp->next;
+ }
- /* Separate columns. */
+ /* Set up a column for a right vertical frame. */
- if (NULL != hp->prev)
- tbl_vrule(tp, hp);
+ tp->tcol++;
+ tp->tcol->offset = coloff + 1;
+ tp->tcol->rmargin = tp->maxrmargin;
- col = &tp->tbl.cols[hp->ident];
- tbl_data(tp, sp->tbl, dp, col);
+ /* Spans may have reduced the number of columns. */
- /*
- * Go to the next data cell and assign the
- * number of subsequent spans, if applicable.
- */
+ tp->lasttcol = tp->tcol - tp->tcols;
- if (dp) {
- spans = dp->spans;
- dp = dp->next;
+ /* Fill the buffers for all data columns. */
+
+ tp->tcol = tp->tcols;
+ cp = cpn = sp->layout->first;
+ dp = sp->first;
+ spans = 0;
+ for (ic = 0; ic < sp->opts->cols; ic++) {
+ if (cpn != NULL) {
+ cp = cpn;
+ cpn = cpn->next;
+ }
+ if (spans) {
+ spans--;
+ continue;
}
+ tp->tcol++;
+ tp->col = 0;
+ tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic);
+ if (dp == NULL)
+ continue;
+ spans = dp->spans;
+ if (cp->pos != TBL_CELL_SPAN)
+ dp = dp->next;
}
break;
}
- /* Vertical frame at the end of each row. */
+ do {
+ /* Print the vertical frame at the start of each row. */
+
+ tp->tcol = tp->tcols;
+ fc = '\0';
+ if (sp->layout->vert ||
+ (sp->next != NULL && sp->next->layout->vert &&
+ sp->next->pos == TBL_SPAN_DATA) ||
+ (sp->prev != NULL && sp->prev->layout->vert &&
+ (horiz || (IS_HORIZ(sp->layout->first) &&
+ !IS_HORIZ(sp->prev->layout->first)))) ||
+ sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))
+ fc = horiz || IS_HORIZ(sp->layout->first) ? '+' : '|';
+ else if (horiz && sp->opts->lvert)
+ fc = '-';
+ if (fc != '\0') {
+ (*tp->advance)(tp, tp->tcols->offset);
+ (*tp->letter)(tp, fc);
+ tp->viscol = tp->tcol->offset + 1;
+ }
- if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
- term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
- TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");
- term_flushln(tp);
+ /* Print the data cells. */
+
+ more = 0;
+ if (horiz) {
+ tbl_hrule(tp, sp, 0);
+ term_flushln(tp);
+ } else {
+ cp = sp->layout->first;
+ cpn = sp->next == NULL ? NULL :
+ sp->next->layout->first;
+ cpp = sp->prev == NULL ? NULL :
+ sp->prev->layout->first;
+ dp = sp->first;
+ spans = 0;
+ for (ic = 0; ic < sp->opts->cols; ic++) {
+
+ /*
+ * Figure out whether to print a
+ * vertical line after this cell
+ * and advance to next layout cell.
+ */
+
+ if (cp != NULL) {
+ vert = cp->vert;
+ switch (cp->pos) {
+ case TBL_CELL_HORIZ:
+ fc = '-';
+ break;
+ case TBL_CELL_DHORIZ:
+ fc = '=';
+ break;
+ default:
+ fc = ' ';
+ break;
+ }
+ } else {
+ vert = 0;
+ fc = ' ';
+ }
+ if (cpp != NULL) {
+ if (vert == 0 &&
+ cp != NULL &&
+ ((IS_HORIZ(cp) &&
+ !IS_HORIZ(cpp)) ||
+ (cp->next != NULL &&
+ cpp->next != NULL &&
+ IS_HORIZ(cp->next) &&
+ !IS_HORIZ(cpp->next))))
+ vert = cpp->vert;
+ cpp = cpp->next;
+ }
+ if (vert == 0 &&
+ sp->opts->opts & TBL_OPT_ALLBOX)
+ vert = 1;
+ if (cpn != NULL) {
+ if (vert == 0)
+ vert = cpn->vert;
+ cpn = cpn->next;
+ }
+ if (cp != NULL)
+ cp = cp->next;
+
+ /*
+ * Skip later cells in a span,
+ * figure out whether to start a span,
+ * and advance to next data cell.
+ */
+
+ if (spans) {
+ spans--;
+ continue;
+ }
+ if (dp != NULL) {
+ spans = dp->spans;
+ if (ic || sp->layout->first->pos
+ != TBL_CELL_SPAN)
+ dp = dp->next;
+ }
+
+ /*
+ * Print one line of text in the cell
+ * and remember whether there is more.
+ */
+
+ tp->tcol++;
+ if (tp->tcol->col < tp->tcol->lastcol)
+ term_flushln(tp);
+ if (tp->tcol->col < tp->tcol->lastcol)
+ more = 1;
+
+ /*
+ * Vertical frames between data cells,
+ * but not after the last column.
+ */
+
+ if (fc == ' ' && ((vert == 0 &&
+ (cp == NULL || !IS_HORIZ(cp))) ||
+ tp->tcol + 1 == tp->tcols + tp->lasttcol))
+ continue;
+
+ if (tp->viscol < tp->tcol->rmargin) {
+ (*tp->advance)(tp, tp->tcol->rmargin
+ - tp->viscol);
+ tp->viscol = tp->tcol->rmargin;
+ }
+ while (tp->viscol < tp->tcol->rmargin +
+ tp->tbl.cols[ic].spacing / 2) {
+ (*tp->letter)(tp, fc);
+ tp->viscol++;
+ }
+
+ if (tp->tcol + 1 == tp->tcols + tp->lasttcol)
+ continue;
+
+ if (fc == ' ' && cp != NULL) {
+ switch (cp->pos) {
+ case TBL_CELL_HORIZ:
+ fc = '-';
+ break;
+ case TBL_CELL_DHORIZ:
+ fc = '=';
+ break;
+ default:
+ break;
+ }
+ }
+ if (tp->tbl.cols[ic].spacing) {
+ (*tp->letter)(tp, fc == ' ' ? '|' :
+ vert ? '+' : fc);
+ tp->viscol++;
+ }
+
+ if (fc != ' ') {
+ if (cp != NULL &&
+ cp->pos == TBL_CELL_HORIZ)
+ fc = '-';
+ else if (cp != NULL &&
+ cp->pos == TBL_CELL_DHORIZ)
+ fc = '=';
+ else
+ fc = ' ';
+ }
+ if (tp->tbl.cols[ic].spacing > 2 &&
+ (vert > 1 || fc != ' ')) {
+ (*tp->letter)(tp, fc == ' ' ? '|' :
+ vert > 1 ? '+' : fc);
+ tp->viscol++;
+ }
+ }
+ }
+
+ /* Print the vertical frame at the end of each row. */
+
+ fc = '\0';
+ if ((sp->layout->last->vert &&
+ sp->layout->last->col + 1 == sp->opts->cols) ||
+ (sp->next != NULL &&
+ sp->next->layout->last->vert &&
+ sp->next->layout->last->col + 1 == sp->opts->cols) ||
+ (sp->prev != NULL &&
+ sp->prev->layout->last->vert &&
+ sp->prev->layout->last->col + 1 == sp->opts->cols &&
+ (horiz || (IS_HORIZ(sp->layout->last) &&
+ !IS_HORIZ(sp->prev->layout->last)))) ||
+ (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))
+ fc = horiz || IS_HORIZ(sp->layout->last) ? '+' : '|';
+ else if (horiz && sp->opts->rvert)
+ fc = '-';
+ if (fc != '\0') {
+ if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 ||
+ sp->layout->last->col + 1 < sp->opts->cols)) {
+ tp->tcol++;
+ (*tp->advance)(tp,
+ tp->tcol->offset > tp->viscol ?
+ tp->tcol->offset - tp->viscol : 1);
+ }
+ (*tp->letter)(tp, fc);
+ }
+ (*tp->endline)(tp);
+ tp->viscol = 0;
+ } while (more);
/*
- * If we're the last row, clean up after ourselves: clear the
- * existing table configuration and set it to NULL.
+ * Clean up after this row. If it is the last line
+ * of the table, print the box line and clean up
+ * column data; otherwise, print the allbox line.
*/
- if (TBL_SPAN_LAST & sp->flags) {
- if (TBL_OPT_DBOX & sp->tbl->opts ||
- TBL_OPT_BOX & sp->tbl->opts) {
- tbl_hframe(tp, sp, 0);
+ term_setcol(tp, 1);
+ tp->flags &= ~TERMP_MULTICOL;
+ tp->tcol->rmargin = tp->maxrmargin;
+ if (sp->next == NULL) {
+ if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
+ tbl_hrule(tp, sp, 2);
tp->skipvsp = 1;
}
- if (TBL_OPT_DBOX & sp->tbl->opts) {
- tbl_hframe(tp, sp, 1);
+ if (sp->opts->opts & TBL_OPT_DBOX) {
+ tbl_hrule(tp, sp, 3);
tp->skipvsp = 2;
}
assert(tp->tbl.cols);
free(tp->tbl.cols);
tp->tbl.cols = NULL;
- }
+ tp->tcol->offset = offset;
+ } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX &&
+ (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA ||
+ sp->next->next != NULL))
+ tbl_hrule(tp, sp, 1);
tp->flags &= ~TERMP_NONOSPACE;
- tp->rmargin = rmargin;
- tp->maxrmargin = maxrmargin;
-
-}
-
-/*
- * Horizontal rules extend across the entire table.
- * Calculate the width by iterating over columns.
- */
-static size_t
-tbl_rulewidth(struct termp *tp, const struct tbl_head *hp)
-{
- size_t width;
-
- width = tp->tbl.cols[hp->ident].width;
-
- /* Account for leading blanks. */
- if (hp->prev)
- width += 2 - hp->vert;
-
- /* Account for trailing blank. */
- width++;
-
- return(width);
}
/*
- * Rules inside the table can be single or double
- * and have crossings with vertical rules marked with pluses.
+ * Kinds of horizontal rulers:
+ * 0: inside the table (single or double line with crossings)
+ * 1: inside the table (single or double line with crossings and ends)
+ * 2: inner frame (single line with crossings and ends)
+ * 3: outer frame (single line without crossings with ends)
*/
static void
-tbl_hrule(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;
- char c;
-
- c = '-';
- if (TBL_SPAN_DHORIZ == sp->pos)
- c = '=';
-
- for (hp = sp->head; hp; hp = hp->next) {
- if (hp->prev && hp->vert)
- tbl_char(tp, '+', hp->vert);
- tbl_char(tp, c, tbl_rulewidth(tp, hp));
+ const struct tbl_cell *cp, *cpn, *cpp;
+ const struct roffcol *col;
+ int vert;
+ char cross, line, stdcross, stdline;
+
+ stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
+ stdcross = (kind < 3) ? '+' : '-';
+
+ cp = sp->layout->first;
+ cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first;
+ if (cpp == cp)
+ cpp = NULL;
+ cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first;
+ if (cpn == cp)
+ cpn = NULL;
+ if (kind)
+ term_word(tp,
+ cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|");
+ for (;;) {
+ col = tp->tbl.cols + cp->col;
+ if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) {
+ line = stdline;
+ cross = stdcross;
+ } else {
+ line = ' ';
+ cross = (kind < 3) ? '|' : ' ';
+ }
+ tbl_char(tp, line, col->width + col->spacing / 2);
+ vert = cp->vert;
+ if ((cp = cp->next) == NULL)
+ break;
+ if (cpp != NULL) {
+ if (vert < cpp->vert)
+ vert = cpp->vert;
+ cpp = cpp->next;
+ }
+ if (cpn != NULL) {
+ if (vert < cpn->vert)
+ vert = cpn->vert;
+ cpn = cpn->next;
+ }
+ if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) {
+ line = stdline;
+ cross = stdcross;
+ } else
+ line = ' ';
+ if (sp->opts->opts & TBL_OPT_ALLBOX && !vert)
+ vert = 1;
+ if (col->spacing)
+ tbl_char(tp, vert ? cross : line, 1);
+ if (col->spacing > 2)
+ tbl_char(tp, vert > 1 ? cross : line, 1);
+ if (col->spacing > 4)
+ tbl_char(tp, line, (col->spacing - 3) / 2);
}
-}
-
-/*
- * Rules above and below the table are always single
- * and have an additional plus at the beginning and end.
- * For double frames, this function is called twice,
- * and the outer one does not have crossings.
- */
-static void
-tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer)
-{
- const struct tbl_head *hp;
-
- term_word(tp, "+");
- for (hp = sp->head; hp; hp = hp->next) {
- if (hp->prev && hp->vert)
- tbl_char(tp, (outer ? '-' : '+'), hp->vert);
- tbl_char(tp, '-', tbl_rulewidth(tp, hp));
+ if (kind) {
+ term_word(tp,
+ cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|");
+ term_flushln(tp);
}
- term_word(tp, "+");
- term_flushln(tp);
}
static void
-tbl_data(struct termp *tp, const struct tbl *tbl,
- const struct tbl_dat *dp,
- const struct roffcol *col)
+tbl_data(struct termp *tp, const struct tbl_opts *opts,
+ const struct tbl_cell *cp, const struct tbl_dat *dp,
+ const struct roffcol *col)
{
-
- if (NULL == dp) {
- tbl_char(tp, ASCII_NBRSP, col->width);
+ switch (cp->pos) {
+ case TBL_CELL_HORIZ:
+ tbl_char(tp, '-', col->width);
+ return;
+ case TBL_CELL_DHORIZ:
+ tbl_char(tp, '=', col->width);
return;
+ default:
+ break;
}
- assert(dp->layout);
+
+ if (dp == NULL)
+ return;
switch (dp->pos) {
- case (TBL_DATA_NONE):
- tbl_char(tp, ASCII_NBRSP, col->width);
+ case TBL_DATA_NONE:
return;
- case (TBL_DATA_HORIZ):
- /* FALLTHROUGH */
- case (TBL_DATA_NHORIZ):
+ case TBL_DATA_HORIZ:
+ case TBL_DATA_NHORIZ:
tbl_char(tp, '-', col->width);
return;
- case (TBL_DATA_NDHORIZ):
- /* FALLTHROUGH */
- case (TBL_DATA_DHORIZ):
+ case TBL_DATA_NDHORIZ:
+ case TBL_DATA_DHORIZ:
tbl_char(tp, '=', col->width);
return;
default:
break;
}
-
- switch (dp->layout->pos) {
- case (TBL_CELL_HORIZ):
- tbl_char(tp, '-', col->width);
- break;
- case (TBL_CELL_DHORIZ):
- 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):
+
+ switch (cp->pos) {
+ case TBL_CELL_LONG:
+ case TBL_CELL_CENTRE:
+ case TBL_CELL_LEFT:
+ case TBL_CELL_RIGHT:
tbl_literal(tp, dp, col);
break;
- case (TBL_CELL_NUMBER):
- tbl_number(tp, tbl, dp, col);
+ case TBL_CELL_NUMBER:
+ tbl_number(tp, opts, dp, col);
break;
- case (TBL_CELL_DOWN):
- tbl_char(tp, ASCII_NBRSP, col->width);
+ case TBL_CELL_DOWN:
+ case TBL_CELL_SPAN:
break;
default:
abort();
- /* NOTREACHED */
}
}
-static void
-tbl_vrule(struct termp *tp, const struct tbl_head *hp)
-{
-
- tbl_char(tp, ASCII_NBRSP, 1);
- if (0 < hp->vert)
- tbl_char(tp, '|', hp->vert);
- if (2 > hp->vert)
- tbl_char(tp, ASCII_NBRSP, 2 - hp->vert);
-}
-
static void
tbl_char(struct termp *tp, char c, size_t len)
{
}
static void
-tbl_literal(struct termp *tp, const struct tbl_dat *dp,
+tbl_literal(struct termp *tp, const struct tbl_dat *dp,
const struct roffcol *col)
{
- struct tbl_head *hp;
- size_t width, len, padl, padr;
- int spans;
+ size_t len, padl, padr, width;
+ int ic, spans;
assert(dp->string);
len = term_strlen(tp, dp->string);
-
- hp = dp->layout->head->next;
width = col->width;
- for (spans = dp->spans; spans--; hp = hp->next)
- width += tp->tbl.cols[hp->ident].width + 3;
+ ic = dp->layout->col;
+ spans = dp->spans;
+ while (spans--)
+ width += tp->tbl.cols[++ic].width + 3;
padr = width > len ? width - len : 0;
padl = 0;
switch (dp->layout->pos) {
- case (TBL_CELL_LONG):
+ case TBL_CELL_LONG:
padl = term_len(tp, 1);
padr = padr > padl ? padr - padl : 0;
break;
- case (TBL_CELL_CENTRE):
+ case TBL_CELL_CENTRE:
if (2 > padr)
break;
padl = padr / 2;
padr -= padl;
break;
- case (TBL_CELL_RIGHT):
+ case TBL_CELL_RIGHT:
padl = padr;
padr = 0;
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_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 roffcol *col)
{
- char *cp;
+ const char *cp, *lastdigit, *lastpoint;
+ size_t intsz, padl, totsz;
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.
+ * Almost the same code as in tblcalc_number():
+ * First find the position of the decimal point.
*/
assert(dp->string);
+ lastdigit = lastpoint = NULL;
+ for (cp = dp->string; cp[0] != '\0'; cp++) {
+ if (cp[0] == '\\' && cp[1] == '&') {
+ lastdigit = lastpoint = cp;
+ break;
+ } else if (cp[0] == opts->decimal &&
+ (isdigit((unsigned char)cp[1]) ||
+ (cp > dp->string && isdigit((unsigned char)cp[-1]))))
+ lastpoint = cp;
+ else if (isdigit((unsigned char)cp[0]))
+ lastdigit = cp;
+ }
- sz = term_strlen(tp, dp->string);
+ /* Then measure both widths. */
- buf[0] = tbl->decimal;
- buf[1] = '\0';
+ padl = 0;
+ totsz = term_strlen(tp, dp->string);
+ if (lastdigit != NULL) {
+ if (lastpoint == NULL)
+ lastpoint = lastdigit + 1;
+ intsz = 0;
+ buf[1] = '\0';
+ for (cp = dp->string; cp < lastpoint; cp++) {
+ buf[0] = cp[0];
+ intsz += term_strlen(tp, buf);
+ }
- psz = term_strlen(tp, buf);
+ /*
+ * Pad left to match the decimal position,
+ * but avoid exceeding the total column width.
+ */
- 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);
+ if (col->decimal > intsz && col->width > totsz) {
+ padl = col->decimal - intsz;
+ if (padl + totsz > col->width)
+ padl = col->width - totsz;
}
- d = ssz + psz;
- } else
- d = sz + psz;
- padl = col->decimal - d;
+ /* If it is not a number, simply center the string. */
+
+ } else if (col->width > totsz)
+ padl = (col->width - totsz) / 2;
tbl_char(tp, ASCII_NBRSP, padl);
- term_word(tp, dp->string);
- if (col->width > sz + padl)
- tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
+ tbl_word(tp, dp);
+
+ /* Pad right to fill the column. */
+
+ if (col->width > padl + totsz)
+ tbl_char(tp, ASCII_NBRSP, col->width - padl - totsz);
}
+static void
+tbl_word(struct termp *tp, const struct tbl_dat *dp)
+{
+ int prev_font;
+
+ 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);
+
+ term_word(tp, dp->string);
+
+ term_fontpopq(tp, prev_font);
+}
git.ckatri.com / mandoc.git / blobdiff