=================================================================== RCS file: /cvs/mandoc/tbl_layout.c,v retrieving revision 1.2 retrieving revision 1.28 diff -u -p -r1.2 -r1.28 --- mandoc/tbl_layout.c 2010/12/29 15:21:34 1.2 +++ mandoc/tbl_layout.c 2014/10/07 14:07:03 1.28 @@ -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.28 2014/10/07 14:07:03 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2012, 2014 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,12 +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" @@ -28,6 +34,12 @@ struct tbl_phrase { enum tbl_cellt key; }; +/* + * FIXME: we can make this parse a lot nicer by, when an error is + * encountered in a layout key, bailing to the next key (i.e. to the + * next whitespace then continuing). + */ + #define KEYS_MAX 11 static const struct tbl_phrase keys[KEYS_MAX] = { @@ -40,45 +52,77 @@ 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 *); +static int mods(struct tbl_node *, struct tbl_cell *, + int, const char *, int *); +static int cell(struct tbl_node *, struct tbl_row *, + int, const char *, int *); +static void row(struct tbl_node *, int, const char *, int *); +static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, + enum tbl_cellt, int vert); + static int -mods(struct tbl *tbl, struct tbl_cell *cp, +mods(struct tbl_node *tbl, struct tbl_cell *cp, int ln, const char *p, int *pos) { char buf[5]; int i; + /* Not all types accept modifiers. */ + + switch (cp->pos) { + case TBL_CELL_DOWN: + /* FALLTHROUGH */ + case TBL_CELL_HORIZ: + /* FALLTHROUGH */ + case TBL_CELL_DHORIZ: + return(1); + default: + break; + } + 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'): + case '\0': /* FALLTHROUGH */ - case (' '): + case ' ': /* FALLTHROUGH */ - case ('\t'): + case '\t': /* FALLTHROUGH */ - case (','): + case ',': /* FALLTHROUGH */ - case ('.'): + case '.': + /* FALLTHROUGH */ + case '|': return(1); default: break; } + /* Throw away parenthesised expression. */ + + if ('(' == p[*pos]) { + (*pos)++; + while (p[*pos] && ')' != p[*pos]) + (*pos)++; + if (')' == p[*pos]) { + (*pos)++; + goto mod; + } + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, + ln, *pos, NULL); + return(0); + } + /* Parse numerical spacing from modifier string. */ if (isdigit((unsigned char)p[*pos])) { @@ -92,117 +136,169 @@ mod: /* No greater than 4 digits. */ if (4 == i) { - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); + mandoc_msg(MANDOCERR_TBLLAYOUT, + tbl->parse, ln, *pos, NULL); return(0); } *pos += i; - cp->spacing = atoi(buf); + cp->spacing = (size_t)atoi(buf); goto mod; /* NOTREACHED */ - } + } /* TODO: GNU has many more extensions. */ - switch (tolower(p[(*pos)++])) { - case ('z'): + switch (tolower((unsigned char)p[(*pos)++])) { + case 'z': cp->flags |= TBL_CELL_WIGN; goto mod; - case ('u'): + case 'u': cp->flags |= TBL_CELL_UP; goto mod; - case ('e'): + case 'e': cp->flags |= TBL_CELL_EQUAL; goto mod; - case ('t'): + case 't': cp->flags |= TBL_CELL_TALIGN; goto mod; - case ('d'): + case 'd': cp->flags |= TBL_CELL_BALIGN; goto mod; - case ('f'): + case 'w': /* XXX for now, ignore minimal column width */ + goto mod; + case 'f': break; - case ('b'): + case 'r': /* FALLTHROUGH */ - case ('i'): + case 'b': + /* FALLTHROUGH */ + case 'i': (*pos)--; break; default: - TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, + ln, *pos - 1, NULL); return(0); } - 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; } + if (isalnum((unsigned char)p[*pos - 1])) { + 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); + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, + ln, *pos - 1, NULL); return(0); } static int -cell(struct tbl *tbl, struct tbl_row *rp, +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 (vert = 0; '|' == p[*pos]; ++*pos) + vert++; + while (' ' == p[*pos]) + (*pos)++; + + /* Handle trailing vertical lines */ + + if ('.' == p[*pos] || '\0' == p[*pos]) { + rp->vert = vert; + return(1); + } + + /* 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); + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, + ln, *pos, NULL); return(0); } - (*pos)++; c = keys[i].key; - /* Extra check for the double-vertical. */ + /* + * If a span cell is found first, raise a warning and abort the + * parse. If a span cell is found and the last layout element + * isn't a "normal" layout, bail. + * + * FIXME: recover from this somehow? + */ - if (TBL_CELL_VERT == c && '|' == p[*pos]) { - (*pos)++; - c = TBL_CELL_DVERT; - } - - /* Disallow adjacent spacers. */ + if (TBL_CELL_SPAN == c) { + if (NULL == rp->first) { + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, + ln, *pos, NULL); + return(0); + } else if (rp->last) + switch (rp->last->pos) { + case TBL_CELL_HORIZ: + /* FALLTHROUGH */ + case TBL_CELL_DHORIZ: + mandoc_msg(MANDOCERR_TBLLAYOUT, + tbl->parse, ln, *pos, NULL); + return(0); + default: + break; + } + } - 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); + /* + * If a vertical spanner is found, we may not be in the first + * row. + */ + + if (TBL_CELL_DOWN == c && rp == tbl->first_row) { + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos, NULL); return(0); } - /* Allocate cell then parse its modifiers. */ + (*pos)++; - cp = mandoc_calloc(1, sizeof(struct tbl_cell)); - cp->pos = c; + /* Disallow adjacent spacers. */ - if (rp->last) { - rp->last->next = cp; - rp->last = cp; - } else - rp->last = rp->first = cp; + if (vert > 2) { + mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); + return(0); + } - return(mods(tbl, cp, ln, p, pos)); + /* Allocate cell then parse its modifiers. */ + + return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos)); } - static void -row(struct tbl *tbl, int ln, const char *p, int *pos) +row(struct tbl_node *tbl, int ln, const char *p, int *pos) { struct tbl_row *rp; @@ -217,11 +313,11 @@ row: /* */ rp = mandoc_calloc(1, sizeof(struct tbl_row)); - if (tbl->last) { - tbl->last->next = rp; - tbl->last = rp; - } else - tbl->last = tbl->first = rp; + if (tbl->last_row) + tbl->last_row->next = rp; + else + tbl->first_row = rp; + tbl->last_row = rp; cell: while (isspace((unsigned char)p[*pos])) @@ -231,8 +327,9 @@ cell: if ('.' == p[*pos]) { tbl->part = TBL_PART_DATA; - if (NULL == tbl->first) - TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos); + if (NULL == tbl->first_row) + mandoc_msg(MANDOCERR_TBLNOLAYOUT, + tbl->parse, ln, *pos, NULL); (*pos)++; return; } @@ -252,9 +349,8 @@ cell: /* NOTREACHED */ } - int -tbl_layout(struct tbl *tbl, int ln, const char *p) +tbl_layout(struct tbl_node *tbl, int ln, const char *p) { int pos; @@ -263,4 +359,47 @@ tbl_layout(struct tbl *tbl, int ln, const char *p) /* Always succeed. */ return(1); +} + +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; + + p = mandoc_calloc(1, sizeof(struct tbl_cell)); + + if (NULL != (pp = rp->last)) { + pp->next = p; + h = pp->head->next; + } else { + rp->first = p; + h = tbl->first_head; + } + rp->last = p; + + p->pos = pos; + p->vert = vert; + + /* Re-use header. */ + + if (h) { + p->head = h; + return(p); + } + + hp = mandoc_calloc(1, sizeof(struct tbl_head)); + hp->ident = tbl->opts.cols++; + hp->vert = vert; + + 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); }