version 1.23, 2012/05/27 17:54:54 |
version 1.39, 2015/04/29 12:44:58 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <assert.h> |
#include <sys/types.h> |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
Line 34 struct tbl_phrase { |
|
Line 34 struct tbl_phrase { |
|
enum tbl_cellt key; |
enum tbl_cellt key; |
}; |
}; |
|
|
/* |
static const struct tbl_phrase keys[] = { |
* 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] = { |
|
{ 'c', TBL_CELL_CENTRE }, |
{ 'c', TBL_CELL_CENTRE }, |
{ 'r', TBL_CELL_RIGHT }, |
{ 'r', TBL_CELL_RIGHT }, |
{ 'l', TBL_CELL_LEFT }, |
{ 'l', TBL_CELL_LEFT }, |
Line 55 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
Line 47 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ '=', TBL_CELL_DHORIZ } |
{ '=', TBL_CELL_DHORIZ } |
}; |
}; |
|
|
static int mods(struct tbl_node *, struct tbl_cell *, |
#define KEYS_MAX ((int)(sizeof(keys)/sizeof(keys[0]))) |
|
|
|
static void mods(struct tbl_node *, struct tbl_cell *, |
int, const char *, int *); |
int, const char *, int *); |
static int cell(struct tbl_node *, struct tbl_row *, |
static void cell(struct tbl_node *, struct tbl_row *, |
int, const char *, int *); |
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 *, |
static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, |
enum tbl_cellt, int vert); |
enum tbl_cellt); |
|
|
static int |
|
mods(struct tbl_node *tbl, struct tbl_cell *cp, |
static void |
|
mods(struct tbl_node *tbl, struct tbl_cell *cp, |
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
char buf[5]; |
char *endptr; |
int i; |
|
|
|
/* Not all types accept modifiers. */ |
mod: |
|
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
(*pos)++; |
|
|
switch (cp->pos) { |
/* Row delimiters and cell specifiers end modifier lists. */ |
case (TBL_CELL_DOWN): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_HORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_DHORIZ): |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
mod: |
if (strchr(".,-=^_ACLNRSaclnrs", p[*pos]) != NULL) |
/* |
return; |
* 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; |
|
} |
|
|
|
/* Throw away parenthesised expression. */ |
/* Throw away parenthesised expression. */ |
|
|
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, tbl->parse, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
return(0); |
return; |
} |
} |
|
|
/* Parse numerical spacing from modifier string. */ |
/* Parse numerical spacing from modifier string. */ |
|
|
if (isdigit((unsigned char)p[*pos])) { |
if (isdigit((unsigned char)p[*pos])) { |
for (i = 0; i < 4; i++) { |
cp->spacing = strtoull(p + *pos, &endptr, 10); |
if ( ! isdigit((unsigned char)p[*pos + i])) |
*pos = endptr - p; |
break; |
|
buf[i] = p[*pos + i]; |
|
} |
|
buf[i] = '\0'; |
|
|
|
/* No greater than 4 digits. */ |
|
|
|
if (4 == i) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
|
return(0); |
|
} |
|
|
|
*pos += i; |
|
cp->spacing = (size_t)atoi(buf); |
|
|
|
goto mod; |
goto mod; |
/* NOTREACHED */ |
} |
} |
|
|
|
/* TODO: GNU has many more extensions. */ |
|
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('z'): |
case 'b': |
cp->flags |= TBL_CELL_WIGN; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
case ('u'): |
case 'd': |
cp->flags |= TBL_CELL_UP; |
cp->flags |= TBL_CELL_BALIGN; |
goto mod; |
goto mod; |
case ('e'): |
case 'e': |
cp->flags |= TBL_CELL_EQUAL; |
cp->flags |= TBL_CELL_EQUAL; |
goto mod; |
goto mod; |
case ('t'): |
case 'f': |
|
break; |
|
case 'i': |
|
cp->flags |= TBL_CELL_ITALIC; |
|
goto mod; |
|
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; |
cp->flags |= TBL_CELL_TALIGN; |
goto mod; |
goto mod; |
case ('d'): |
case 'u': |
cp->flags |= TBL_CELL_BALIGN; |
cp->flags |= TBL_CELL_UP; |
goto mod; |
goto mod; |
case ('w'): /* XXX for now, ignore minimal column width */ |
case 'w': /* XXX for now, ignore minimal column width */ |
goto mod; |
goto mod; |
case ('f'): |
case 'x': |
break; |
cp->flags |= TBL_CELL_WMAX; |
case ('r'): |
goto mod; |
/* FALLTHROUGH */ |
case 'z': |
case ('b'): |
cp->flags |= TBL_CELL_WIGN; |
/* FALLTHROUGH */ |
goto mod; |
case ('i'): |
case '|': |
(*pos)--; |
if (cp->vert < 2) |
break; |
cp->vert++; |
|
else |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
|
tbl->parse, ln, *pos - 1, NULL); |
|
goto mod; |
default: |
default: |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
ln, *pos - 1, NULL); |
ln, *pos - 1, "%c", p[*pos - 1]); |
return(0); |
goto mod; |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
/* Ignore parenthised font names for now. */ |
case ('3'): |
|
|
if (p[*pos] == '(') |
|
goto mod; |
|
|
|
/* Support only one-character font-names for now. */ |
|
|
|
if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { |
|
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
|
ln, *pos, "TS %s", p + *pos - 1); |
|
if (p[*pos] != '\0') |
|
(*pos)++; |
|
if (p[*pos] != '\0') |
|
(*pos)++; |
|
goto mod; |
|
} |
|
|
|
switch (p[(*pos)++]) { |
|
case '3': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('b'): |
case 'B': |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
case ('2'): |
case '2': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('i'): |
case 'I': |
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
goto mod; |
case ('1'): |
case '1': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('r'): |
case 'R': |
goto mod; |
goto mod; |
default: |
default: |
break; |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
|
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
|
goto mod; |
} |
} |
|
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
|
return(0); |
|
} |
} |
|
|
static int |
static void |
cell(struct tbl_node *tbl, struct tbl_row *rp, |
cell(struct tbl_node *tbl, struct tbl_row *rp, |
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
int vert, i; |
int i; |
enum tbl_cellt c; |
enum tbl_cellt c; |
|
|
/* Handle vertical lines. */ |
/* Handle leading vertical lines */ |
|
|
for (vert = 0; '|' == p[*pos]; ++*pos) |
while (p[*pos] == ' ' || p[*pos] == '\t' || p[*pos] == '|') { |
vert++; |
if (p[*pos] == '|') { |
while (' ' == p[*pos]) |
if (rp->vert < 2) |
|
rp->vert++; |
|
else |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
|
tbl->parse, ln, *pos, NULL); |
|
} |
(*pos)++; |
(*pos)++; |
|
} |
|
|
|
again: |
|
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
(*pos)++; |
|
|
|
if (p[*pos] == '.' || p[*pos] == '\0') |
|
return; |
|
|
/* Parse the column position (`c', `l', `r', ...). */ |
/* Parse the column position (`c', `l', `r', ...). */ |
|
|
for (i = 0; i < KEYS_MAX; i++) |
for (i = 0; i < KEYS_MAX; i++) |
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
break; |
break; |
|
|
if (KEYS_MAX == i) { |
if (i == KEYS_MAX) { |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, "%c", p[*pos]); |
return(0); |
(*pos)++; |
|
goto again; |
} |
} |
|
|
c = keys[i].key; |
c = keys[i].key; |
|
|
/* |
/* Special cases of spanners. */ |
* 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_SPAN == c) { |
if (c == TBL_CELL_SPAN) { |
if (NULL == rp->first) { |
if (rp->last == NULL) |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, |
ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
return(0); |
else if (rp->last->pos == TBL_CELL_HORIZ || |
} else if (rp->last) |
rp->last->pos == TBL_CELL_DHORIZ) |
switch (rp->last->pos) { |
c = rp->last->pos; |
case (TBL_CELL_HORIZ): |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
case (TBL_CELL_DHORIZ): |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
|
return(0); |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* |
|
* 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); |
|
} |
|
|
|
(*pos)++; |
(*pos)++; |
|
|
/* Disallow adjacent spacers. */ |
|
|
|
if (vert > 2) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
|
return(0); |
|
} |
|
|
|
/* Allocate cell then parse its modifiers. */ |
/* Allocate cell then parse its modifiers. */ |
|
|
return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos)); |
mods(tbl, cell_alloc(tbl, rp, c), ln, p, pos); |
} |
} |
|
|
|
void |
static void |
tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos) |
row(struct tbl_node *tbl, int ln, const char *p, int *pos) |
|
{ |
{ |
struct tbl_row *rp; |
struct tbl_row *rp; |
|
|
row: /* |
rp = NULL; |
* EBNF describing this section: |
for (;;) { |
* |
/* Skip whitespace before and after each cell. */ |
* row ::= row_list [:space:]* [.]?[\n] |
|
* row_list ::= [:space:]* row_elem row_tail |
|
* row_tail ::= [:space:]*[,] row_list | |
|
* epsilon |
|
* row_elem ::= [\t\ ]*[:alpha:]+ |
|
*/ |
|
|
|
rp = mandoc_calloc(1, sizeof(struct tbl_row)); |
while (p[pos] == ' ' || p[pos] == '\t') |
if (tbl->last_row) |
pos++; |
tbl->last_row->next = rp; |
|
else |
|
tbl->first_row = rp; |
|
tbl->last_row = rp; |
|
|
|
cell: |
switch (p[pos]) { |
while (isspace((unsigned char)p[*pos])) |
case ',': /* Next row on this input line. */ |
(*pos)++; |
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]) { |
if (tbl->first_row == NULL) { |
tbl->part = TBL_PART_DATA; |
tbl->first_row = tbl->last_row = |
if (NULL == tbl->first_row) |
mandoc_calloc(1, sizeof(*rp)); |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, |
} |
ln, *pos, NULL); |
if (tbl->first_row->first == NULL) { |
(*pos)++; |
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
return; |
tbl->parse, ln, pos, NULL); |
} |
cell_alloc(tbl, tbl->first_row, |
|
TBL_CELL_LEFT); |
|
return; |
|
} |
|
|
/* End (and possibly restart) a row. */ |
/* |
|
* Search for the widest line |
|
* along the left and right margins. |
|
*/ |
|
|
if (',' == p[*pos]) { |
for (rp = tbl->first_row; rp; rp = rp->next) { |
(*pos)++; |
if (tbl->opts.lvert < rp->vert) |
goto row; |
tbl->opts.lvert = rp->vert; |
} else if ('\0' == p[*pos]) |
if (rp->last != NULL && |
return; |
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)) |
/* If the last line is empty, drop it. */ |
return; |
|
|
|
goto cell; |
if (rp->next != NULL && |
/* NOTREACHED */ |
rp->next->first == NULL) { |
} |
free(rp->next); |
|
rp->next = NULL; |
|
tbl->last_row = rp; |
|
} |
|
} |
|
return; |
|
default: /* Cell. */ |
|
break; |
|
} |
|
|
int |
/* |
tbl_layout(struct tbl_node *tbl, int ln, const char *p) |
* If the last line had at least one cell, |
{ |
* start a new one; otherwise, continue it. |
int pos; |
*/ |
|
|
pos = 0; |
if (rp == NULL) { |
row(tbl, ln, p, &pos); |
if (tbl->last_row == NULL || |
|
tbl->last_row->first != NULL) { |
/* Always succeed. */ |
rp = mandoc_calloc(1, sizeof(*rp)); |
return(1); |
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 * |
static struct tbl_cell * |
cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos, |
cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) |
int vert) |
|
{ |
{ |
struct tbl_cell *p, *pp; |
struct tbl_cell *p, *pp; |
struct tbl_head *h, *hp; |
|
|
|
p = mandoc_calloc(1, sizeof(struct tbl_cell)); |
p = mandoc_calloc(1, sizeof(*p)); |
|
p->pos = pos; |
|
|
if (NULL != (pp = rp->last)) { |
if ((pp = rp->last) != NULL) { |
pp->next = p; |
pp->next = p; |
h = pp->head->next; |
p->col = pp->col + 1; |
} else { |
} else |
rp->first = p; |
rp->first = p; |
h = tbl->first_head; |
|
} |
|
rp->last = p; |
rp->last = p; |
|
|
p->pos = pos; |
if (tbl->opts.cols <= p->col) |
p->vert = vert; |
tbl->opts.cols = p->col + 1; |
|
|
/* 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); |
return(p); |
} |
} |