=================================================================== RCS file: /cvs/mandoc/tbl_layout.c,v retrieving revision 1.2 retrieving revision 1.48 diff -u -p -r1.2 -r1.48 --- mandoc/tbl_layout.c 2010/12/29 15:21:34 1.2 +++ mandoc/tbl_layout.c 2018/12/14 05:18:03 1.48 @@ -1,6 +1,7 @@ -/* $Id: tbl_layout.c,v 1.2 2010/12/29 15:21:34 kristaps Exp $ */ +/* $Id: tbl_layout.c,v 1.48 2018/12/14 05:18:03 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2012, 2014, 2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,23 +15,29 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include "config.h" + +#include + #include +#include +#include #include #include +#include +#include "mandoc_aux.h" #include "mandoc.h" +#include "tbl.h" #include "libmandoc.h" -#include "libroff.h" +#include "tbl_int.h" struct tbl_phrase { char name; enum tbl_cellt key; }; -#define KEYS_MAX 11 - -static const struct tbl_phrase keys[KEYS_MAX] = { +static const struct tbl_phrase keys[] = { { 'c', TBL_CELL_CENTRE }, { 'r', TBL_CELL_RIGHT }, { 'l', TBL_CELL_LEFT }, @@ -40,227 +47,327 @@ static const struct tbl_phrase keys[KEYS_MAX] = { { '^', TBL_CELL_DOWN }, { '-', TBL_CELL_HORIZ }, { '_', TBL_CELL_HORIZ }, - { '=', TBL_CELL_DHORIZ }, - { '|', TBL_CELL_VERT } + { '=', TBL_CELL_DHORIZ } }; -static int mods(struct tbl *, struct tbl_cell *, - int, const char *, int *); -static int cell(struct tbl *, struct tbl_row *, - int, const char *, int *); -static void row(struct tbl *, int, const char *, int *); +#define KEYS_MAX ((int)(sizeof(keys)/sizeof(keys[0]))) -static int -mods(struct tbl *tbl, struct tbl_cell *cp, +static void mods(struct tbl_node *, struct tbl_cell *, + int, const char *, int *); +static void cell(struct tbl_node *, struct tbl_row *, + int, const char *, int *); +static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, + enum tbl_cellt); + + +static void +mods(struct tbl_node *tbl, struct tbl_cell *cp, int ln, const char *p, int *pos) { - char buf[5]; - int i; + char *endptr; + size_t sz; mod: - /* - * XXX: since, at least for now, modifiers are non-conflicting - * (are separable by value, regardless of position), we let - * modifiers come in any order. The existing tbl doesn't let - * this happen. - */ - switch (p[*pos]) { - case ('\0'): - /* FALLTHROUGH */ - case (' '): - /* FALLTHROUGH */ - case ('\t'): - /* FALLTHROUGH */ - case (','): - /* FALLTHROUGH */ - case ('.'): - return(1); - default: - break; - } + while (p[*pos] == ' ' || p[*pos] == '\t') + (*pos)++; - /* Parse numerical spacing from modifier string. */ + /* Row delimiters and cell specifiers end modifier lists. */ - if (isdigit((unsigned char)p[*pos])) { - for (i = 0; i < 4; i++) { - if ( ! isdigit((unsigned char)p[*pos + i])) - break; - buf[i] = p[*pos + i]; - } - buf[i] = '\0'; + if (strchr(".,-=^_ACLNRSaclnrs", p[*pos]) != NULL) + return; - /* No greater than 4 digits. */ + /* Throw away parenthesised expression. */ - if (4 == i) { - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); - return(0); + if ('(' == p[*pos]) { + (*pos)++; + while (p[*pos] && ')' != p[*pos]) + (*pos)++; + if (')' == p[*pos]) { + (*pos)++; + goto mod; } + mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, ln, *pos, NULL); + return; + } - *pos += i; - cp->spacing = atoi(buf); + /* Parse numerical spacing from modifier string. */ + if (isdigit((unsigned char)p[*pos])) { + cp->spacing = strtoull(p + *pos, &endptr, 10); + *pos = endptr - p; goto mod; - /* NOTREACHED */ - } + } - /* TODO: GNU has many more extensions. */ - - switch (tolower(p[(*pos)++])) { - case ('z'): - cp->flags |= TBL_CELL_WIGN; + switch (tolower((unsigned char)p[(*pos)++])) { + case 'b': + cp->flags |= TBL_CELL_BOLD; goto mod; - case ('u'): - cp->flags |= TBL_CELL_UP; + case 'd': + cp->flags |= TBL_CELL_BALIGN; goto mod; - case ('e'): + case 'e': cp->flags |= TBL_CELL_EQUAL; goto mod; - case ('t'): + case 'f': + break; + case 'i': + cp->flags |= TBL_CELL_ITALIC; + goto mod; + case 'm': + mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, ln, *pos, "m"); + goto mod; + case 'p': + case 'v': + if (p[*pos] == '-' || p[*pos] == '+') + (*pos)++; + while (isdigit((unsigned char)p[*pos])) + (*pos)++; + goto mod; + case 't': cp->flags |= TBL_CELL_TALIGN; goto mod; - case ('d'): - cp->flags |= TBL_CELL_BALIGN; + case 'u': + cp->flags |= TBL_CELL_UP; goto mod; - case ('f'): - break; - case ('b'): - /* FALLTHROUGH */ - case ('i'): - (*pos)--; - break; + case 'w': + sz = 0; + if (p[*pos] == '(') { + (*pos)++; + while (p[*pos + sz] != '\0' && p[*pos + sz] != ')') + sz++; + } else + while (isdigit((unsigned char)p[*pos + sz])) + sz++; + if (sz) { + free(cp->wstr); + cp->wstr = mandoc_strndup(p + *pos, sz); + *pos += sz; + if (p[*pos] == ')') + (*pos)++; + } + goto mod; + case 'x': + cp->flags |= TBL_CELL_WMAX; + goto mod; + case 'z': + cp->flags |= TBL_CELL_WIGN; + goto mod; + case '|': + if (cp->vert < 2) + cp->vert++; + else + mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, + ln, *pos - 1, NULL); + goto mod; default: - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); - return(0); + mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, + ln, *pos - 1, "%c", p[*pos - 1]); + goto mod; } - switch (tolower(p[(*pos)++])) { - case ('b'): + /* Ignore parenthised font names for now. */ + + if (p[*pos] == '(') + goto mod; + + /* Support only one-character font-names for now. */ + + if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { + mandoc_msg(MANDOCERR_FT_BAD, + ln, *pos, "TS %s", p + *pos - 1); + if (p[*pos] != '\0') + (*pos)++; + if (p[*pos] != '\0') + (*pos)++; + goto mod; + } + + switch (p[(*pos)++]) { + case '3': + case 'B': cp->flags |= TBL_CELL_BOLD; goto mod; - case ('i'): + case '2': + case 'I': cp->flags |= TBL_CELL_ITALIC; goto mod; + case '1': + case 'R': + goto mod; default: - break; + mandoc_msg(MANDOCERR_FT_BAD, + ln, *pos - 1, "TS f%c", p[*pos - 1]); + goto mod; } - - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); - return(0); } -static int -cell(struct tbl *tbl, struct tbl_row *rp, +static void +cell(struct tbl_node *tbl, struct tbl_row *rp, int ln, const char *p, int *pos) { - struct tbl_cell *cp; int i; enum tbl_cellt c; - /* Parse the column position (`r', `R', `|', ...). */ + /* Handle leading vertical lines */ + while (p[*pos] == ' ' || p[*pos] == '\t' || p[*pos] == '|') { + if (p[*pos] == '|') { + if (rp->vert < 2) + rp->vert++; + else + mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, + ln, *pos, NULL); + } + (*pos)++; + } + +again: + while (p[*pos] == ' ' || p[*pos] == '\t') + (*pos)++; + + if (p[*pos] == '.' || p[*pos] == '\0') + return; + + /* Parse the column position (`c', `l', `r', ...). */ + for (i = 0; i < KEYS_MAX; i++) - if (tolower(p[*pos]) == keys[i].name) + if (tolower((unsigned char)p[*pos]) == keys[i].name) break; - if (KEYS_MAX == i) { - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); - return(0); + if (i == KEYS_MAX) { + mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, + ln, *pos, "%c", p[*pos]); + (*pos)++; + goto again; } - - (*pos)++; c = keys[i].key; - /* Extra check for the double-vertical. */ + /* Special cases of spanners. */ - if (TBL_CELL_VERT == c && '|' == p[*pos]) { - (*pos)++; - c = TBL_CELL_DVERT; - } - - /* Disallow adjacent spacers. */ + if (c == TBL_CELL_SPAN) { + if (rp->last == NULL) + mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, ln, *pos, NULL); + else if (rp->last->pos == TBL_CELL_HORIZ || + rp->last->pos == TBL_CELL_DHORIZ) + c = rp->last->pos; + } else if (c == TBL_CELL_DOWN && rp == tbl->first_row) + mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, ln, *pos, NULL); - if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && - (TBL_CELL_VERT == rp->last->pos || - TBL_CELL_DVERT == rp->last->pos)) { - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); - return(0); - } + (*pos)++; /* Allocate cell then parse its modifiers. */ - cp = mandoc_calloc(1, sizeof(struct tbl_cell)); - cp->pos = c; - - if (rp->last) { - rp->last->next = cp; - rp->last = cp; - } else - rp->last = rp->first = cp; - - return(mods(tbl, cp, ln, p, pos)); + mods(tbl, cell_alloc(tbl, rp, c), ln, p, pos); } - -static void -row(struct tbl *tbl, int ln, const char *p, int *pos) +void +tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_row *rp; -row: /* - * EBNF describing this section: - * - * row ::= row_list [:space:]* [.]?[\n] - * row_list ::= [:space:]* row_elem row_tail - * row_tail ::= [:space:]*[,] row_list | - * epsilon - * row_elem ::= [\t\ ]*[:alpha:]+ - */ + rp = NULL; + for (;;) { + /* Skip whitespace before and after each cell. */ - rp = mandoc_calloc(1, sizeof(struct tbl_row)); - if (tbl->last) { - tbl->last->next = rp; - tbl->last = rp; - } else - tbl->last = tbl->first = rp; + while (p[pos] == ' ' || p[pos] == '\t') + pos++; -cell: - while (isspace((unsigned char)p[*pos])) - (*pos)++; + switch (p[pos]) { + case ',': /* Next row on this input line. */ + pos++; + rp = NULL; + continue; + case '\0': /* Next row on next input line. */ + return; + case '.': /* End of layout. */ + pos++; + tbl->part = TBL_PART_DATA; - /* Safely exit layout context. */ + /* + * When the layout is completely empty, + * default to one left-justified column. + */ - if ('.' == p[*pos]) { - tbl->part = TBL_PART_DATA; - if (NULL == tbl->first) - TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos); - (*pos)++; - return; - } + if (tbl->first_row == NULL) { + tbl->first_row = tbl->last_row = + mandoc_calloc(1, sizeof(*rp)); + } + if (tbl->first_row->first == NULL) { + mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, + ln, pos, NULL); + cell_alloc(tbl, tbl->first_row, + TBL_CELL_LEFT); + if (tbl->opts.lvert < tbl->first_row->vert) + tbl->opts.lvert = tbl->first_row->vert; + return; + } - /* End (and possibly restart) a row. */ + /* + * Search for the widest line + * along the left and right margins. + */ - if (',' == p[*pos]) { - (*pos)++; - goto row; - } else if ('\0' == p[*pos]) - return; + for (rp = tbl->first_row; rp; rp = rp->next) { + if (tbl->opts.lvert < rp->vert) + tbl->opts.lvert = rp->vert; + if (rp->last != NULL && + rp->last->col + 1 == tbl->opts.cols && + tbl->opts.rvert < rp->last->vert) + tbl->opts.rvert = rp->last->vert; - if ( ! cell(tbl, rp, ln, p, pos)) - return; + /* If the last line is empty, drop it. */ - goto cell; - /* NOTREACHED */ -} + if (rp->next != NULL && + rp->next->first == NULL) { + free(rp->next); + rp->next = NULL; + tbl->last_row = rp; + } + } + return; + default: /* Cell. */ + break; + } + /* + * If the last line had at least one cell, + * start a new one; otherwise, continue it. + */ -int -tbl_layout(struct tbl *tbl, int ln, const char *p) + if (rp == NULL) { + if (tbl->last_row == NULL || + tbl->last_row->first != NULL) { + rp = mandoc_calloc(1, sizeof(*rp)); + if (tbl->last_row) + tbl->last_row->next = rp; + else + tbl->first_row = rp; + tbl->last_row = rp; + } else + rp = tbl->last_row; + } + cell(tbl, rp, ln, p, &pos); + } +} + +static struct tbl_cell * +cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) { - int pos; + struct tbl_cell *p, *pp; - pos = 0; - row(tbl, ln, p, &pos); + p = mandoc_calloc(1, sizeof(*p)); + p->spacing = SIZE_MAX; + p->pos = pos; - /* Always succeed. */ - return(1); + if ((pp = rp->last) != NULL) { + pp->next = p; + p->col = pp->col + 1; + } else + rp->first = p; + rp->last = p; + + if (tbl->opts.cols <= p->col) + tbl->opts.cols = p->col + 1; + + return p; }