diff options
| author |   schwarze <schwarze@openbsd.org> | 2017-06-08 18:11:15 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2017-06-08 18:11:15 +0000 |
| commit | 2c3e66c426702142f6874d869c4af553cb7036ae (patch) | |
| tree | 197a82795e14b942356980230f008f13271f2e00 /usr.bin/mandoc/mandoc.h | |
| parent | Link lastcomm regress to build. (diff) | |
| download | wireguard-openbsd-2c3e66c426702142f6874d869c4af553cb7036ae.tar.xz wireguard-openbsd-2c3e66c426702142f6874d869c4af553cb7036ae.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 'usr.bin/mandoc/mandoc.h')
| -rw-r--r-- | usr.bin/mandoc/mandoc.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index a0c44e1cf85..d9860bf0dc3 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc.h,v 1.167 2017/06/08 00:21:23 schwarze Exp $ */ +/* $OpenBSD: mandoc.h,v 1.168 2017/06/08 18:11:15 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -246,9 +246,10 @@ enum tbl_cellt { */ struct tbl_cell { struct tbl_cell *next; + char *wstr; /* min width represented as a string */ + size_t width; /* minimum column width */ + size_t spacing; /* to the right of the column */ int vert; /* width of subsequent vertical line */ - enum tbl_cellt pos; - size_t spacing; int col; /* column number, starting from 0 */ int flags; #define TBL_CELL_TALIGN (1 << 0) /* t, T */ @@ -259,6 +260,7 @@ struct tbl_cell { #define TBL_CELL_UP (1 << 5) /* u, U */ #define TBL_CELL_WIGN (1 << 6) /* z, Z */ #define TBL_CELL_WMAX (1 << 7) /* x, X */ + enum tbl_cellt pos; }; /* @@ -286,9 +288,10 @@ enum tbl_datt { */ struct tbl_dat { struct tbl_cell *layout; /* layout cell */ - int spans; /* how many spans follow */ struct tbl_dat *next; char *string; /* data (NULL if not TBL_DATA_DATA) */ + int spans; /* how many spans follow */ + int block; /* T{ text block T} */ enum tbl_datt pos; }; |