Clarify some behaviour, bringing schwarze@'s patch and mine closer together

[mandoc.git] / tbl.7

diff --git a/tbl.7 b/tbl.7
index 1bb8647e1b8702443db738c15b0ab732c5d89ab1..ea3d2ba3a8b60d3b824ddf5d92ca63222424547d 100644 (file)
--- a/tbl.7
+++ b/tbl.7
@@ -1,6 +1,6 @@
-.\"    $Id: tbl.7,v 1.10 2011/01/11 14:15:56 kristaps Exp $
+.\"    $Id: tbl.7,v 1.16 2011/09/03 00:29:21 kristaps Exp $

 .\"
 .\"

-.\" Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above


@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"

-.Dd $Mdocdate: January 11 2011 $
+.Dd $Mdocdate: September 3 2011 $

 .Dt TBL 7
 .Os
 .Sh NAME
 .Dt TBL 7
 .Os
 .Sh NAME


@@ -49,7 +49,7 @@ macro tags, whose precise syntax is documented in
 Tables consist of a series of options on a single line, followed by the
 table layout, followed by data.
 .Pp
 Tables consist of a series of options on a single line, followed by the
 table layout, followed by data.
 .Pp

-For example, the following creates a boxed table with digits centered in
+For example, the following creates a boxed table with digits centred in

 the cells.
 .Bd -literal -offset indent
 \&.TS
 the cells.
 .Bd -literal -offset indent
 \&.TS


@@ -69,6 +69,13 @@ c5 c5 c5.
 4:5:6
 .TE
 .Ed
 4:5:6
 .TE
 .Ed

+.Pp
+The
+.Nm
+implementation in
+.Xr mandoc 1
+is
+.Ud

 .Sh TABLE STRUCTURE
 Tables are enclosed by the
 .Sq TS
 .Sh TABLE STRUCTURE
 Tables are enclosed by the
 .Sq TS


@@ -180,8 +187,6 @@ Accepts a single-character argument.
 This character will be used as the decimal point with the
 .Cm n
 layout key.
 This character will be used as the decimal point with the
 .Cm n
 layout key.

-This option is not supported by
-.Xr mandoc 1 .

 .It Cm nospaces
 This option is not supported by
 .Xr mandoc 1 .
 .It Cm nospaces
 This option is not supported by
 .Xr mandoc 1 .


@@ -209,8 +214,8 @@ Justify a number around its last decimal point.
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s

-Horizontally span columns from the last non-
-.Ns Cm s
+Horizontally span columns from the last
+.No non- Ns Cm s

 data cell.
 It is an error if spanning columns follow a
 .Cm \-
 data cell.
 It is an error if spanning columns follow a
 .Cm \-


@@ -222,8 +227,8 @@ This option is not supported by
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^

-Vertically span rows from the last non-
-.Ns Cm ^
+Vertically span rows from the last
+.No non- Ns Cm ^

 data cell.
 It is an error to invoke a vertical span on the first layout row.
 Unlike a horizontal spanner, you must specify an empty cell (if it not
 data cell.
 It is an error to invoke a vertical span on the first layout row.
 Unlike a horizontal spanner, you must specify an empty cell (if it not


@@ -251,12 +256,21 @@ The following case-insensitive modifier keys are available:
 .Cm e ,
 .Cm t ,
 .Cm d ,
 .Cm e ,
 .Cm t ,
 .Cm d ,

-.Cm f ,

 .Cm b ,
 .Cm i ,
 .Cm b ,
 .Cm i ,

-.Cm b ,
+.Cm r ,

 and
 and

-.Cm i .
+.Cm f
+.Po
+followed by
+.Cm b ,
+.Cm i ,
+.Cm r ,
+.Cm 3 ,
+.Cm 2 ,
+or
+.Cm 1
+.Pc .

 All of these are ignored by
 .Xr mandoc 1 .
 .Pp
 All of these are ignored by
 .Xr mandoc 1 .
 .Pp


@@ -327,7 +341,8 @@ This formed the basis of the implementation that is part of the
 .Xr mandoc 1
 utility.
 .Sh AUTHORS
 .Xr mandoc 1
 utility.
 .Sh AUTHORS

-This partial
+This

 .Nm
 reference was written by
 .Nm
 reference was written by

-.An Kristaps Dzonsons Aq kristaps@bsd.lv .
+.An Kristaps Dzonsons ,
+.Mt kristaps@bsd.lv .