version 1.3, 2010/12/30 09:34:07 |
version 1.12, 2011/01/07 14:59:52 |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
#include <time.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
Line 28 struct tbl_phrase { |
|
Line 29 struct tbl_phrase { |
|
enum tbl_cellt key; |
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 |
#define KEYS_MAX 11 |
|
|
static const struct tbl_phrase keys[KEYS_MAX] = { |
static const struct tbl_phrase keys[KEYS_MAX] = { |
Line 44 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
Line 51 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ '|', TBL_CELL_VERT } |
{ '|', TBL_CELL_VERT } |
}; |
}; |
|
|
static int mods(struct tbl *, 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 *, 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 *, 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); |
|
static void head_adjust(const struct tbl_cell *, |
|
struct tbl_head *); |
|
|
static int |
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) |
int ln, const char *p, int *pos) |
{ |
{ |
char buf[5]; |
char buf[5]; |
|
|
break; |
break; |
} |
} |
|
|
|
/* Throw away parenthesised expression. */ |
|
|
|
if ('(' == p[*pos]) { |
|
(*pos)++; |
|
while (p[*pos] && ')' != p[*pos]) |
|
(*pos)++; |
|
if (')' == p[*pos]) { |
|
(*pos)++; |
|
goto mod; |
|
} |
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
|
return(0); |
|
} |
|
|
/* Parse numerical spacing from modifier string. */ |
/* Parse numerical spacing from modifier string. */ |
|
|
if (isdigit((unsigned char)p[*pos])) { |
if (isdigit((unsigned char)p[*pos])) { |
|
|
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 */ |
|
goto mod; |
case ('f'): |
case ('f'): |
break; |
break; |
case ('b'): |
case ('b'): |
|
|
} |
} |
|
|
static int |
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) |
int ln, const char *p, int *pos) |
{ |
{ |
struct tbl_cell *cp; |
|
int i; |
int i; |
enum tbl_cellt c; |
enum tbl_cellt c; |
|
|
Line 167 cell(struct tbl *tbl, struct tbl_row *rp, |
|
Line 193 cell(struct tbl *tbl, struct tbl_row *rp, |
|
return(0); |
return(0); |
} |
} |
|
|
(*pos)++; |
|
c = keys[i].key; |
c = keys[i].key; |
|
|
|
/* |
|
* If a span cell is found first, raise a warning and abort the |
|
* parse. FIXME: recover from this somehow? |
|
*/ |
|
|
|
if (NULL == rp->first && TBL_CELL_SPAN == c) { |
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
|
return(0); |
|
} |
|
|
|
(*pos)++; |
|
|
/* Extra check for the double-vertical. */ |
/* Extra check for the double-vertical. */ |
|
|
if (TBL_CELL_VERT == c && '|' == p[*pos]) { |
if (TBL_CELL_VERT == c && '|' == p[*pos]) { |
Line 188 cell(struct tbl *tbl, struct tbl_row *rp, |
|
Line 225 cell(struct tbl *tbl, struct tbl_row *rp, |
|
|
|
/* Allocate cell then parse its modifiers. */ |
/* Allocate cell then parse its modifiers. */ |
|
|
cp = mandoc_calloc(1, sizeof(struct tbl_cell)); |
return(mods(tbl, cell_alloc(tbl, rp, c), ln, p, pos)); |
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)); |
|
} |
} |
|
|
|
|
static void |
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; |
struct tbl_row *rp; |
|
|
|
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
|
int |
int |
tbl_layout(struct tbl *tbl, int ln, const char *p) |
tbl_layout(struct tbl_node *tbl, int ln, const char *p) |
{ |
{ |
int pos; |
int pos; |
|
|
Line 264 tbl_layout(struct tbl *tbl, int ln, const char *p) |
|
Line 291 tbl_layout(struct tbl *tbl, int ln, const char *p) |
|
/* Always succeed. */ |
/* Always succeed. */ |
return(1); |
return(1); |
} |
} |
|
|
|
static struct tbl_cell * |
|
cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) |
|
{ |
|
struct tbl_cell *p, *pp; |
|
struct tbl_head *h, *hp; |
|
|
|
p = mandoc_calloc(1, sizeof(struct tbl_cell)); |
|
|
|
if (NULL != (pp = rp->last)) { |
|
rp->last->next = p; |
|
rp->last = p; |
|
} else |
|
rp->last = rp->first = p; |
|
|
|
p->pos = pos; |
|
|
|
/* |
|
* 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) { |
|
/* Re-use data header. */ |
|
if (TBL_HEAD_DATA == h->pos && |
|
(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->ident = tbl->opts.cols++; |
|
|
|
if (tbl->last_head) { |
|
hp->prev = tbl->last_head; |
|
tbl->last_head->next = hp; |
|
tbl->last_head = hp; |
|
} else |
|
tbl->last_head = tbl->first_head = hp; |
|
|
|
head_adjust(p, hp); |
|
p->head = hp; |
|
return(p); |
|
} |
|
|
|
static void |
|
head_adjust(const struct tbl_cell *cell, struct tbl_head *head) |
|
{ |
|
if (TBL_CELL_VERT != cell->pos && |
|
TBL_CELL_DVERT != cell->pos) { |
|
head->pos = TBL_HEAD_DATA; |
|
return; |
|
} |
|
|
|
if (TBL_CELL_VERT == cell->pos) |
|
if (TBL_HEAD_DVERT != head->pos) |
|
head->pos = TBL_HEAD_VERT; |
|
|
|
if (TBL_CELL_DVERT == cell->pos) |
|
head->pos = TBL_HEAD_DVERT; |
|
} |
|
|