version 1.14, 2011/01/10 14:40:30 |
version 1.22, 2011/09/18 14:14:15 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* 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" |
|
#endif |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
Line 68 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
Line 72 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
char buf[5]; |
char buf[5]; |
int i; |
int i; |
|
|
|
/* Not all types accept modifiers. */ |
|
|
|
switch (cp->pos) { |
|
case (TBL_CELL_DOWN): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_HORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_DHORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_VERT): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_DVERT): |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
mod: |
mod: |
/* |
/* |
* XXX: since, at least for now, modifiers are non-conflicting |
* XXX: since, at least for now, modifiers are non-conflicting |
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
|
tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
/* No greater than 4 digits. */ |
/* No greater than 4 digits. */ |
|
|
if (4 == i) { |
if (4 == i) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
*pos += i; |
*pos += i; |
cp->spacing = atoi(buf); |
cp->spacing = (size_t)atoi(buf); |
|
|
goto mod; |
goto mod; |
/* NOTREACHED */ |
/* NOTREACHED */ |
|
|
goto mod; |
goto mod; |
case ('f'): |
case ('f'): |
break; |
break; |
|
case ('r'): |
|
/* FALLTHROUGH */ |
case ('b'): |
case ('b'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('i'): |
case ('i'): |
(*pos)--; |
(*pos)--; |
break; |
break; |
default: |
default: |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
|
case ('3'): |
|
/* FALLTHROUGH */ |
case ('b'): |
case ('b'): |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
|
case ('2'): |
|
/* FALLTHROUGH */ |
case ('i'): |
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; |
} |
} |
|
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 189 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 224 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
break; |
break; |
|
|
if (KEYS_MAX == i) { |
if (KEYS_MAX == i) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 205 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 241 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) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} else if (rp->last) |
} else if (rp->last) |
switch (rp->last->pos) { |
switch (rp->last->pos) { |
Line 213 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 250 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
case (TBL_CELL_DVERT): |
case (TBL_CELL_DVERT): |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_DHORIZ): |
case (TBL_CELL_DHORIZ): |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
default: |
default: |
break; |
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)++; |
|
|
/* Extra check for the double-vertical. */ |
/* Extra check for the double-vertical. */ |
Line 234 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 282 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && |
if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && |
(TBL_CELL_VERT == rp->last->pos || |
(TBL_CELL_VERT == rp->last->pos || |
TBL_CELL_DVERT == rp->last->pos)) { |
TBL_CELL_DVERT == rp->last->pos)) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
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) |
TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
(*pos)++; |
(*pos)++; |
return; |
return; |
} |
} |
Line 405 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 454 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
} |
} |
|
|
static void |
static void |
head_adjust(const struct tbl_cell *cell, struct tbl_head *head) |
head_adjust(const struct tbl_cell *cellp, struct tbl_head *head) |
{ |
{ |
if (TBL_CELL_VERT != cell->pos && |
if (TBL_CELL_VERT != cellp->pos && |
TBL_CELL_DVERT != cell->pos) { |
TBL_CELL_DVERT != cellp->pos) { |
head->pos = TBL_HEAD_DATA; |
head->pos = TBL_HEAD_DATA; |
return; |
return; |
} |
} |
|
|
if (TBL_CELL_VERT == cell->pos) |
if (TBL_CELL_VERT == cellp->pos) |
if (TBL_HEAD_DVERT != head->pos) |
if (TBL_HEAD_DVERT != head->pos) |
head->pos = TBL_HEAD_VERT; |
head->pos = TBL_HEAD_VERT; |
|
|
if (TBL_CELL_DVERT == cell->pos) |
if (TBL_CELL_DVERT == cellp->pos) |
head->pos = TBL_HEAD_DVERT; |
head->pos = TBL_HEAD_DVERT; |
} |
} |
|
|