minor fixes (still have blank line booboo somewheres)

SCCS-vsn: share/tmac/doc 5.11
SCCS-vsn: share/tmac/doc-common 5.8
SCCS-vsn: share/tmac/doc-ditroff 5.9
SCCS-vsn: share/tmac/doc-nroff 5.7
SCCS-vsn: share/tmac/doc-syms 5.8
SCCS-vsn: share/tmac/Makefile 6.15
SCCS-vsn: share/tmac/tmac.andoc 5.8
SCCS-vsn: share/tmac/tmac.s 1.2
SCCS-vsn: share/tmac/tmac.e 1.2

diff --git a/usr/src/share/tmac/Makefile b/usr/src/share/tmac/Makefile
index 77fd28c..b90701a 100644 (file)
--- a/usr/src/share/tmac/Makefile
+++ b/usr/src/share/tmac/Makefile
@@ -1,14 +1,15 @@
-#      @(#)Makefile    6.14 (Berkeley) %G%
+#      @(#)Makefile    6.15 (Berkeley) %G%

 
 # Missing: tmac.a tmac.an.old tmac.cp tmac.r
 
 FILES= tmac.andoc tmac.doc.old
 MSRCS=  doc doc-ditroff doc-common doc-nroff doc-syms
 
 # Missing: tmac.a tmac.an.old tmac.cp tmac.r
 
 FILES= tmac.andoc tmac.doc.old
 MSRCS=  doc doc-ditroff doc-common doc-nroff doc-syms

+

 LINKS= ${BINDIR}/tmac/tmac.andoc ${BINDIR}/tmac/tmac.an
 NOOBJ= noobj
 
 # old macros not currently installed...
 LINKS= ${BINDIR}/tmac/tmac.andoc ${BINDIR}/tmac/tmac.an
 NOOBJ= noobj
 
 # old macros not currently installed...

-OFILES=        tmac.an.v6compat tmac.an6n tmac.an6t tmac.a tmac.cp
+# OFILES=      tmac.a tmac.cp

 
 all clean cleandir depend lint tags:
 
 
 all clean cleandir depend lint tags:
 

diff --git a/usr/src/share/tmac/doc b/usr/src/share/tmac/doc
index f276495..8bb8e09 100644 (file)
--- a/usr/src/share/tmac/doc
+++ b/usr/src/share/tmac/doc
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)doc        5.10 (Berkeley) %G%
+.\"     @(#)doc        5.11 (Berkeley) %G%

 .\"
 .\" .mdoc-parse - attempt to parse troff request arguments
 .\"     %beginstrip%
 .\"
 .\" .mdoc-parse - attempt to parse troff request arguments
 .\"     %beginstrip%


@@ -2250,7 +2250,6 @@
 .              aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .      \}
 .\}
 .              aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .      \}
 .\}

-.\}

 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      as b1 \\*(sX
 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      as b1 \\*(sX


@@ -2635,7 +2634,8 @@
 .              f\\n(C\\n(aP
 .      \}
 .      el \{\
 .              f\\n(C\\n(aP
 .      \}
 .      el \{\

-.              as b1 \|\\*(rp
+.              ie \\n(nS>0 .as b1 \|\\*(rp\fR;\fP
+.              el .as b1 \|\\*(rp

 .              aZ
 .      \}
 .      if \\n(nS>0 \{\
 .              aZ
 .      \}
 .      if \\n(nS>0 \{\


@@ -2649,7 +2649,8 @@
 .\" NS f3 macro - punctuation
 .\" NS f4 macro - write out function
 .de f1
 .\" NS f3 macro - punctuation
 .\" NS f4 macro - write out function
 .de f1

-.as b1 \\*(rp\f\\n(cF\s\\n(cZ
+.ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ
+.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ

 .\\*(A\\n(aP
 ..
 .de f2
 .\\*(A\\n(aP
 ..
 .de f2


@@ -2673,19 +2674,22 @@
 .      f\\n(C\\n(aP
 .\}
 .el  \{\
 .      f\\n(C\\n(aP
 .\}
 .el  \{\

-.      as b1 \\*(rp\f\\n(cF\s\\n(cZ
+.      ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ
+.      el .as b1 \\*(rp\f\\n(cF\s\\n(cZ

 .      aZ
 .\}
 ..
 .de f3
 .      aZ
 .\}
 ..
 .de f3

-.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP
+.ie \\n(nS>0 .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP
+.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP

 .ie \\n(aC>\\n(aP \{\
 .      No
 .\}
 .el .aZ
 ..
 .de f4
 .ie \\n(aC>\\n(aP \{\
 .      No
 .\}
 .el .aZ
 ..
 .de f4

-.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP
+.ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP
+.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP

 .ie \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      No
 .ie \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      No


@@ -2776,7 +2780,8 @@
 .\}
 .nr fC 0
 .nr oM \\n(oM-1
 .\}
 .nr fC 0
 .nr oM \\n(oM-1

-.as b1 \|\\*(rp
+.ie \\n(nS>0 .as b1 \|\\*(rp\fR;\fP
+.el .as b1 \|\\*(rp

 .ie \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      \\*(A\\n(aP
 .ie \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .      \\*(A\\n(aP

diff --git a/usr/src/share/tmac/doc-common b/usr/src/share/tmac/doc-common
index 50f5b3a..16818be 100644 (file)
--- a/usr/src/share/tmac/doc-common
+++ b/usr/src/share/tmac/doc-common
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)doc-common 5.7 (Berkeley) %G%
+.\"     @(#)doc-common 5.8 (Berkeley) %G%

 .\"
 .\"     %beginstrip%
 .nr %A 1
 .\"
 .\"     %beginstrip%
 .nr %A 1


@@ -16,7 +16,6 @@
 .nr Ad 12n
 .nr Ac 3
 .nr Ao 12n
 .nr Ad 12n
 .nr Ac 3
 .nr Ao 12n

-.nr Ap 2

 .nr An 12n
 .nr Aq 12n
 .nr Ar 12n
 .nr An 12n
 .nr Aq 12n
 .nr Ar 12n


@@ -24,18 +23,14 @@
 .nr Bl 1
 .nr Bo 12n
 .nr Bq 12n
 .nr Bl 1
 .nr Bo 12n
 .nr Bq 12n

-.nr Bx 12n

 .nr Cd 12n
 .nr Cm 10n
 .nr Cd 12n
 .nr Cm 10n

-.nr Co 15n
-.nr Cx 20n

 .nr Dc 3
 .nr Do 10n
 .nr Dq 12n
 .nr Ds 6n
 .nr Dq 12n
 .nr Dv 12n
 .nr Dc 3
 .nr Do 10n
 .nr Dq 12n
 .nr Ds 6n
 .nr Dq 12n
 .nr Dv 12n

-.nr tI \n(Dsu

 .nr Ec 3
 .nr El 1
 .nr Eo 12n
 .nr Ec 3
 .nr El 1
 .nr Eo 12n


@@ -43,13 +38,11 @@
 .nr Em 10n
 .nr Er 12n
 .nr Ev 15n
 .nr Em 10n
 .nr Er 12n
 .nr Ev 15n

-.nr Ex 10n

 .nr Fa 12n
 .nr Fl 10n
 .nr Fc 3
 .nr Fo 16n
 .nr Fn 16n
 .nr Fa 12n
 .nr Fl 10n
 .nr Fc 3
 .nr Fo 16n
 .nr Fn 16n

-.nr Hl 1

 .nr I1 6n
 .nr I2 12n
 .nr I3 18n
 .nr I1 6n
 .nr I2 12n
 .nr I3 18n


@@ -68,26 +61,16 @@
 .nr Po 12n
 .nr Pq 12n
 .nr Ql 16n
 .nr Po 12n
 .nr Pq 12n
 .nr Ql 16n

-.nr Qc 3
-.nr Qo 12n
-.nr Qq 12n

 .nr Sc 3
 .nr So 12n
 .nr Sq 12n
 .nr Sy 6n
 .nr Sx 16n
 .nr Sc 3
 .nr So 12n
 .nr Sq 12n
 .nr Sy 6n
 .nr Sx 16n

-.nr Ra 1
-.nr Rj 1
-.nr Rn 1
-.nr Ro 1
-.nr Rr 1
-.nr Rt 1

 .nr Rv 1
 .nr Tn 10n
 .nr Ta 1
 .nr Tv 1
 .nr Tx 22n
 .nr Rv 1
 .nr Tn 10n
 .nr Ta 1
 .nr Tv 1
 .nr Tx 22n

-.nr Ux 10n

 .nr Va 12n
 .nr Xc 3
 .nr Xo 1
 .nr Va 12n
 .nr Xc 3
 .nr Xo 1


@@ -131,9 +114,9 @@
 .      ds cH \\$2
 .\" .  if "\\$3"" \{\
 .              if \\$2>=1 .if \\$2<=8 \{\
 .      ds cH \\$2
 .\" .  if "\\$3"" \{\
 .              if \\$2>=1 .if \\$2<=8 \{\

-.                      ds vT UNIX Reference Manual
-.                      if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual
-.                      if "\\$2"8" .ds vT UNIX System Manager's Manual
+.                      ds vT BSD Reference Manual
+.                      if \\$2>1 .if \\$2<6 .ds vT BSD Programmer's Manual
+.                      if "\\$2"8" .ds vT BSD System Manager's Manual

 .                      nr sN \\$2
 .              \}
 .              if "\\$2"unass"  .ds vT DRAFT
 .                      nr sN \\$2
 .              \}
 .              if "\\$2"unass"  .ds vT DRAFT


@@ -142,17 +125,17 @@
 .\" .  \}
 .\}
 .if !"\\$3"" \{\
 .\" .  \}
 .\}
 .if !"\\$3"" \{\

-.      if "\\$3"USD"   .ds vT UNIX User's Supplementary Documents
-.      if "\\$3"PS1"   .ds vT UNIX Programmers's Supplementary Documents
-.      if "\\$3"AMD"   .ds vT UNIX Ancestral Manual Documents
-.      if "\\$3"SMM"   .ds vT UNIX System Manager's Manual
-.      if "\\$3"URM"   .ds vT UNIX Reference Manual
-.      if "\\$3"PRM"   .ds vT UNIX Programmers's Manual
-.      if "\\$3"IND"   .ds vT UNIX Manual Master Index
-.\" .  if "\\$3"CON"   .ds vT UNIX Contributed Software Manual
-.\" .  if "\\$3"IMP"   .ds vT UNIX Implementation Notes
-.\" .  if "\\$3"HOW"   .ds vT UNIX How Pocket Manual
-.      if "\\$3"LOCAL" .ds vT UNIX Local Manual
+.      if "\\$3"USD"   .ds vT BSD User's Supplementary Documents
+.      if "\\$3"PS1"   .ds vT BSD Programmers's Supplementary Documents
+.      if "\\$3"AMD"   .ds vT BSD Ancestral Manual Documents
+.      if "\\$3"SMM"   .ds vT BSD System Manager's Manual
+.      if "\\$3"URM"   .ds vT BSD Reference Manual
+.      if "\\$3"PRM"   .ds vT BSD Programmers's Manual
+.      if "\\$3"IND"   .ds vT BSD Manual Master Index
+.\" .  if "\\$3"CON"   .ds vT BSD Contributed Software Manual
+.\" .  if "\\$3"IMP"   .ds vT BSD Implementation Notes
+.\" .  if "\\$3"HOW"   .ds vT BSD How Pocket Manual
+.      if "\\$3"LOCAL" .ds vT BSD Local Manual

 .      if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
 .      if "\\$3"vax" .as vT \ (VAX Architecture)
 .      if "\\$3"hp300" .as vT \ (HP300 Architecture)
 .      if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
 .      if "\\$3"vax" .as vT \ (VAX Architecture)
 .      if "\\$3"hp300" .as vT \ (HP300 Architecture)


@@ -168,7 +151,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
 .de Os
 .ds oS Null
 .if "\\$1"" \{\

-.      ds oS BSD Experimental
+.      ds oS 4.4BSD PRERELEASE

 .\}
 .if "\\$2"" \{\
 .      ds aa Non-Null
 .\}
 .if "\\$2"" \{\
 .      ds aa Non-Null


@@ -195,7 +178,7 @@
 .      if "\\$2"4.3R" .ds oS 4.3-Reno Berkeley Distribution
 .      if "\\$2"4.3t" .ds oS 4.3-Tahoe Berkeley Distribution
 .      if "\\$2"4.3r" .ds oS 4.3-Reno Berkeley Distribution
 .      if "\\$2"4.3R" .ds oS 4.3-Reno Berkeley Distribution
 .      if "\\$2"4.3t" .ds oS 4.3-Tahoe Berkeley Distribution
 .      if "\\$2"4.3r" .ds oS 4.3-Reno Berkeley Distribution

-.      if "\\$2"4.4"  .ds oS BSD Experimental
+.      if "\\$2"4.4"  .ds oS 4.4BSD PRERELEASE

 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2


@@ -247,7 +230,6 @@
 .      \}
 .      ev
 .\}
 .      \}
 .      ev
 .\}

-.\" .tm IN 444 fM .k == \\n(.k and nl == \\n(nl

 ..
 .de lM
 .fl
 ..
 .de lM
 .fl

diff --git a/usr/src/share/tmac/doc-ditroff b/usr/src/share/tmac/doc-ditroff
index 3cae3fa..4a4196d 100644 (file)
--- a/usr/src/share/tmac/doc-ditroff
+++ b/usr/src/share/tmac/doc-ditroff
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)doc-ditroff        5.8 (Berkeley) %G%
+.\"     @(#)doc-ditroff        5.9 (Berkeley) %G%

 .\"
 .\" tmac.mdoc-ditroff
 .\"     %beginstrip%
 .\"
 .\" tmac.mdoc-ditroff
 .\"     %beginstrip%


@@ -164,7 +164,7 @@
 .      if (\\n(aP>0) \{\
 .              ds A\\n(aP Li
 .              nr aP \\n(aP -1
 .      if (\\n(aP>0) \{\
 .              ds A\\n(aP Li
 .              nr aP \\n(aP -1

-.      \}              
+.      \}

 .      if (\\n(aP==0) \{\
 .              rm C0 C1 C2 C3 C4 C5 C6 C7 C8 C9
 .              rm S1 S2 S3 S4 S5 S6 S7 S8 S9
 .      if (\\n(aP==0) \{\
 .              rm C0 C1 C2 C3 C4 C5 C6 C7 C8 C9
 .              rm S1 S2 S3 S4 S5 S6 S7 S8 S9

diff --git a/usr/src/share/tmac/doc-nroff b/usr/src/share/tmac/doc-nroff
index 75ca0cf..8df5027 100644 (file)
--- a/usr/src/share/tmac/doc-nroff
+++ b/usr/src/share/tmac/doc-nroff
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)doc-nroff  5.6 (Berkeley) %G%
+.\"     @(#)doc-nroff  5.7 (Berkeley) %G%

 .\"
 .\" tmac.mdoc-nroff
 .\"     %beginstrip%
 .\"
 .\" tmac.mdoc-nroff
 .\"     %beginstrip%

diff --git a/usr/src/share/tmac/doc-syms b/usr/src/share/tmac/doc-syms
index 3b26e80..92116ee 100644 (file)
--- a/usr/src/share/tmac/doc-syms
+++ b/usr/src/share/tmac/doc-syms
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)doc-syms   5.7 (Berkeley) %G%
+.\"     @(#)doc-syms   5.8 (Berkeley) %G%

 .\"
 .\"     %beginstrip%
 .\" NS Ux macro - UNIX
 .\"
 .\"     %beginstrip%
 .\" NS Ux macro - UNIX


@@ -25,13 +25,14 @@
 .\}
 .el .aZ
 ..
 .\}
 .el .aZ
 ..

-.\" NS Bx macro -BSD UNIX (fix smaller nroff version)
+.\" NS Bx macro -BSD (fix smaller nroff version)

 .de Bx
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
 .if \\n(aC==0 \{\
 .de Bx
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
 .if \\n(aC==0 \{\

-.       ie \\n(.$==0 \&\\*(tNBSD\\*(aa \\*(tNUNIX\\*(aa
+.\" .       ie \\n(.$==0 \&\\*(tNBSD\\*(aa \\*(tNUNIX\\*(aa
+.       ie \\n(.$==0 \&\\*(tNBSD\\*(aa

 .       el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .\}
 .if "\\$1"-alpha" \{\
 .       el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .\}
 .if "\\$1"-alpha" \{\


@@ -84,7 +85,7 @@
 .              el .aZ
 .      \}
 .      el \{\
 .              el .aZ
 .      \}
 .      el \{\

-.             as b1 \&\\*(tNBSD\\*(aa U\\*(tNNIX\\*(aa
+.             as b1 \&\\*(tNBSD\\*(aa

 .             nR
 .      \}
 .\}
 .             nR
 .      \}
 .\}

diff --git a/usr/src/share/tmac/tmac.andoc b/usr/src/share/tmac/tmac.andoc
index b16a04a..fad8de8 100644 (file)
--- a/usr/src/share/tmac/tmac.andoc
+++ b/usr/src/share/tmac/tmac.andoc
@@ -4,19 +4,25 @@
 .\"
 .\" %sccs.include.redist.roff%
 .\"
 .\"
 .\" %sccs.include.redist.roff%
 .\"

-.\"    @(#)tmac.andoc  5.7 (Berkeley) %G%
+.\"    @(#)tmac.andoc  5.8 (Berkeley) %G%
+.\"
+.\" If -mdoc macros, source tmac.mdoc
+.\" If -man macros, check to see if groff or troff/nroff is being used

 .\"
 .de Dd
 .\"
 .de Dd

-.if \\n(vX==0 \{\
-.      rn Dd xX
-.      so /usr/share/tmac/tmac.doc
-.      Dd \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.      rm xX
-.\}
+.rn Dd xX
+.so /usr/share/tmac/tmac.doc
+.Dd \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+.rm xX

 ..
 .de TH
 .rn TH xX
 ..
 .de TH
 .rn TH xX

-.so /usr/share/tmac/tmac.an.old
+.ie \n(.g \{\
+.      so /usr/share/tmac/tmac.groff_an
+.\}
+.el \{\
+.      so /usr/old/lib/tmac/tmac.an
+.\}

 .TH \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
 .rm xX
 ..
 .TH \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
 .rm xX
 ..

diff --git a/usr/src/share/tmac/tmac.e b/usr/src/share/tmac/tmac.e
index b58ba28..3f58f00 100644 (file)
--- a/usr/src/share/tmac/tmac.e
+++ b/usr/src/share/tmac/tmac.e
@@ -4,11 +4,11 @@
 .\"
 .\" %sccs.include.redist.roff%
 .\"
 .\"
 .\" %sccs.include.redist.roff%
 .\"

-.\"    @(#)tmac.e      1.1 (Berkeley) %G%
+.\"    @(#)tmac.e      1.2 (Berkeley) %G%

 .\"
 .\" If groff, use groff -me, else use local -me (w/ditroff, troff, nroff)
 .\"
 .\" If groff, use groff -me, else use local -me (w/ditroff, troff, nroff)

-.ie g \{\
-.      so tmac.groff_me
+.ie \n(.g \{\
+.      so /usr/share/tmac/tmac.groff_me

 .\}
 .el \{\
 .      so /usr/old/lib/tmac/tmac.e
 .\}
 .el \{\
 .      so /usr/old/lib/tmac/tmac.e

diff --git a/usr/src/share/tmac/tmac.s b/usr/src/share/tmac/tmac.s
index 44710cc..658f30f 100644 (file)
--- a/usr/src/share/tmac/tmac.s
+++ b/usr/src/share/tmac/tmac.s
@@ -4,12 +4,12 @@
 .\"
 .\" %sccs.include.redist.roff%
 .\"
 .\"
 .\" %sccs.include.redist.roff%
 .\"

-.\"    @(#)tmac.s      1.1 (Berkeley) %G%
+.\"    @(#)tmac.s      1.2 (Berkeley) %G%

 .\"
 .\" If groff, use groff -ms, else use local -ms (w/ditroff, troff, nroff)
 .\"
 .\" If groff, use groff -ms, else use local -ms (w/ditroff, troff, nroff)

-.ie g {\
-.      so tmac.s
+.ie \n(.g \{\
+.      so /usr/share/tmac/tmac.groff_ms

 .\}
 .\}

-.el \{
-.      so /usr/local/lib/tmac/tmac.s
+.el \{\
+.      so /usr/old/lib/tmac/tmac.s

 .\}
 .\}