diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-01-26 18:41:47 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-01-26 18:41:47 +0000 |
commit | fdcd3d21832c83c6ea3965777b6a70d1d311ab3f (patch) | |
tree | 6168d393d345d69e29a9311221f3a67017d67c5f /share | |
parent | 962371a7a40258a1f1047908d55e725532879bff (diff) |
Rework tbl(7) layout parsing:
* Continue parsing even if part of the input is invalid.
* Do not require whitespace between cell specifications.
* Allow tabs as well as blanks between modifiers.
* Mark the 'm' modifier as unsupported.
* Parse and ignore the 'p' and 'v' modifiers.
* Better warning and error messages.
* Get rid of a static buffer.
Improved functionality but minus 50 lines of code.
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man7/tbl.7 | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/share/man/man7/tbl.7 b/share/man/man7/tbl.7 index e911d69dccd..19a10015851 100644 --- a/share/man/man7/tbl.7 +++ b/share/man/man7/tbl.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tbl.7,v 1.11 2015/01/26 13:02:53 schwarze Exp $ +.\" $OpenBSD: tbl.7,v 1.12 2015/01/26 18:41:45 schwarze Exp $ .\" .\" Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -251,6 +251,9 @@ The following case-insensitive modifier keys are available: .Bl -tag -width 2n .It Cm b Use a bold font for the contents of this column. +.It Cm d +Move cell content down to the last cell of a vertical span. +Currently ignored. .It Cm e Make this column wider to match the maximum width of any other column also having the @@ -263,6 +266,27 @@ See the manual for supported one-character font names. .It Cm i Use an italic font for the contents of this column. +.It Cm m +Specify a cell start macro. +This is a GNU extension and currently unsupported. +.It Cm p +Set the point size to the following unsigned argument, +or change it by the following signed argument. +Currently ignored. +.It Cm v +Set the vertical line spacing to the following unsigned argument, +or change it by the following signed argument. +Currently ignored. +.It Cm t +Do not vertically center cell content in the vertical span, +leave it at the top. +Currently ignored. +.It Cm u +Move cell content up by half a table line. +Currently ignored. +.It Cm w +Specify minimum column width. +Currently ignored. .It Cm x After determining the width of all other columns, distribute the rest of the line length among all columns having the @@ -272,15 +296,6 @@ modifier. Do not use this cell for determining the width of this column. .El .Pp -The modifiers -.Cm d , -.Cm t , -.Cm u , -and -.Cm w -are ignored by -.Xr mandoc 1 . -.Pp For example, the following layout specifies a center-justified column of minimum width 10, followed by vertical bar, followed by a left-justified column of minimum width 10, another vertical bar, then a column using |