BSD 4 release

[unix-history] / usr / lib / tmac / tmac.e

diff --git a/usr/lib/tmac/tmac.e b/usr/lib/tmac/tmac.e
index e9e6199..2531cbc 100644 (file)
--- a/usr/lib/tmac/tmac.e
+++ b/usr/lib/tmac/tmac.e
@@ -8,12 +8,14 @@
 .\"*           Electronics Research Laboratory                         *
 .\"*           U.C. Berkeley.                                          *
 .\"*                                                                   *
 .\"*           Electronics Research Laboratory                         *
 .\"*           U.C. Berkeley.                                          *
 .\"*                                                                   *

-.\"*   VERSION 1.1     First Release: 11 Sept 1978                     *
+.\"*   VERSION 2.8     First Release: 11 Sept 1978                     *

 .\"*   See file \*(||/revisions for revision history                   *
 .\"*                                                                   *
 .\"*   Documentation is available.                                     *
 .\"*                                                                   *
 .\"**********************************************************************
 .\"*   See file \*(||/revisions for revision history                   *
 .\"*                                                                   *
 .\"*   Documentation is available.                                     *
 .\"*                                                                   *
 .\"**********************************************************************

+.\"
+.\"    @(#)tmac.e      2.8     11/10/80

 .\" This version has had comments stripped; an unstripped version is available.
 .if !\n(.V .tm You are using the wrong version of NROFF/TROFF!!
 .if !\n(.V .tm This macro package works only on the version seven
 .\" This version has had comments stripped; an unstripped version is available.
 .if !\n(.V .tm You are using the wrong version of NROFF/TROFF!!
 .if !\n(.V .tm This macro package works only on the version seven


@@ -146,6 +148,7 @@
 .rn |6 |2
 .rn |7 |3
 .nr _w 0
 .rn |6 |2
 .rn |7 |3
 .nr _w 0

+.nr ?W 0

 .nr ?I 1
 .ev 2
 .rs
 .nr ?I 1
 .ev 2
 .rs


@@ -180,7 +183,7 @@
 .de @n
 .if \\n(bm<=0 \
 .      nr bm \\n(.Vu
 .de @n
 .if \\n(bm<=0 \
 .      nr bm \\n(.Vu

-.if \\n(_w<=\\n($l \
+.if (\\n(_w<=\\n($l)&(\\n(?W=0) \

 \{\
 .      nr _b (\\n(ppu*\\n($ru)/2u
 .      if \\n(_bu>((\\n(bmu-\\n(fmu-(\\n(tpu*\\n($ru))/2u) \
 \{\
 .      nr _b (\\n(ppu*\\n($ru)/2u
 .      if \\n(_bu>((\\n(bmu-\\n(fmu-(\\n(tpu*\\n($ru))/2u) \


@@ -211,10 +214,13 @@
 .      mk #T
 .      ns
 .\}
 .      mk #T
 .      ns
 .\}

-.if \\n(?a \
+.if (\\n(?a)&((\\n($c<2):(\\n(?w=0)) \

 \{\
 .      nr ?a 0
 .      @k |t
 \{\
 .      nr ?a 0
 .      @k |t

+.      if \\n(?w \
+.              mk _k
+.      nr ?w 0

 .\}
 .os
 .$H
 .\}
 .os
 .$H


@@ -532,10 +538,10 @@
 .sp 24i
 ..
 .de (z
 .sp 24i
 ..
 .de (z

-.rn (z @T
+.rn (z @V

 .so \\*(||/float.me
 .(z \\$1 \\$2
 .so \\*(||/float.me
 .(z \\$1 \\$2

-.rm @T
+.rm @V

 ..
 .de )z
 .tm Line \\n(c. -- unmatched .)z
 ..
 .de )z
 .tm Line \\n(c. -- unmatched .)z


@@ -606,6 +612,7 @@
 ..
 .de )c
 .if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c
 ..
 .de )c
 .if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c

+.br

 .di
 .ev 1
 .ls 1
 .di
 .ev 1
 .ls 1


@@ -652,10 +659,10 @@
 .rm @T
 ..
 .de TS
 .rm @T
 ..
 .de TS

-.rn TS @T
+.rn TS @W

 .so \\*(||/tbl.me
 .TS \\$1 \\$2
 .so \\*(||/tbl.me
 .TS \\$1 \\$2

-.rm @T
+.rm @W

 ..
 .de sz
 .ps \\$1
 ..
 .de sz
 .ps \\$1


@@ -726,10 +733,10 @@
 .rr ~
 ..
 .de (f
 .rr ~
 ..
 .de (f

-.rn (f @T
+.rn (f @U

 .so \\*(||/footnote.me
 .(f \\$1 \\$2
 .so \\*(||/footnote.me
 .(f \\$1 \\$2

-.rm @T
+.rm @U

 ..
 .de )f
 .tm Line \\n(c. -- unmatched .)f
 ..
 .de )f
 .tm Line \\n(c. -- unmatched .)f


@@ -740,19 +747,19 @@
 .      sp 0.3
 ..
 .de (d
 .      sp 0.3
 ..
 .de (d

-.rn (d @T
+.rn (d @U

 .so \\*(||/deltext.me
 .(d \\$1 \\$2
 .so \\*(||/deltext.me
 .(d \\$1 \\$2

-.rm @T
+.rm @U

 ..
 .de )d
 .tm Line \\n(c. -- unmatched .)d
 ..
 .de (x
 ..
 .de )d
 .tm Line \\n(c. -- unmatched .)d
 ..
 .de (x

-.rn (x @T
+.rn (x @U

 .so \\*(||/index.me
 .(x \\$1 \\$2
 .so \\*(||/index.me
 .(x \\$1 \\$2

-.rm @T
+.rm @U

 ..
 .de )x
 .tm Line \\n(c. -- unmatched .)x
 ..
 .de )x
 .tm Line \\n(c. -- unmatched .)x


@@ -925,6 +932,11 @@
 .      ds < \v'0.4m'\x'0.2m'\s-3
 .      ds > \s0\v'-0.4m'
 .      ds - \-
 .      ds < \v'0.4m'\x'0.2m'\s-3
 .      ds > \s0\v'-0.4m'
 .      ds - \-

+.      nr fi 0.3i
+.\}
+.if n \
+\{\
+.      nr fi 3n

 .\}
 .nr _o \n(.o
 .if n .po 1i
 .\}
 .nr _o \n(.o
 .if n .po 1i


@@ -937,6 +949,8 @@
 .      nr $T 0
 .      po -0.5i
 .\}
 .      nr $T 0
 .      po -0.5i
 .\}

+.if \nv \
+.      po 1i

 .if \n($T \
 \{\
 .      if \n($T=1 \
 .if \n($T \
 \{\
 .      if \n($T=1 \