version 1.20, 2011/05/17 13:11:40 |
version 1.29, 2014/10/14 02:16:06 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2012, 2014 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 51 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
Line 52 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ '^', TBL_CELL_DOWN }, |
{ '^', TBL_CELL_DOWN }, |
{ '-', TBL_CELL_HORIZ }, |
{ '-', TBL_CELL_HORIZ }, |
{ '_', TBL_CELL_HORIZ }, |
{ '_', TBL_CELL_HORIZ }, |
{ '=', TBL_CELL_DHORIZ }, |
{ '=', TBL_CELL_DHORIZ } |
{ '|', TBL_CELL_VERT } |
|
}; |
}; |
|
|
static int mods(struct tbl_node *, struct tbl_cell *, |
static int 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 int 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 void row(struct tbl_node *, int, const char *, int *); |
static struct tbl_cell *cell_alloc(struct tbl_node *, |
static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, |
struct tbl_row *, enum tbl_cellt); |
enum tbl_cellt, int vert); |
static void head_adjust(const struct tbl_cell *, |
|
struct tbl_head *); |
|
|
|
|
|
static int |
static int |
mods(struct tbl_node *tbl, struct tbl_cell *cp, |
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 buf[5]; |
Line 75 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
Line 74 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
/* Not all types accept modifiers. */ |
/* Not all types accept modifiers. */ |
|
|
switch (cp->pos) { |
switch (cp->pos) { |
case (TBL_CELL_DOWN): |
case TBL_CELL_DOWN: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_HORIZ): |
case TBL_CELL_HORIZ: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_DHORIZ): |
case TBL_CELL_DHORIZ: |
/* FALLTHROUGH */ |
|
case (TBL_CELL_VERT): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_DVERT): |
|
return(1); |
return(1); |
default: |
default: |
break; |
break; |
} |
} |
|
|
mod: |
mod: |
/* |
/* |
* XXX: since, at least for now, modifiers are non-conflicting |
* XXX: since, at least for now, modifiers are non-conflicting |
* (are separable by value, regardless of position), we let |
* (are separable by value, regardless of position), we let |
* modifiers come in any order. The existing tbl doesn't let |
* modifiers come in any order. The existing tbl doesn't let |
* this happen. |
* this happen. |
*/ |
*/ |
switch (p[*pos]) { |
switch (p[*pos]) { |
case ('\0'): |
case '\0': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (' '): |
case ' ': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('\t'): |
case '\t': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (','): |
case ',': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('.'): |
case '.': |
|
/* FALLTHROUGH */ |
|
case '|': |
return(1); |
return(1); |
default: |
default: |
break; |
break; |
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
/* No greater than 4 digits. */ |
/* No greater than 4 digits. */ |
|
|
if (4 == i) { |
if (4 == i) { |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
|
|
goto mod; |
goto mod; |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
/* TODO: GNU has many more extensions. */ |
/* TODO: GNU has many more extensions. */ |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('z'): |
case 'z': |
cp->flags |= TBL_CELL_WIGN; |
cp->flags |= TBL_CELL_WIGN; |
goto mod; |
goto mod; |
case ('u'): |
case 'u': |
cp->flags |= TBL_CELL_UP; |
cp->flags |= TBL_CELL_UP; |
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 't': |
cp->flags |= TBL_CELL_TALIGN; |
cp->flags |= TBL_CELL_TALIGN; |
goto mod; |
goto mod; |
case ('d'): |
case 'd': |
cp->flags |= TBL_CELL_BALIGN; |
cp->flags |= TBL_CELL_BALIGN; |
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': |
|
cp->flags |= TBL_CELL_WMAX; |
|
goto mod; |
|
case 'f': |
break; |
break; |
case ('b'): |
case 'r': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('i'): |
case 'b': |
|
/* FALLTHROUGH */ |
|
case 'i': |
(*pos)--; |
(*pos)--; |
break; |
break; |
default: |
default: |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
ln, *pos - 1, NULL); |
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('b'): |
case '3': |
|
/* FALLTHROUGH */ |
|
case 'b': |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
case ('i'): |
case '2': |
|
/* FALLTHROUGH */ |
|
case 'i': |
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
goto mod; |
|
case '1': |
|
/* FALLTHROUGH */ |
|
case 'r': |
|
goto mod; |
default: |
default: |
break; |
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; |
|
} |
|
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
ln, *pos - 1, NULL); |
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
static int |
static int |
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 i; |
int vert, i; |
enum tbl_cellt c; |
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++) |
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 (KEYS_MAX == i) { |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 232 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 261 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
if (TBL_CELL_SPAN == c) { |
if (TBL_CELL_SPAN == c) { |
if (NULL == rp->first) { |
if (NULL == rp->first) { |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, NULL); |
return(0); |
return(0); |
} else if (rp->last) |
} else if (rp->last) |
switch (rp->last->pos) { |
switch (rp->last->pos) { |
case (TBL_CELL_VERT): |
case TBL_CELL_HORIZ: |
case (TBL_CELL_DVERT): |
/* FALLTHROUGH */ |
case (TBL_CELL_HORIZ): |
case TBL_CELL_DHORIZ: |
case (TBL_CELL_DHORIZ): |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
|
return(0); |
return(0); |
default: |
default: |
break; |
break; |
Line 260 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 288 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
|
|
(*pos)++; |
(*pos)++; |
|
|
/* Extra check for the double-vertical. */ |
|
|
|
if (TBL_CELL_VERT == c && '|' == p[*pos]) { |
|
(*pos)++; |
|
c = TBL_CELL_DVERT; |
|
} |
|
|
|
/* Disallow adjacent spacers. */ |
/* Disallow adjacent spacers. */ |
|
|
if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && |
if (vert > 2) { |
(TBL_CELL_VERT == rp->last->pos || |
|
TBL_CELL_DVERT == rp->last->pos)) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
/* Allocate cell then parse its modifiers. */ |
/* Allocate cell then parse its modifiers. */ |
|
|
return(mods(tbl, cell_alloc(tbl, rp, c), ln, p, pos)); |
return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos)); |
} |
} |
|
|
|
|
static void |
static void |
row(struct tbl_node *tbl, int ln, const char *p, int *pos) |
row(struct tbl_node *tbl, int ln, const char *p, int *pos) |
{ |
{ |
|
|
*/ |
*/ |
|
|
rp = mandoc_calloc(1, sizeof(struct tbl_row)); |
rp = mandoc_calloc(1, sizeof(struct tbl_row)); |
if (tbl->last_row) { |
if (tbl->last_row) |
tbl->last_row->next = rp; |
tbl->last_row->next = rp; |
tbl->last_row = rp; |
else |
} else |
tbl->first_row = rp; |
tbl->last_row = tbl->first_row = rp; |
tbl->last_row = rp; |
|
|
cell: |
cell: |
while (isspace((unsigned char)p[*pos])) |
while (isspace((unsigned char)p[*pos])) |
|
|
|
|
if ('.' == p[*pos]) { |
if ('.' == p[*pos]) { |
tbl->part = TBL_PART_DATA; |
tbl->part = TBL_PART_DATA; |
if (NULL == tbl->first_row) |
if (NULL == tbl->first_row) |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, |
ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
(*pos)++; |
(*pos)++; |
return; |
return; |
} |
} |
Line 347 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 365 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
} |
} |
|
|
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; |
struct tbl_head *h, *hp; |
Line 355 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 374 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
p = mandoc_calloc(1, sizeof(struct tbl_cell)); |
p = mandoc_calloc(1, sizeof(struct tbl_cell)); |
|
|
if (NULL != (pp = rp->last)) { |
if (NULL != (pp = rp->last)) { |
rp->last->next = p; |
pp->next = p; |
rp->last = p; |
h = pp->head->next; |
} else |
} else { |
rp->last = rp->first = p; |
rp->first = p; |
|
h = tbl->first_head; |
|
} |
|
rp->last = p; |
|
|
p->pos = pos; |
p->pos = pos; |
|
p->vert = vert; |
|
|
/* |
/* Re-use header. */ |
* This is a little bit complicated. Here we determine the |
|
* header the corresponds to a cell. We add headers dynamically |
|
* when need be or re-use them, otherwise. As an example, given |
|
* the following: |
|
* |
|
* 1 c || l |
|
* 2 | c | l |
|
* 3 l l |
|
* 3 || c | l |. |
|
* |
|
* We first add the new headers (as there are none) in (1); then |
|
* in (2) we insert the first spanner (as it doesn't match up |
|
* with the header); then we re-use the prior data headers, |
|
* skipping over the spanners; then we re-use everything and add |
|
* a last spanner. Note that VERT headers are made into DVERT |
|
* ones. |
|
*/ |
|
|
|
h = pp ? pp->head->next : tbl->first_head; |
|
|
|
if (h) { |
if (h) { |
/* Re-use data header. */ |
p->head = h; |
if (TBL_HEAD_DATA == h->pos && |
return(p); |
(TBL_CELL_VERT != p->pos && |
|
TBL_CELL_DVERT != p->pos)) { |
|
p->head = h; |
|
return(p); |
|
} |
|
|
|
/* Re-use spanner header. */ |
|
if (TBL_HEAD_DATA != h->pos && |
|
(TBL_CELL_VERT == p->pos || |
|
TBL_CELL_DVERT == p->pos)) { |
|
head_adjust(p, h); |
|
p->head = h; |
|
return(p); |
|
} |
|
|
|
/* Right-shift headers with a new spanner. */ |
|
if (TBL_HEAD_DATA == h->pos && |
|
(TBL_CELL_VERT == p->pos || |
|
TBL_CELL_DVERT == p->pos)) { |
|
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
|
hp->ident = tbl->opts.cols++; |
|
hp->prev = h->prev; |
|
if (h->prev) |
|
h->prev->next = hp; |
|
if (h == tbl->first_head) |
|
tbl->first_head = hp; |
|
h->prev = hp; |
|
hp->next = h; |
|
head_adjust(p, hp); |
|
p->head = hp; |
|
return(p); |
|
} |
|
|
|
if (NULL != (h = h->next)) { |
|
head_adjust(p, h); |
|
p->head = h; |
|
return(p); |
|
} |
|
|
|
/* Fall through to default case... */ |
|
} |
} |
|
|
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
hp->ident = tbl->opts.cols++; |
hp->ident = tbl->opts.cols++; |
|
hp->vert = vert; |
|
|
if (tbl->last_head) { |
if (tbl->last_head) { |
hp->prev = tbl->last_head; |
hp->prev = tbl->last_head; |
tbl->last_head->next = hp; |
tbl->last_head->next = hp; |
tbl->last_head = hp; |
|
} else |
} else |
tbl->last_head = tbl->first_head = hp; |
tbl->first_head = hp; |
|
tbl->last_head = hp; |
|
|
head_adjust(p, hp); |
|
p->head = hp; |
p->head = hp; |
return(p); |
return(p); |
} |
} |
|
|
static void |
|
head_adjust(const struct tbl_cell *cellp, struct tbl_head *head) |
|
{ |
|
if (TBL_CELL_VERT != cellp->pos && |
|
TBL_CELL_DVERT != cellp->pos) { |
|
head->pos = TBL_HEAD_DATA; |
|
return; |
|
} |
|
|
|
if (TBL_CELL_VERT == cellp->pos) |
|
if (TBL_HEAD_DVERT != head->pos) |
|
head->pos = TBL_HEAD_VERT; |
|
|
|
if (TBL_CELL_DVERT == cellp->pos) |
|
head->pos = TBL_HEAD_DVERT; |
|
} |
|
|
|