diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-06-08 18:11:22 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-08 18:11:22 +0000 |
| commit | 487d956e07013bc929ab478a0503246df414b00a (patch) | |
| tree | 22c2d5abff010bc035dd6d8ee6c0d64f46a9b627 /tbl_layout.c | |
| parent | 789580a2a2366243d622766fdadd094931ca6596 (diff) | |
| download | mandoc-487d956e07013bc929ab478a0503246df414b00a.tar.gz mandoc-487d956e07013bc929ab478a0503246df414b00a.tar.zst mandoc-487d956e07013bc929ab478a0503246df414b00a.zip | |
Implement w layout specifier (minimum column width).
Improve width calculation of text blocks.
Reduces the groff/mandoc diff in Base+Xenocara by about 800 lines.
Diffstat (limited to 'tbl_layout.c')
| -rw-r--r-- | tbl_layout.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/tbl_layout.c b/tbl_layout.c index c0eafbdd..d27ac3cd 100644 --- a/tbl_layout.c +++ b/tbl_layout.c @@ -1,7 +1,7 @@ -/* $Id: tbl_layout.c,v 1.41 2015/10/12 00:08:16 schwarze Exp $ */ +/* $Id: tbl_layout.c,v 1.42 2017/06/08 18:11:22 schwarze Exp $ */ /* * 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 * purpose with or without fee is hereby granted, provided that the above @@ -62,6 +62,7 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp, int ln, const char *p, int *pos) { char *endptr; + size_t sz; mod: while (p[*pos] == ' ' || p[*pos] == '\t') @@ -127,7 +128,22 @@ mod: case 'u': cp->flags |= TBL_CELL_UP; 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; case 'x': cp->flags |= TBL_CELL_WMAX; |