version 1.39, 2015/04/29 12:44:58 |
version 1.42, 2017/06/08 18:11:22 |
|
|
/* $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, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014, 2015, 2017 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 |
Line 62 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
Line 62 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
char *endptr; |
char *endptr; |
|
size_t sz; |
|
|
mod: |
mod: |
while (p[*pos] == ' ' || p[*pos] == '\t') |
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
|
ln, *pos, "m"); |
ln, *pos, "m"); |
goto mod; |
goto mod; |
case 'p': |
case 'p': |
/* FALLTHROUGH */ |
|
case 'v': |
case 'v': |
if (p[*pos] == '-' || p[*pos] == '+') |
if (p[*pos] == '-' || p[*pos] == '+') |
(*pos)++; |
(*pos)++; |
|
|
case 'u': |
case 'u': |
cp->flags |= TBL_CELL_UP; |
cp->flags |= TBL_CELL_UP; |
goto mod; |
goto mod; |
case 'w': /* XXX for now, ignore minimal column width */ |
case 'w': |
|
sz = 0; |
|
if (p[*pos] == '(') { |
|
(*pos)++; |
|
while (p[*pos + sz] != '\0' && p[*pos + sz] != ')') |
|
sz++; |
|
} else |
|
while (isdigit((unsigned char)p[*pos + sz])) |
|
sz++; |
|
if (sz) { |
|
free(cp->wstr); |
|
cp->wstr = mandoc_strndup(p + *pos, sz); |
|
*pos += sz; |
|
if (p[*pos] == ')') |
|
(*pos)++; |
|
} |
goto mod; |
goto mod; |
case 'x': |
case 'x': |
cp->flags |= TBL_CELL_WMAX; |
cp->flags |= TBL_CELL_WMAX; |
|
|
|
|
switch (p[(*pos)++]) { |
switch (p[(*pos)++]) { |
case '3': |
case '3': |
/* FALLTHROUGH */ |
|
case 'B': |
case 'B': |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
case '2': |
case '2': |
/* FALLTHROUGH */ |
|
case 'I': |
case 'I': |
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
goto mod; |
case '1': |
case '1': |
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
goto mod; |
goto mod; |
default: |
default: |
Line 355 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 367 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
if (tbl->opts.cols <= p->col) |
if (tbl->opts.cols <= p->col) |
tbl->opts.cols = p->col + 1; |
tbl->opts.cols = p->col + 1; |
|
|
return(p); |
return p; |
} |
} |