-/* $Id: tbl_term.c,v 1.59 2018/08/19 19:32:21 schwarze Exp $ */
+/* $Id: tbl_term.c,v 1.75 2021/08/10 12:55:04 schwarze Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2021 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 <sys/types.h>
#include <assert.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "mandoc.h"
+#include "tbl.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_opts *,
const struct tbl_cell *,
const struct tbl_dat *,
const struct roffcol *);
+static void tbl_direct_border(struct termp *, int, size_t);
+static void tbl_fill_border(struct termp *, int, size_t);
+static void tbl_fill_char(struct termp *, char, size_t);
+static void tbl_fill_string(struct termp *, const char *, size_t);
+static void tbl_hrule(struct termp *, const struct tbl_span *,
+ const struct tbl_span *, const struct tbl_span *,
+ int);
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 *);
+/*
+ * The following border-character tables are indexed
+ * by ternary (3-based) numbers, as opposed to binary or decimal.
+ * Each ternary digit describes the line width in one direction:
+ * 0 means no line, 1 single or light line, 2 double or heavy line.
+ */
+
+/* Positional values of the four directions. */
+#define BRIGHT 1
+#define BDOWN 3
+#define BLEFT (3 * 3)
+#define BUP (3 * 3 * 3)
+#define BHORIZ (BLEFT + BRIGHT)
+
+/* Code points to use for each combination of widths. */
+static const int borders_utf8[81] = {
+ 0x0020, 0x2576, 0x257a, /* 000 right */
+ 0x2577, 0x250c, 0x250d, /* 001 down */
+ 0x257b, 0x250e, 0x250f, /* 002 */
+ 0x2574, 0x2500, 0x257c, /* 010 left */
+ 0x2510, 0x252c, 0x252e, /* 011 left down */
+ 0x2512, 0x2530, 0x2532, /* 012 */
+ 0x2578, 0x257e, 0x2501, /* 020 left */
+ 0x2511, 0x252d, 0x252f, /* 021 left down */
+ 0x2513, 0x2531, 0x2533, /* 022 */
+ 0x2575, 0x2514, 0x2515, /* 100 up */
+ 0x2502, 0x251c, 0x251d, /* 101 up down */
+ 0x257d, 0x251f, 0x2522, /* 102 */
+ 0x2518, 0x2534, 0x2536, /* 110 up left */
+ 0x2524, 0x253c, 0x253e, /* 111 all */
+ 0x2527, 0x2541, 0x2546, /* 112 */
+ 0x2519, 0x2535, 0x2537, /* 120 up left */
+ 0x2525, 0x253d, 0x253f, /* 121 all */
+ 0x252a, 0x2545, 0x2548, /* 122 */
+ 0x2579, 0x2516, 0x2517, /* 200 up */
+ 0x257f, 0x251e, 0x2521, /* 201 up down */
+ 0x2503, 0x2520, 0x2523, /* 202 */
+ 0x251a, 0x2538, 0x253a, /* 210 up left */
+ 0x2526, 0x2540, 0x2544, /* 211 all */
+ 0x2528, 0x2542, 0x254a, /* 212 */
+ 0x251b, 0x2539, 0x253b, /* 220 up left */
+ 0x2529, 0x2543, 0x2547, /* 221 all */
+ 0x252b, 0x2549, 0x254b, /* 222 */
+};
+
+/* ASCII approximations for these code points, compatible with groff. */
+static const int borders_ascii[81] = {
+ ' ', '-', '=', /* 000 right */
+ '|', '+', '+', /* 001 down */
+ '|', '+', '+', /* 002 */
+ '-', '-', '=', /* 010 left */
+ '+', '+', '+', /* 011 left down */
+ '+', '+', '+', /* 012 */
+ '=', '=', '=', /* 020 left */
+ '+', '+', '+', /* 021 left down */
+ '+', '+', '+', /* 022 */
+ '|', '+', '+', /* 100 up */
+ '|', '+', '+', /* 101 up down */
+ '|', '+', '+', /* 102 */
+ '+', '+', '+', /* 110 up left */
+ '+', '+', '+', /* 111 all */
+ '+', '+', '+', /* 112 */
+ '+', '+', '+', /* 120 up left */
+ '+', '+', '+', /* 121 all */
+ '+', '+', '+', /* 122 */
+ '|', '+', '+', /* 200 up */
+ '|', '+', '+', /* 201 up down */
+ '|', '+', '+', /* 202 */
+ '+', '+', '+', /* 210 up left */
+ '+', '+', '+', /* 211 all */
+ '+', '+', '+', /* 212 */
+ '+', '+', '+', /* 220 up left */
+ '+', '+', '+', /* 221 all */
+ '+', '+', '+', /* 222 */
+};
+
+/* Either of the above according to the selected output encoding. */
+static const int *borders_locale;
+
+
static size_t
term_tbl_sulen(const struct roffsu *su, void *arg)
{
return term_len((const struct termp *)arg, sz);
}
+
void
term_tbl(struct termp *tp, const struct tbl_span *sp)
{
- const struct tbl_cell *cp, *cpn, *cpp;
+ const struct tbl_cell *cp, *cpn, *cpp, *cps;
const struct tbl_dat *dp;
static size_t offset;
+ size_t save_offset;
size_t coloff, tsz;
- int ic, horiz, spans, vert, more;
- char fc;
+ int hspans, ic, more;
+ int dvert, fc, horiz, lhori, rhori, uvert;
/* Inhibit printing of spaces: we do padding ourselves. */
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE;
+ save_offset = tp->tcol->offset;
/*
* The first time we're invoked for a given table block,
*/
if (tp->tbl.cols == NULL) {
+ borders_locale = tp->enc == TERMENC_UTF8 ?
+ borders_utf8 : borders_ascii;
+
tp->tbl.len = term_tbl_len;
tp->tbl.slen = term_tbl_strlen;
tp->tbl.sulen = term_tbl_sulen;
tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin);
- /* Tables leak .ta settings to subsequent text. */
-
- 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;
- }
-
/* Center the table as a whole. */
offset = tp->tcol->offset;
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 = offset + tp->tcol->rmargin > tsz ?
(offset + tp->tcol->rmargin - tsz) / 2 : 0;
+ tp->tcol->offset = offset;
}
/* Horizontal frame at the start of boxed tables. */
- if (sp->opts->opts & TBL_OPT_DBOX)
- tbl_hrule(tp, sp, 3);
+ if (tp->enc == TERMENC_ASCII &&
+ sp->opts->opts & TBL_OPT_DBOX)
+ tbl_hrule(tp, NULL, sp, sp, TBL_OPT_DBOX);
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
- tbl_hrule(tp, sp, 2);
+ tbl_hrule(tp, NULL, sp, sp, TBL_OPT_BOX);
}
/* Set up the columns. */
tp->flags |= TERMP_MULTICOL;
+ tp->tcol->offset = offset;
horiz = 0;
switch (sp->pos) {
case TBL_SPAN_HORIZ:
/* Set up the data columns. */
dp = sp->first;
- spans = 0;
+ hspans = 0;
for (ic = 0; ic < sp->opts->cols; ic++) {
- if (spans == 0) {
+ if (hspans == 0) {
tp->tcol++;
tp->tcol->offset = coloff;
}
tp->tcol->rmargin = coloff;
if (ic + 1 < sp->opts->cols)
coloff += tp->tbl.cols[ic].spacing;
- if (spans) {
- spans--;
+ if (hspans) {
+ hspans--;
continue;
}
- if (dp == NULL)
- continue;
- spans = dp->spans;
- if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
+ if (dp != NULL &&
+ (ic || sp->layout->first->pos != TBL_CELL_SPAN)) {
+ hspans = dp->hspans;
dp = dp->next;
+ }
}
/* Set up a column for a right vertical frame. */
tp->tcol = tp->tcols;
cp = cpn = sp->layout->first;
dp = sp->first;
- spans = 0;
+ hspans = 0;
for (ic = 0; ic < sp->opts->cols; ic++) {
if (cpn != NULL) {
cp = cpn;
cpn = cpn->next;
}
- if (spans) {
- spans--;
+ if (hspans) {
+ hspans--;
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)
+ if (dp != NULL &&
+ (ic || sp->layout->first->pos != TBL_CELL_SPAN)) {
+ hspans = dp->hspans;
dp = dp->next;
+ }
}
break;
}
/* 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') {
+ uvert = dvert = sp->opts->opts & TBL_OPT_DBOX ? 2 :
+ sp->opts->opts & TBL_OPT_BOX ? 1 : 0;
+ if (sp->pos == TBL_SPAN_DATA && uvert < sp->layout->vert)
+ uvert = dvert = sp->layout->vert;
+ if (sp->next != NULL && sp->next->pos == TBL_SPAN_DATA &&
+ dvert < sp->next->layout->vert)
+ dvert = sp->next->layout->vert;
+ if (sp->prev != NULL && uvert < sp->prev->layout->vert &&
+ (horiz || (IS_HORIZ(sp->layout->first) &&
+ !IS_HORIZ(sp->prev->layout->first))))
+ uvert = sp->prev->layout->vert;
+ rhori = sp->pos == TBL_SPAN_DHORIZ ||
+ (sp->first != NULL && sp->first->pos == TBL_DATA_DHORIZ) ||
+ sp->layout->first->pos == TBL_CELL_DHORIZ ? 2 :
+ sp->pos == TBL_SPAN_HORIZ ||
+ (sp->first != NULL && sp->first->pos == TBL_DATA_HORIZ) ||
+ sp->layout->first->pos == TBL_CELL_HORIZ ? 1 : 0;
+ fc = BUP * uvert + BDOWN * dvert + BRIGHT * rhori;
+ if (uvert > 0 || dvert > 0 || (horiz && sp->opts->lvert)) {
(*tp->advance)(tp, tp->tcols->offset);
- (*tp->letter)(tp, fc);
- tp->viscol = tp->tcol->offset + 1;
+ tp->viscol = tp->tcol->offset;
+ tbl_direct_border(tp, fc, 1);
}
/* Print the data cells. */
more = 0;
- if (horiz) {
- tbl_hrule(tp, sp, 0);
- term_flushln(tp);
- } else {
+ if (horiz)
+ tbl_hrule(tp, sp->prev, sp, sp->next, 0);
+ 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;
+ hspans = 0;
for (ic = 0; ic < sp->opts->cols; ic++) {
/*
* and advance to next layout cell.
*/
+ uvert = dvert = fc = 0;
if (cp != NULL) {
- vert = cp->vert;
+ cps = cp;
+ while (cps->next != NULL &&
+ cps->next->pos == TBL_CELL_SPAN)
+ cps = cps->next;
+ if (sp->pos == TBL_SPAN_DATA)
+ uvert = dvert = cps->vert;
switch (cp->pos) {
case TBL_CELL_HORIZ:
- fc = '-';
+ fc = BHORIZ;
break;
case TBL_CELL_DHORIZ:
- fc = '=';
+ fc = BHORIZ * 2;
break;
default:
- fc = ' ';
break;
}
- } else {
- vert = 0;
- fc = ' ';
}
if (cpp != NULL) {
- if (vert == 0 &&
+ if (uvert < cpp->vert &&
cp != NULL &&
((IS_HORIZ(cp) &&
!IS_HORIZ(cpp)) ||
cpp->next != NULL &&
IS_HORIZ(cp->next) &&
!IS_HORIZ(cpp->next))))
- vert = cpp->vert;
+ uvert = cpp->vert;
cpp = cpp->next;
}
- if (vert == 0 &&
- sp->opts->opts & TBL_OPT_ALLBOX)
- vert = 1;
+ if (sp->opts->opts & TBL_OPT_ALLBOX) {
+ if (uvert == 0)
+ uvert = 1;
+ if (dvert == 0)
+ dvert = 1;
+ }
if (cpn != NULL) {
- if (vert == 0)
- vert = cpn->vert;
+ if (dvert == 0 ||
+ (dvert < cpn->vert &&
+ tp->enc == TERMENC_UTF8))
+ dvert = cpn->vert;
cpn = cpn->next;
}
- if (cp != NULL)
- cp = cp->next;
+
+ lhori = (cp != NULL &&
+ cp->pos == TBL_CELL_DHORIZ) ||
+ (dp != NULL &&
+ dp->pos == TBL_DATA_DHORIZ) ? 2 :
+ (cp != NULL &&
+ cp->pos == TBL_CELL_HORIZ) ||
+ (dp != NULL &&
+ dp->pos == TBL_DATA_HORIZ) ? 1 : 0;
/*
* Skip later cells in a span,
* and advance to next data cell.
*/
- if (spans) {
- spans--;
+ if (hspans) {
+ hspans--;
+ cp = cp->next;
continue;
}
- if (dp != NULL) {
- spans = dp->spans;
- if (ic || sp->layout->first->pos
- != TBL_CELL_SPAN)
- dp = dp->next;
+ if (dp != NULL && (ic ||
+ sp->layout->first->pos != TBL_CELL_SPAN)) {
+ hspans = dp->hspans;
+ dp = dp->next;
}
/*
* but not after the last column.
*/
- if (fc == ' ' && ((vert == 0 &&
- (cp == NULL || !IS_HORIZ(cp))) ||
- tp->tcol + 1 == tp->tcols + tp->lasttcol))
+ if (fc == 0 &&
+ ((uvert == 0 && dvert == 0 &&
+ cp != NULL && (cp->next == NULL ||
+ !IS_HORIZ(cp->next))) ||
+ tp->tcol + 1 ==
+ tp->tcols + tp->lasttcol)) {
+ if (cp != NULL)
+ cp = cp->next;
continue;
+ }
if (tp->viscol < tp->tcol->rmargin) {
(*tp->advance)(tp, tp->tcol->rmargin
tp->viscol = tp->tcol->rmargin;
}
while (tp->viscol < tp->tcol->rmargin +
- tp->tbl.cols[ic].spacing / 2) {
- (*tp->letter)(tp, fc);
- tp->viscol++;
- }
+ tp->tbl.cols[ic].spacing / 2)
+ tbl_direct_border(tp,
+ BHORIZ * lhori, 1);
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 (cp != NULL)
+ cp = cp->next;
+
+ rhori = (cp != NULL &&
+ cp->pos == TBL_CELL_DHORIZ) ||
+ (dp != NULL &&
+ dp->pos == TBL_DATA_DHORIZ) ? 2 :
+ (cp != NULL &&
+ cp->pos == TBL_CELL_HORIZ) ||
+ (dp != NULL &&
+ dp->pos == TBL_DATA_HORIZ) ? 1 : 0;
+
+ if (tp->tbl.cols[ic].spacing)
+ tbl_direct_border(tp,
+ BLEFT * lhori + BRIGHT * rhori +
+ BUP * uvert + BDOWN * dvert, 1);
+
+ if (tp->enc == TERMENC_UTF8)
+ uvert = dvert = 0;
- 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++;
- }
+ (uvert > 1 || dvert > 1 || rhori))
+ tbl_direct_border(tp,
+ BHORIZ * rhori +
+ BUP * (uvert > 1) +
+ BDOWN * (dvert > 1), 1);
}
}
/* 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') {
+ uvert = dvert = sp->opts->opts & TBL_OPT_DBOX ? 2 :
+ sp->opts->opts & TBL_OPT_BOX ? 1 : 0;
+ if (sp->pos == TBL_SPAN_DATA &&
+ uvert < sp->layout->last->vert &&
+ sp->layout->last->col + 1 == sp->opts->cols)
+ uvert = dvert = sp->layout->last->vert;
+ if (sp->next != NULL &&
+ dvert < sp->next->layout->last->vert &&
+ sp->next->layout->last->col + 1 == sp->opts->cols)
+ dvert = sp->next->layout->last->vert;
+ if (sp->prev != NULL &&
+ uvert < 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))))
+ uvert = sp->prev->layout->last->vert;
+ lhori = sp->pos == TBL_SPAN_DHORIZ ||
+ (sp->last != NULL &&
+ sp->last->pos == TBL_DATA_DHORIZ &&
+ sp->last->layout->col + 1 == sp->opts->cols) ||
+ (sp->layout->last->pos == TBL_CELL_DHORIZ &&
+ sp->layout->last->col + 1 == sp->opts->cols) ? 2 :
+ sp->pos == TBL_SPAN_HORIZ ||
+ (sp->last != NULL &&
+ sp->last->pos == TBL_DATA_HORIZ &&
+ sp->last->layout->col + 1 == sp->opts->cols) ||
+ (sp->layout->last->pos == TBL_CELL_HORIZ &&
+ sp->layout->last->col + 1 == sp->opts->cols) ? 1 : 0;
+ fc = BUP * uvert + BDOWN * dvert + BLEFT * lhori;
+ if (uvert > 0 || dvert > 0 || (horiz && sp->opts->rvert)) {
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);
+ do {
+ tbl_direct_border(tp,
+ BHORIZ * lhori, 1);
+ } while (tp->viscol < tp->tcol->offset);
}
- (*tp->letter)(tp, fc);
+ tbl_direct_border(tp, fc, 1);
}
(*tp->endline)(tp);
tp->viscol = 0;
tp->tcol->rmargin = tp->maxrmargin;
if (sp->next == NULL) {
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
- tbl_hrule(tp, sp, 2);
+ tbl_hrule(tp, sp, sp, NULL, TBL_OPT_BOX);
tp->skipvsp = 1;
}
- if (sp->opts->opts & TBL_OPT_DBOX) {
- tbl_hrule(tp, sp, 3);
+ if (tp->enc == TERMENC_ASCII &&
+ sp->opts->opts & TBL_OPT_DBOX) {
+ tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX);
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);
+ tbl_hrule(tp, sp, sp, sp->next, TBL_OPT_ALLBOX);
+ tp->tcol->offset = save_offset;
tp->flags &= ~TERMP_NONOSPACE;
}
-/*
- * 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, int kind)
+tbl_hrule(struct termp *tp, const struct tbl_span *spp,
+ const struct tbl_span *sp, const struct tbl_span *spn, int flags)
{
- 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 ? "+" : "|");
+ const struct tbl_cell *cpp; /* Layout cell above this line. */
+ const struct tbl_cell *cp; /* Layout cell in this line. */
+ const struct tbl_cell *cpn; /* Layout cell below this line. */
+ const struct tbl_dat *dpn; /* Data cell below this line. */
+ const struct roffcol *col; /* Contains width and spacing. */
+ int opts; /* For the table as a whole. */
+ int bw; /* Box line width. */
+ int hw; /* Horizontal line width. */
+ int lw, rw; /* Left and right line widths. */
+ int uw, dw; /* Vertical line widths. */
+
+ cpp = spp == NULL ? NULL : spp->layout->first;
+ cp = sp == NULL ? NULL : sp->layout->first;
+ cpn = spn == NULL ? NULL : spn->layout->first;
+ dpn = NULL;
+ if (spn != NULL) {
+ if (spn->pos == TBL_SPAN_DATA)
+ dpn = spn->first;
+ else if (spn->next != NULL)
+ dpn = spn->next->first;
+ }
+ opts = sp->opts->opts;
+ bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) :
+ opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0;
+ hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw :
+ sp->pos == TBL_SPAN_DHORIZ ? 2 : 1;
+
+ /* Print the left end of the line. */
+
+ if (tp->viscol == 0) {
+ (*tp->advance)(tp, tp->tcols->offset);
+ tp->viscol = tp->tcols->offset;
+ }
+ if (flags != 0)
+ tbl_direct_border(tp,
+ (spp == NULL ? 0 : BUP * bw) +
+ (spn == NULL ? 0 : BDOWN * bw) +
+ (spp == NULL || cpn == NULL ||
+ cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1);
+
+ col = tp->tbl.cols;
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 (cp == NULL)
+ col++;
+ else
+ col = tp->tbl.cols + cp->col;
+
+ /* Print the horizontal line inside this column. */
+
+ lw = cpp == NULL || cpn == NULL ||
+ (cpn->pos != TBL_CELL_DOWN &&
+ (dpn == NULL || dpn->string == NULL ||
+ strcmp(dpn->string, "\\^") != 0))
+ ? hw : 0;
+ tbl_direct_border(tp, BHORIZ * lw,
+ col->width + col->spacing / 2);
+
+ /*
+ * Figure out whether a vertical line is crossing
+ * at the end of this column,
+ * and advance to the next column.
+ */
+
+ uw = dw = 0;
if (cpp != NULL) {
- if (vert < cpp->vert)
- vert = cpp->vert;
+ if (flags != TBL_OPT_DBOX) {
+ uw = cpp->vert;
+ if (uw == 0 && opts & TBL_OPT_ALLBOX)
+ uw = 1;
+ }
cpp = cpp->next;
- }
+ } else if (spp != NULL && opts & TBL_OPT_ALLBOX)
+ uw = 1;
+ if (cp != NULL)
+ cp = cp->next;
if (cpn != NULL) {
- if (vert < cpn->vert)
- vert = cpn->vert;
+ if (flags != TBL_OPT_DBOX) {
+ dw = cpn->vert;
+ if (dw == 0 && opts & TBL_OPT_ALLBOX)
+ dw = 1;
+ }
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;
+ while (dpn != NULL && dpn->layout != cpn)
+ dpn = dpn->next;
+ } else if (spn != NULL && opts & TBL_OPT_ALLBOX)
+ dw = 1;
+ if (col + 1 == tp->tbl.cols + sp->opts->cols)
+ break;
+
+ /* Vertical lines do not cross spanned cells. */
+
+ if (cpp != NULL && cpp->pos == TBL_CELL_SPAN)
+ uw = 0;
+ if (cpn != NULL && cpn->pos == TBL_CELL_SPAN)
+ dw = 0;
+
+ /* The horizontal line inside the next column. */
+
+ rw = cpp == NULL || cpn == NULL ||
+ (cpn->pos != TBL_CELL_DOWN &&
+ (dpn == NULL || dpn->string == NULL ||
+ strcmp(dpn->string, "\\^") != 0))
+ ? hw : 0;
+
+ /* The line crossing at the end of this column. */
+
if (col->spacing)
- tbl_char(tp, vert ? cross : line, 1);
+ tbl_direct_border(tp, BLEFT * lw +
+ BRIGHT * rw + BUP * uw + BDOWN * dw, 1);
+
+ /*
+ * In ASCII output, a crossing may print two characters.
+ */
+
+ if (tp->enc != TERMENC_ASCII || (uw < 2 && dw < 2))
+ uw = dw = 0;
if (col->spacing > 2)
- tbl_char(tp, vert > 1 ? cross : line, 1);
+ tbl_direct_border(tp,
+ BHORIZ * rw + BUP * uw + BDOWN * dw, 1);
+
+ /* Padding before the start of the next column. */
+
if (col->spacing > 4)
- tbl_char(tp, line, (col->spacing - 3) / 2);
+ tbl_direct_border(tp,
+ BHORIZ * rw, (col->spacing - 3) / 2);
}
- if (kind) {
- term_word(tp,
- cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|");
- term_flushln(tp);
+
+ /* Print the right end of the line. */
+
+ if (flags != 0) {
+ tbl_direct_border(tp,
+ (spp == NULL ? 0 : BUP * bw) +
+ (spn == NULL ? 0 : BDOWN * bw) +
+ (spp == NULL || spn == NULL ||
+ spn->layout->last->pos != TBL_CELL_DOWN ?
+ BLEFT * hw : 0), 1);
+ (*tp->endline)(tp);
+ tp->viscol = 0;
}
}
{
switch (cp->pos) {
case TBL_CELL_HORIZ:
- tbl_char(tp, '-', col->width);
+ tbl_fill_border(tp, BHORIZ, col->width);
return;
case TBL_CELL_DHORIZ:
- tbl_char(tp, '=', col->width);
+ tbl_fill_border(tp, BHORIZ * 2, col->width);
return;
default:
break;
return;
case TBL_DATA_HORIZ:
case TBL_DATA_NHORIZ:
- tbl_char(tp, '-', col->width);
+ tbl_fill_border(tp, BHORIZ, col->width);
return;
case TBL_DATA_NDHORIZ:
case TBL_DATA_DHORIZ:
- tbl_char(tp, '=', col->width);
+ tbl_fill_border(tp, BHORIZ * 2, col->width);
return;
default:
break;
}
static void
-tbl_char(struct termp *tp, char c, size_t len)
+tbl_fill_string(struct termp *tp, const char *cp, size_t len)
{
- size_t i, sz;
- char cp[2];
+ size_t i, sz;
+
+ sz = term_strlen(tp, cp);
+ for (i = 0; i < len; i += sz)
+ term_word(tp, cp);
+}
+
+static void
+tbl_fill_char(struct termp *tp, char c, size_t len)
+{
+ char cp[2];
cp[0] = c;
cp[1] = '\0';
+ tbl_fill_string(tp, cp, len);
+}
- sz = term_strlen(tp, cp);
+static void
+tbl_fill_border(struct termp *tp, int c, size_t len)
+{
+ char buf[12];
- for (i = 0; i < len; i += sz)
- term_word(tp, cp);
+ if ((c = borders_locale[c]) > 127) {
+ (void)snprintf(buf, sizeof(buf), "\\[u%04x]", c);
+ tbl_fill_string(tp, buf, len);
+ } else
+ tbl_fill_char(tp, c, len);
+}
+
+static void
+tbl_direct_border(struct termp *tp, int c, size_t len)
+{
+ size_t i, sz;
+
+ c = borders_locale[c];
+ sz = (*tp->width)(tp, c);
+ for (i = 0; i < len; i += sz) {
+ (*tp->letter)(tp, c);
+ tp->viscol += sz;
+ }
}
static void
const struct roffcol *col)
{
size_t len, padl, padr, width;
- int ic, spans;
+ int ic, hspans;
assert(dp->string);
len = term_strlen(tp, dp->string);
width = col->width;
ic = dp->layout->col;
- spans = dp->spans;
- while (spans--)
+ hspans = dp->hspans;
+ while (hspans--)
width += tp->tbl.cols[++ic].width + 3;
padr = width > len ? width - len : 0;
break;
}
- tbl_char(tp, ASCII_NBRSP, padl);
+ tbl_fill_char(tp, ASCII_NBRSP, padl);
tbl_word(tp, dp);
- tbl_char(tp, ASCII_NBRSP, padr);
+ tbl_fill_char(tp, ASCII_NBRSP, padr);
}
static void
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, 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;
+ }
+
+ /* Then measure both widths. */
- sz = term_strlen(tp, dp->string);
+ 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);
+ }
- buf[0] = opts->decimal;
- buf[1] = '\0';
+ /*
+ * Pad left to match the decimal position,
+ * but avoid exceeding the total column width.
+ */
- 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);
+ if (col->decimal > intsz && col->width > totsz) {
+ padl = col->decimal - intsz;
+ if (padl + totsz > col->width)
+ padl = col->width - totsz;
}
- d = ssz;
- } else
- d = sz;
- 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
- padl = 0;
+ /* If it is not a number, simply center the string. */
+
+ } else if (col->width > totsz)
+ padl = (col->width - totsz) / 2;
+
+ tbl_fill_char(tp, ASCII_NBRSP, padl);
tbl_word(tp, dp);
- if (col->width > sz + padl)
- tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
+
+ /* Pad right to fill the column. */
+
+ if (col->width > padl + totsz)
+ tbl_fill_char(tp, ASCII_NBRSP, col->width - padl - totsz);
}
static void
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);
+ switch (dp->layout->font) {
+ case ESCAPE_FONTBI:
+ term_fontpush(tp, TERMFONT_BI);
+ break;
+ case ESCAPE_FONTBOLD:
+ case ESCAPE_FONTCB:
+ term_fontpush(tp, TERMFONT_BOLD);
+ break;
+ case ESCAPE_FONTITALIC:
+ case ESCAPE_FONTCI:
+ term_fontpush(tp, TERMFONT_UNDER);
+ break;
+ case ESCAPE_FONTROMAN:
+ case ESCAPE_FONTCR:
+ break;
+ default:
+ abort();
+ }
term_word(tp, dp->string);
git.ckatri.com / mandoc.git / blobdiff