Simplify the roff(7) .ce and .rj terminal formatter by using the

[mandoc.git] / tbl.7

diff --git a/tbl.7 b/tbl.7
index e2f84538370b042d436d1a08b9db7df0eaf16003..0766ab3f8b29e0fb2dd47b9791c651ee432b0474 100644 (file)
--- a/tbl.7
+++ b/tbl.7
@@ -1,7 +1,7 @@
-.\"    $Id: tbl.7,v 1.28 2017/06/28 00:59:57 schwarze Exp $
+.\"    $Id: tbl.7,v 1.31 2018/12/14 20:40:24 schwarze Exp $

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

-.\" Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2014, 2015, 2017, 2018 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
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above


@@ -15,7 +15,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: June 28 2017 $
+.Dd $Mdocdate: December 14 2018 $

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


@@ -147,9 +147,9 @@ The combined cell as a whole consumes only one cell
 of the corresponding data line.
 .It Cm a
 Left-justify a string and pad with one space.
 of the corresponding data line.
 .It Cm a
 Left-justify a string and pad with one space.

-.It Cm ^
+.It Cm \(ha

 Vertically span rows from the last
 Vertically span rows from the last

-.Pf non- Cm ^
+.Pf non- Cm \(ha

 layout cell.
 It is an error to invoke a vertical span on the first layout line.
 Unlike a horizontal span, a vertical span consumes a data cell
 layout cell.
 It is an error to invoke a vertical span on the first layout line.
 Unlike a horizontal span, a vertical span consumes a data cell


@@ -231,7 +231,13 @@ Each data line consists of one or more data cells, delimited by
 .Cm tab
 characters.
 .Pp
 .Cm tab
 characters.
 .Pp

-If a data cells contains only the single character
+If a data cell contains only the two bytes
+.Ql \e\(ha ,
+the cell above spans to this row, as if the layout specification
+of this cell were
+.Cm \(ha .
+.Pp
+If a data cell contains only the single character

 .Ql _
 or
 .Ql = ,
 .Ql _
 or
 .Ql = ,


@@ -323,7 +329,7 @@ _
 AFL:2.39b
 Mutt:1.8.0
 Ruby:1.8.7.374
 AFL:2.39b
 Mutt:1.8.0
 Ruby:1.8.7.374

-TeX Live:2015 
+TeX Live:2015

 .TE
 .Ed
 .sp 2v
 .TE
 .Ed
 .sp 2v


@@ -332,8 +338,8 @@ Spans and skipping width calculations:
 \&.TS
 box tab(:);
 lz  s | rt
 \&.TS
 box tab(:);
 lz  s | rt

-lt| cb| ^
-^ | rz  s.
+lt| cb| \(ha
+\(ha | rz  s.

 left:r
 l:center:
 :right
 left:r
 l:center:
 :right


@@ -420,7 +426,9 @@ The GNU reimplementation of tbl, part of the groff package, was released
 in 1990 by James Clark.
 A standalone tbl implementation was written by Kristaps Dzonsons in
 2010.
 in 1990 by James Clark.
 A standalone tbl implementation was written by Kristaps Dzonsons in
 2010.

-This formed the basis of the implementation that is part of the
+This formed the basis of the implementation that first appeared in
+.Ox 4.9
+as a part of the

 .Xr mandoc 1
 utility.
 .Sh AUTHORS
 .Xr mandoc 1
 utility.
 .Sh AUTHORS