version 1.6, 2011/01/02 10:10:57 |
version 1.14, 2011/01/10 14:40:30 |
Line 29 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] = { |
|
|
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])) { |
|
|
|
|
/* TODO: GNU has many more extensions. */ |
/* TODO: GNU has many more extensions. */ |
|
|
switch (tolower(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 ('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'): |
|
|
return(0); |
return(0); |
} |
} |
|
|
switch (tolower(p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('b'): |
case ('b'): |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
Line 163 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 185 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
/* Parse the column position (`r', `R', `|', ...). */ |
/* Parse the column position (`r', `R', `|', ...). */ |
|
|
for (i = 0; i < KEYS_MAX; i++) |
for (i = 0; i < KEYS_MAX; i++) |
if (tolower(p[*pos]) == keys[i].name) |
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
break; |
break; |
|
|
if (KEYS_MAX == i) { |
if (KEYS_MAX == i) { |
Line 171 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 193 cell(struct tbl_node *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. 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 (NULL == rp->first) { |
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
|
return(0); |
|
} else if (rp->last) |
|
switch (rp->last->pos) { |
|
case (TBL_CELL_VERT): |
|
case (TBL_CELL_DVERT): |
|
case (TBL_CELL_HORIZ): |
|
case (TBL_CELL_DHORIZ): |
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
|
return(0); |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
(*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 294 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 342 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
* ones. |
* ones. |
*/ |
*/ |
|
|
h = pp ? pp->head->prev : tbl->first_head; |
h = pp ? pp->head->next : tbl->first_head; |
|
|
if (h) { |
if (h) { |
/* Re-use data header. */ |
/* Re-use data header. */ |
Line 319 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 367 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
(TBL_CELL_VERT == p->pos || |
(TBL_CELL_VERT == p->pos || |
TBL_CELL_DVERT == p->pos)) { |
TBL_CELL_DVERT == p->pos)) { |
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
|
hp->ident = tbl->opts.cols++; |
hp->prev = h->prev; |
hp->prev = h->prev; |
if (h->prev) |
if (h->prev) |
h->prev->next = hp; |
h->prev->next = hp; |
|
if (h == tbl->first_head) |
|
tbl->first_head = hp; |
h->prev = hp; |
h->prev = hp; |
hp->next = h; |
hp->next = h; |
head_adjust(p, hp); |
head_adjust(p, hp); |
Line 339 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 390 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
} |
} |
|
|
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
hp = mandoc_calloc(1, sizeof(struct tbl_head)); |
|
hp->ident = tbl->opts.cols++; |
|
|
if (tbl->last_head) { |
if (tbl->last_head) { |
hp->prev = tbl->last_head; |
hp->prev = tbl->last_head; |