version 1.24, 2014/03/23 11:25:26 |
version 1.27, 2014/08/10 23:54:41 |
|
|
/* $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 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 <sys/types.h> |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
Line 55 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
Line 55 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ '=', TBL_CELL_DHORIZ } |
{ '=', TBL_CELL_DHORIZ } |
}; |
}; |
|
|
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 *, struct tbl_row *, |
static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, |
enum tbl_cellt, int vert); |
enum tbl_cellt, int vert); |
|
|
|
|
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 73 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: |
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 'f': |
break; |
break; |
case ('r'): |
case 'r': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('b'): |
case 'b': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('i'): |
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 ('3'): |
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; |
break; |
} |
} |
|
|
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 vert, i; |
int vert, i; |
Line 218 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 221 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
while (' ' == p[*pos]) |
while (' ' == p[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
|
/* Handle trailing vertical lines */ |
|
|
|
if ('.' == p[*pos] || '\0' == p[*pos]) { |
|
rp->vert = vert; |
|
return(1); |
|
} |
|
|
/* 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++) |
Line 225 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 235 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
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 243 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 253 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_HORIZ): |
case TBL_CELL_HORIZ: |
case (TBL_CELL_DHORIZ): |
/* FALLTHROUGH */ |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
case TBL_CELL_DHORIZ: |
ln, *pos, NULL); |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
|
tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
default: |
default: |
break; |
break; |
Line 281 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 292 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
return(mods(tbl, cell_alloc(tbl, rp, c, vert), 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) |
{ |
{ |
|
|
|
|
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; |
} |
} |