=================================================================== RCS file: /cvs/mandoc/tbl_layout.c,v retrieving revision 1.4 retrieving revision 1.32 diff -u -p -r1.4 -r1.32 --- mandoc/tbl_layout.c 2011/01/01 21:23:01 1.4 +++ mandoc/tbl_layout.c 2015/01/26 18:42:30 1.32 @@ -1,6 +1,7 @@ -/* $Id: tbl_layout.c,v 1.4 2011/01/01 21:23:01 kristaps Exp $ */ +/* $Id: tbl_layout.c,v 1.32 2015/01/26 18:42:30 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2012, 2014, 2015 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,13 +15,17 @@ * 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 "mandoc.h" +#include "mandoc_aux.h" #include "libmandoc.h" #include "libroff.h" @@ -29,9 +34,7 @@ struct tbl_phrase { 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 }, @@ -41,227 +44,278 @@ 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, int vert); + + +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; 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, tbl->parse, + 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': + /* FALLTHROUGH */ + case 'i': + /* FALLTHROUGH */ + case 'r': + (*pos)--; + break; + case 'd': + cp->flags |= TBL_CELL_BALIGN; goto mod; - case ('u'): - cp->flags |= TBL_CELL_UP; - goto mod; - case ('e'): + case 'e': cp->flags |= TBL_CELL_EQUAL; goto mod; - case ('t'): + case 'f': + break; + case 'm': + mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse, + ln, *pos, "m"); + goto mod; + case 'p': + /* FALLTHROUGH */ + 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': /* XXX for now, ignore minimal column width */ + goto mod; + case 'x': + cp->flags |= TBL_CELL_WMAX; + goto mod; + case 'z': + cp->flags |= TBL_CELL_WIGN; + goto mod; default: - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); - return(0); + mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, + ln, *pos - 1, "%c", p[*pos - 1]); + goto mod; } - switch (tolower(p[(*pos)++])) { - case ('b'): + switch (tolower((unsigned char)p[(*pos)++])) { + case '3': + /* FALLTHROUGH */ + case 'b': cp->flags |= TBL_CELL_BOLD; goto mod; - case ('i'): + case '2': + /* FALLTHROUGH */ + case 'i': cp->flags |= TBL_CELL_ITALIC; goto mod; + case '1': + /* FALLTHROUGH */ + case 'r': + goto mod; default: - break; + mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, + 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; + int vert, i; enum tbl_cellt c; - /* Parse the column position (`r', `R', `|', ...). */ + /* Handle vertical lines. */ - for (i = 0; i < KEYS_MAX; i++) - if (tolower(p[*pos]) == keys[i].name) - break; + vert = 0; +again: + while (p[*pos] == ' ' || p[*pos] == '\t' || p[*pos] == '|') { + if (p[*pos] == '|') { + if (vert < 2) + vert++; + else + mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, + tbl->parse, ln, *pos, NULL); + } + (*pos)++; + } - if (KEYS_MAX == i) { - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); - return(0); + /* Handle trailing vertical lines */ + + if ('.' == p[*pos] || '\0' == p[*pos]) { + rp->vert = vert; + return; } - (*pos)++; - c = keys[i].key; + /* Parse the column position (`c', `l', `r', ...). */ - /* Extra check for the double-vertical. */ + for (i = 0; i < KEYS_MAX; i++) + if (tolower((unsigned char)p[*pos]) == keys[i].name) + break; - if (TBL_CELL_VERT == c && '|' == p[*pos]) { + if (i == KEYS_MAX) { + mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, + ln, *pos, "%c", p[*pos]); (*pos)++; - c = TBL_CELL_DVERT; - } - - /* Disallow adjacent spacers. */ - - 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); + goto again; } + c = keys[i].key; - /* Allocate cell then parse its modifiers. */ + /* Special cases of spanners. */ - cp = mandoc_calloc(1, sizeof(struct tbl_cell)); - cp->pos = c; + if (c == TBL_CELL_SPAN) { + if (rp->last == NULL) + mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, + tbl->parse, 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, + tbl->parse, ln, *pos, NULL); - if (rp->last) { - rp->last->next = cp; - rp->last = cp; - } else - rp->last = rp->first = cp; + (*pos)++; - return(mods(tbl, cp, ln, p, pos)); + /* Allocate cell then parse its modifiers. */ + + mods(tbl, cell_alloc(tbl, rp, c, vert), 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) { struct tbl_row *rp; + int pos; -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:]+ - */ + pos = 0; + rp = NULL; - rp = mandoc_calloc(1, sizeof(struct tbl_row)); - if (tbl->last_row) { - tbl->last_row->next = rp; - tbl->last_row = rp; - } else - tbl->last_row = tbl->first_row = rp; + for (;;) { + /* Skip whitespace before and after each cell. */ -cell: - while (isspace((unsigned char)p[*pos])) - (*pos)++; + while (p[pos] == ' ' || p[pos] == '\t') + pos++; - /* Safely exit layout context. */ + 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; + if (tbl->first_row != NULL) + return; + mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, + tbl->parse, ln, pos, NULL); + rp = mandoc_calloc(1, sizeof(*rp)); + cell_alloc(tbl, rp, TBL_CELL_LEFT, 0); + tbl->first_row = tbl->last_row = rp; + return; + default: /* Cell. */ + break; + } - if ('.' == p[*pos]) { - tbl->part = TBL_PART_DATA; - if (NULL == tbl->first_row) - TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos); - (*pos)++; - return; + if (rp == NULL) { /* First cell on this line. */ + rp = mandoc_calloc(1, sizeof(*rp)); + if (tbl->last_row) + tbl->last_row->next = rp; + else + tbl->first_row = rp; + tbl->last_row = rp; + } + cell(tbl, rp, ln, p, &pos); } +} - /* End (and possibly restart) a row. */ +static struct tbl_cell * +cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos, + int vert) +{ + struct tbl_cell *p, *pp; + struct tbl_head *h, *hp; - if (',' == p[*pos]) { - (*pos)++; - goto row; - } else if ('\0' == p[*pos]) - return; + p = mandoc_calloc(1, sizeof(struct tbl_cell)); - if ( ! cell(tbl, rp, ln, p, pos)) - return; + if (NULL != (pp = rp->last)) { + pp->next = p; + h = pp->head->next; + } else { + rp->first = p; + h = tbl->first_head; + } + rp->last = p; - goto cell; - /* NOTREACHED */ -} + p->pos = pos; + p->vert = vert; + /* Re-use header. */ -int -tbl_layout(struct tbl *tbl, int ln, const char *p) -{ - int pos; + if (h) { + p->head = h; + return(p); + } - pos = 0; - row(tbl, ln, p, &pos); + hp = mandoc_calloc(1, sizeof(struct tbl_head)); + hp->ident = tbl->opts.cols++; + hp->vert = vert; - /* Always succeed. */ - return(1); + if (tbl->last_head) { + hp->prev = tbl->last_head; + tbl->last_head->next = hp; + } else + tbl->first_head = hp; + tbl->last_head = hp; + + p->head = hp; + return(p); }