preening

SCCS-vsn: share/tmac/tmac.andoc 5.6
SCCS-vsn: share/tmac/doc 5.8
SCCS-vsn: share/tmac/doc-common 5.7
SCCS-vsn: share/tmac/doc-ditroff 5.8
SCCS-vsn: share/tmac/doc-nroff 5.6
SCCS-vsn: share/tmac/doc-syms 5.6

diff --git a/usr/src/share/tmac/doc b/usr/src/share/tmac/doc
index d16a207..763c672 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.7 (Berkeley) %G%
+.\"     @(#)doc        5.8 (Berkeley) %G%

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


@@ -98,7 +98,9 @@
 .              if \\n(oM>1 .as b1 \\*(S0
 .      \}
 .      el \{\
 .              if \\n(oM>1 .as b1 \\*(S0
 .      \}
 .      el \{\

-.              if \\n(oM>0 .as b1 \\*(S0
+.              if \\n(oM>0 \{\
+.                      if \\n(fC==0 .as b1 \\*(S0
+.              \}

 .      \}
 .      ds S0 \\*(S\\n(aC
 .      if \\n(Db \{\
 .      \}
 .      ds S0 \\*(S\\n(aC
 .      if \\n(Db \{\


@@ -119,7 +121,7 @@
 .if "\\*(A\\n(aC"|" \{\
 .      if "\\*(mN"Op" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .      if "\\*(mN"Ar" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .if "\\*(A\\n(aC"|" \{\
 .      if "\\*(mN"Op" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .      if "\\*(mN"Ar" .ds A\\n(aC \fR\\*(A\\n(aC\fP

-.      if "\\*(mN"Fl" .ds A\\n(aC \fR\\*(A\\n(aC\fP
+.      if "\\*(mN"Fl" .ds A\\n(aC \fR\&\\*(A\\n(aC\fP

 .      if "\\*(mN"Cm" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .      if "\\*(mN"It" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .\}
 .      if "\\*(mN"Cm" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .      if "\\*(mN"It" .ds A\\n(aC \fR\\*(A\\n(aC\fP
 .\}


@@ -155,7 +157,9 @@
 .              if \\n(oM>1 .as b1 \\*(S0
 .      \}
 .      el \{\
 .              if \\n(oM>1 .as b1 \\*(S0
 .      \}
 .      el \{\

-.              if \\n(oM>0 .as b1 \\*(S0
+.              if \\n(oM>0 \{\
+.                      if \\n(fC==0 .as b1 \\*(S0
+.              \}

 .      \}
 .      ds S0 \\*(S\\n(aC
 .      nr fV 0
 .      \}
 .      ds S0 \\*(S\\n(aC
 .      nr fV 0


@@ -323,10 +327,13 @@
 .      nr jN \\n(aP
 .      ie \\n(jM==2 \{\
 .              ie !"\\*(A\\n(aP"\\*(Ba" \{\
 .      nr jN \\n(aP
 .      ie \\n(jM==2 \{\
 .              ie !"\\*(A\\n(aP"\\*(Ba" \{\

-.                     ie "\\*(A\\n(aP"-" .as b1 \&\|\-\-\|
-.                     el .as b1 \&\|\-\\*(A\\n(aP
+.                      ie !"\\*(A\\n(aP"\fR|\fP" \{\
+.                             ie "\\*(A\\n(aP"-" .as b1 \&\|\-\^\-\|
+.                             el .as b1 \&\|\-\\*(A\\n(aP
+.                      \}
+.                      el .as b1 \&\\*(A\\n(aP

 .              \}
 .              \}

-.              el .as \&\\*(A\\n(aP
+.              el .as b1 \&\\*(A\\n(aP

 .      \}
 .      el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
 .      ie \\n(aC==\\n(aP \{\
 .      \}
 .      el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
 .      ie \\n(aC==\\n(aP \{\


@@ -866,7 +873,6 @@
 .\}
 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .\}
 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1

-.\" .tm in No: b1==\\*(b1

 .       ie \\n(C\\n(aP==1 \{\
 .              \\*(A\\n(aP
 .       \}
 .       ie \\n(C\\n(aP==1 \{\
 .              \\*(A\\n(aP
 .       \}


@@ -928,6 +934,13 @@
 .\" an if-else to carry along recursively for `if n ...')
 .\"
 .\" NS Sq macro - Enclose string in single quotes
 .\" an if-else to carry along recursively for `if n ...')
 .\"
 .\" NS Sq macro - Enclose string in single quotes

+.de Qq
+.if \\n(aC==0 .ds mN Qq
+.ds qL \&\\*q
+.ds qR \&\\*q
+.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.\" NS Sq macro - Enclose string in single quotes

 .de Sq
 .if \\n(aC==0 .ds mN Sq
 .ds qL \&\\*(sL
 .de Sq
 .if \\n(aC==0 .ds mN Sq
 .ds qL \&\\*(sL


@@ -960,17 +973,20 @@
 .\" NS qR string variable set by calling macro
 .\" NS aJ register (for vR)
 .de En
 .\" NS qR string variable set by calling macro
 .\" NS aJ register (for vR)
 .de En

-.as b1 \&\\*(qL
-.if \\n(aC==0 \{\
+.ie \\n(aC==0 \{\

 .      ie \\n(.$==0 \{\
 .      ie \\n(.$==0 \{\

-.              as b1 \&\\*(qR
+.              as b1 \&\\*(qL\\*(qR

 .              pB
 .      \}
 .      el \{\
 .\".           as mN (En)
 .              aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .              pB
 .      \}
 .      el \{\
 .\".           as mN (En)
 .              aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9

+.              as b1 \&\\*(qL

 .      \}
 .\}
 .      \}
 .\}

+.el \{\
+.      as b1 \&\\*(qL
+.\}

 .if \\n(aC>0 \{\
 .      ie (\\n(aC-\\n(aP)==0 \{\
 .              as b1 \&\\*(qR
 .if \\n(aC>0 \{\
 .      ie (\\n(aC-\\n(aP)==0 \{\
 .              as b1 \&\\*(qR


@@ -1074,6 +1090,18 @@
 .ds qR \&)
 .eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 ..
 .ds qR \&)
 .eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 ..

+.\" NS Qo macro - Straight Double Quote open
+.de Qo
+.if \\n(aC==0 .ds mN Qo
+.ds qL \&\\*q
+.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.\" NS Qc macro - Straight Double Quote close
+.de Qc
+.if \\n(aC==0 .ds mN Qc
+.ds qR \&\\*q
+.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..

 .\" NS So macro - Single Quote open
 .de So
 .if \\n(aC==0 .ds mN So
 .\" NS So macro - Single Quote open
 .de So
 .if \\n(aC==0 .ds mN So


@@ -1089,11 +1117,13 @@
 .\" NS Xo macro - Extend open (continue)
 .de Xo
 .if \\n(aC==0 .ds mN Xo
 .\" NS Xo macro - Extend open (continue)
 .de Xo
 .if \\n(aC==0 .ds mN Xo

+.\" .nr mN 1

 .ds qL
 .eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 ..
 .\" NS Xe macro - Extend close (end)
 .de Xc
 .ds qL
 .eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 ..
 .\" NS Xe macro - Extend close (end)
 .de Xc

+.\" .nr mN 0

 .if \\n(aC==0 .ds mN Xc
 .ds qR
 .eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .if \\n(aC==0 .ds mN Xc
 .ds qR
 .eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9


@@ -1101,14 +1131,15 @@
 .\" NS eO macro - enclose string open
 .\" NS oM register (extension possible)
 .de eO
 .\" NS eO macro - enclose string open
 .\" NS oM register (extension possible)
 .de eO

-.as b1 \\*(qL

 .nr oM \\n(oM+1
 .\" .tm eO last arg==A[\\n(aC]==\\*(A\\n(aC; aP==\\n(aP; oM==\\n(oM; dZ==\\n(dZ;
 .nr oM \\n(oM+1
 .\" .tm eO last arg==A[\\n(aC]==\\*(A\\n(aC; aP==\\n(aP; oM==\\n(oM; dZ==\\n(dZ;

-.if \\n(aC==0 \{\
+.ie \\n(aC==0 \{\

 .       ie \\n(.$>0 \{\
 .               aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
 .       ie \\n(.$>0 \{\
 .               aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9

+.              as b1 \\*(qL

 .       \}
 .      el \{\
 .       \}
 .      el \{\

+.              as b1 \\*(qL

 .              if (\\n(dZ==0)&(\\n(sM==1) \{\
 .                      nr dZ \\n(dZ+1
 .                      ds b2 \\*(b1
 .              if (\\n(dZ==0)&(\\n(sM==1) \{\
 .                      nr dZ \\n(dZ+1
 .                      ds b2 \\*(b1


@@ -1120,6 +1151,9 @@
 .              \}
 .      \}
 .\}
 .              \}
 .      \}
 .\}

+.el \{\
+.      as b1 \\*(qL
+.\}

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


@@ -1129,13 +1163,13 @@
 .                      No
 .              \}
 .      \}
 .                      No
 .              \}
 .      \}

-.\" .tm LINE IN QUESTION

 .      if \\n(aC==\\n(aP \{\
 .              if \\n(tP==1 \{\
 .\" .tm SETTING Xt!!!
 .                      nr Xt 1
 .              \}
 .      if \\n(aC==\\n(aP \{\
 .              if \\n(tP==1 \{\
 .\" .tm SETTING Xt!!!
 .                      nr Xt 1
 .              \}

-.              ds S0 \\*(iV
+.\".\" .               ds S0
+.\"CHANGED             ds S0 \\*(iV

 .              aY
 .      \}
 .\}
 .              aY
 .      \}
 .\}


@@ -1614,6 +1648,7 @@
 .de Ed
 .ds mN Ed
 .br
 .de Ed
 .ds mN Ed
 .br

+.if \\n(dP==0 .tm mdoc: Extraneous .Ed

 .if "\\*(d\\n(dP"dL" \{\
 .      ft \\n(cF
 .      fz \\n(cZ
 .if "\\*(d\\n(dP"dL" \{\
 .      ft \\n(cF
 .      fz \\n(cZ


@@ -2120,7 +2155,7 @@
 .\" NS tX string (initial string)
 .\" NS tX register (initial class)
 .\" NS tC parameter change flag
 .\" NS tX string (initial string)
 .\" NS tX register (initial class)
 .\" NS tC parameter change flag

-.\" NS Xt something to do with diversions...
+.\" NS Xt save current list-type flag

 .\" NS lC register - list type stack counter
 .\" NS tP register tag flag (for diversions)
 .\" NS w[0-9] register tag stack (nested tags)
 .\" NS lC register - list type stack counter
 .\" NS tP register tag flag (for diversions)
 .\" NS w[0-9] register tag stack (nested tags)


@@ -2257,8 +2292,14 @@
 'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
 ..
 .de W5
 'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
 ..
 .de W5

-.ta \w\a\\*(A1    \au +\w\a\\*(A2    \au +\w\a\\*(A3    \au +\w\a\\*(A4    \au +\w\a\\*(A5    \au
-.nr eW \w\a\\*(A1    \au +\w\a\\*(A2    \au +\w\a\\*(A3    \au +\w\a\\*(A4    \au +\w\a\\*(A5    \au
+.ta \w\a\\*(A1   \au +\w\a\\*(A2   \au +\w\a\\*(A3   \au +\w\a\\*(A4   \au +\w\a\\*(A5   \au
+.nr eW \w\a\\*(A1   \au +\w\a\\*(A2   \au +\w\a\\*(A3   \au +\w\a\\*(A4   \au +\w\a\\*(A5   \au
+'      in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
+..
+.\" This is packed abnormally close, intercol width should be an option
+.de W6
+.ta \w\a\\*(A1 \au +\w\a\\*(A2 \au +\w\a\\*(A3 \au +\w\a\\*(A4 \au +\w\a\\*(A5 \au +\w\a\\*(A6
+.nr eW \w\a\\*(A1 \au +\w\a\\*(A2 \au +\w\a\\*(A3 \au +\w\a\\*(A4 \au +\w\a\\*(A5 \au +\w\a\\*(A6

 '      in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
 ..
 .\" NS cL macro - column items
 '      in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
 ..
 .\" NS cL macro - column items


@@ -2468,18 +2509,62 @@
 .       ie \\n(.$==0 .tm Usage: .Fa Function Arguments ... \\*(Pu (#\\n(.c)
 .       el \{\
 .              ds mN Fa
 .       ie \\n(.$==0 .tm Usage: .Fa Function Arguments ... \\*(Pu (#\\n(.c)
 .       el \{\
 .              ds mN Fa

-.              aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.               ds A1 \\$1
+.               ds A2 \\$2
+.               ds A3 \\$3
+.               ds A4 \\$4
+.               ds A5 \\$5
+.               ds A6 \\$6
+.               ds A7 \\$7
+.               ds A8 \\$8
+.               ds A9 \\$9
+.              nr fV \\n(.$
+.              fV

 .      \}
 .\}
 .      \}
 .\}

-.if \\n(aC>\\n(aP \{\
-.      as b1 \\*(fA
+.ie \\n(fC>0 \{\
+.      fC
+.\}
+.el \{\
+.      if \\n(aC>\\n(aP \{\
+.              as b1 \\*(fA
+.              nr aP \\n(aP+1
+.              nr cF \\n(.f
+.              nr cZ \\n(.s
+.              nR
+.              if \\n(nS>0 \{\
+.                      if \\n(fZ>0 .br
+.              \}
+.      \}
+.\}
+..
+.\" NS fC macro - interal .Fa for .FO and .Fc
+.de fC
+.ie \\n(aC>\\n(aP \{\

 .      nr aP \\n(aP+1
 .      nr aP \\n(aP+1

-.       nr cF \\n(.f
-.      nr cZ \\n(.s
-.       nR
-.      if \\n(nS>0 \{\
-.              if \\n(fZ>0 .br
+.\" .  nr aa \\n(aP
+.\" .  if \\n(nS>0 \{\
+.              ds Fb
+.              nr fB 0
+.              nr Fb 0
+.              fB \\*(A\\n(aP
+.              if \\n(fB>1 \{\
+.                      rm A\\n(aP
+.                      rn Fb A\\n(aP
+.              \}
+.\" .  \}
+.      if \\n(fC>1 \{\
+.              as b1 \&\f\\n(cF\s\\n(cZ,\\*(S\\n(aP\\*(fA\\*(A\\n(aP\fP\s0
+.\" .          as b1 \&\\,\\*(S\\n(aP\fP\s0\\*(fA\\*(A\\n(aP\fP\s0
+.      \}
+.      if \\n(fC==1 \{\
+.              as b1 \&\|\\*(fA\\*(A\\n(aP\fP\s0

 .      \}
 .      \}

+.      nr fC \\n(fC+1
+.      fC
+.\}
+.el  \{\
+.      aY

 .\}
 ..
 .\" NS Fn macro - functions
 .\}
 ..
 .\" NS Fn macro - functions


@@ -2529,7 +2614,6 @@
 .      \}
 .      nr fZ \\n(fZ+1
 .      nr fY 0
 .      \}
 .      nr fZ \\n(fZ+1
 .      nr fY 0

-.\" .  if "\\*(mN"Fn" \{\

 .      rs
 .      ie \\n(nS>1 .br
 .      el \{\
 .      rs
 .      ie \\n(nS>1 .br
 .      el \{\


@@ -2540,7 +2624,6 @@
 .      in +\\n(iSu
 .      ti -\\n(iSu
 .      nr nS \\n(nS+1
 .      in +\\n(iSu
 .      ti -\\n(iSu
 .      nr nS \\n(nS+1

-.\" .        \}

 .\}
 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1
 .\}
 .if \\n(aC>\\n(aP \{\
 .      nr aP \\n(aP+1


@@ -2610,6 +2693,103 @@
 .\}
 .el .aZ
 ..
 .\}
 .el .aZ
 ..

+.de Fo
+.hy 0
+.if \\n(aC==0 \{\
+.      ie \\n(.$==0 .tm Usage: .Fo function_name
+.      el \{\
+.              ds mN Fo
+.               ds A1 \\$1
+.               ds A2 \\$2
+.               ds A3 \\$3
+.               ds A4 \\$4
+.               ds A5 \\$5
+.               ds A6 \\$6
+.               ds A7 \\$7
+.               ds A8 \\$8
+.               ds A9 \\$9
+.              nr fV \\n(.$
+.              fV
+.      \}
+.\}
+.if \\n(nS>0 \{\
+.\" if there is/has been more than one subroutine declaration
+.      if \\n(fY==0 \{\
+.              if \\n(fZ>0 \{\
+.                      Pp
+.                      nr fX 0
+.                      nr fD 0
+.              \}
+.      \}
+.      if \\n(fY==1 \{\
+.              br
+.              nr fX 0
+.              nr fD 0
+.              nr fY 0
+.      \}
+.      if \\n(fD>0 \{\
+.              Pp
+.              nr fX 0
+.      \}
+.      if \\n(fX>0 \{\
+.              Pp
+.              nr fD 0
+.      \}
+.      nr fZ \\n(fZ+1
+.      nr fY 0
+.      rs
+.      ie \\n(nS>1 .br
+.      el \{\
+.              if \\n(iS==0 \{\
+.                      nr iS ((8)*\\n(fW)u
+.              \}
+.      \}
+.      in +\\n(iSu
+.      ti -\\n(iSu
+.      nr nS \\n(nS+1
+.\}
+.if \\n(aC>\\n(aP \{\
+.      nr oM \\n(oM+1
+.      nr fC 1
+.      nr aP \\n(aP+1
+.      nr cF \\n(.f
+.      nr cZ \\n(.s
+.      as b1 \\*(fN\\*(A\\n(aP\fP\s0\\*(lp
+.      aY
+.\}
+..
+.de Fc
+.if \\n(aC==0 \{\
+.      if \\n(.$>0 \{\
+.              ds mN Fo
+.               ds A1 \\$1
+.               ds A2 \\$2
+.               ds A3 \\$3
+.               ds A4 \\$4
+.               ds A5 \\$5
+.               ds A6 \\$6
+.               ds A7 \\$7
+.               ds A8 \\$8
+.               ds A9 \\$9
+.              nr fV \\n(.$
+.              fV
+.      \}
+.\}
+.nr fC 0
+.nr oM \\n(oM-1
+.as b1 \|\\*(rp
+.ie \\n(aC>\\n(aP \{\
+.      nr aP \\n(aP+1
+.      \\*(A\\n(aP
+.\}
+.el \{\
+.      aZ
+.\}
+.if \\n(nS>0 \{\
+.      in -\\n(iSu
+.\}
+.hy
+..

 .\" NS fb macro - if SYNOPSIS, set hard space inbetween function args
 .\" NS fb register - count of words in a function argument
 .\" NS Fb register - counter
 .\" NS fb macro - if SYNOPSIS, set hard space inbetween function args
 .\" NS fb register - count of words in a function argument
 .\" NS Fb register - counter

diff --git a/usr/src/share/tmac/doc-common b/usr/src/share/tmac/doc-common
index 88b944a..50f5b3a 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.6 (Berkeley) %G%
+.\"     @(#)doc-common 5.7 (Berkeley) %G%

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


@@ -68,6 +68,9 @@
 .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 Sc 3
 .nr So 12n
 .nr Sq 12n


@@ -84,6 +87,7 @@
 .nr Ta 1
 .nr Tv 1
 .nr Tx 22n
 .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

diff --git a/usr/src/share/tmac/doc-ditroff b/usr/src/share/tmac/doc-ditroff
index 28226a3..3cae3fa 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.7 (Berkeley) %G%
+.\"     @(#)doc-ditroff        5.8 (Berkeley) %G%

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


@@ -36,7 +36,7 @@
 .ds nO \fR\s10
 .ds nT \s0
 .ds pA \fC\s10
 .ds nO \fR\s10
 .ds nT \s0
 .ds pA \fC\s10

-.ds Pu \fR[.,:;(\^)[\^]\fR]
+.ds Pu \fR{\ .\ ,\ :\ ;\ (\ )\ [\ ]\ \fR}

 .ds rA \fR\s10
 .ds rT \f(CO\s10
 .ds sH \fB\s10
 .ds rA \fR\s10
 .ds rT \f(CO\s10
 .ds sH \fB\s10


@@ -188,10 +188,10 @@
 .\}
 ..
 .\" NS Sh macro - Section Headers
 .\}
 ..
 .\" NS Sh macro - Section Headers

-.\" NS nS register - Section Header SYNOPSIS flag 
-.\" NS nF register - Section Header FILES flag 
-.\" NS nA register - Section Header SEE ALSO flag 
-.\" NS nT register - Section Header STANDARDS flag 
+.\" NS nS register - Section Header SYNOPSIS flag
+.\" NS nF register - Section Header FILES flag
+.\" NS nA register - Section Header SEE ALSO flag
+.\" NS nT register - Section Header STANDARDS flag

 .de Sh
 .nr nS 0
 .nr sE 0
 .de Sh
 .nr nS 0
 .nr sE 0

diff --git a/usr/src/share/tmac/doc-nroff b/usr/src/share/tmac/doc-nroff
index 75234d0..75ca0cf 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.5 (Berkeley) %G%
+.\"     @(#)doc-nroff  5.6 (Berkeley) %G%

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


@@ -35,7 +35,7 @@
 .ds nM \fB
 .ds nO \fR
 .ds pA \fI
 .ds nM \fB
 .ds nO \fR
 .ds pA \fI

-.ds Pu [.,;:()[]]
+.ds Pu {\ .\ ,\ ;\ :\ (\ )\ [\ ]}

 .ds rA \fR
 .ds rT \fI
 .ds sH \fB
 .ds rA \fR
 .ds rT \fI
 .ds sH \fB

diff --git a/usr/src/share/tmac/doc-syms b/usr/src/share/tmac/doc-syms
index 503bc4c..c57937e 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.5 (Berkeley) %G%
+.\"     @(#)doc-syms   5.6 (Berkeley) %G%

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


@@ -11,15 +11,19 @@
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ

+.as b1 \&\\*(tNUNIX\\*(aa
+.rm aa

 .if \\n(aC==0 \{\
 .if \\n(aC==0 \{\

-.       ie \\n(.$==0 \&U\\*(tNNIX\\*(aa
-.       el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       if \\n(.$>0 .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9

 .\}
 .\}

-.if \\n(aC>\\n(aP \{\
-.       as b1 \&U\\*(tNNIX\\*(aa
+.ie \\n(aC>\\n(aP \{\

 .       nr aP \\n(aP+1
 .       nr aP \\n(aP+1

-.       nR
+.       ie \\n(C\\n(aP==1 \{\
+.               \\*(A\\n(aP
+.       \}
+.       el .nR

 .\}
 .\}

+.el .aZ

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


@@ -27,7 +31,7 @@
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
 .if \\n(aC==0 \{\
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
 .if \\n(aC==0 \{\

-.       ie \\n(.$==0 \&\\*(tNBSD\\*(aa U\\*(tNNIX\\*(aa
+.       ie \\n(.$==0 \&\\*(tNBSD\\*(aa \\*(tNUNIX\\*(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" \{\


@@ -100,6 +104,7 @@
 .      if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa\\$2
 .      if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa\\$2
 .      if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa\\$2
 .      if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa\\$2
 .      if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa\\$2
 .      if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa\\$2

+.      if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa\\$2

 .\}
 .if \\n(.$==1 \{\
 .      if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa
 .\}
 .if \\n(.$==1 \{\
 .      if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa


@@ -107,6 +112,7 @@
 .      if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa
 .      if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa
 .      if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa
 .      if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa
 .      if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa
 .      if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa

+.      if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa

 .\}
 ..
 .\" The Bt macro should go away now
 .\}
 ..
 .\" The Bt macro should go away now


@@ -135,7 +141,7 @@
 .              ds A8 \\$8
 .              ds A9 \\$9
 .              nr fV \\n(.$
 .              ds A8 \\$8
 .              ds A9 \\$9
 .              nr fV \\n(.$

-.              fV 
+.              fV

 .      \}
 .\}
 .if \\n(aC>\\n(aP \{\
 .      \}
 .\}
 .if \\n(aC>\\n(aP \{\

diff --git a/usr/src/share/tmac/tmac.andoc b/usr/src/share/tmac/tmac.andoc
index 8ec3824..1246a12 100644 (file)
--- a/usr/src/share/tmac/tmac.andoc
+++ b/usr/src/share/tmac/tmac.andoc
@@ -2,11 +2,11 @@
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)tmac.andoc 5.5 (Berkeley) %G%
+.\"    @(#)tmac.andoc  5.6 (Berkeley) %G%

 .\"
 .\"

-.\" 132 section one files still have not ben upgraded from tmac.doc.old
+.\" 12 section one files still have not ben upgraded from tmac.doc.old

 .\" once those are done this `.de Vx' can go away.
 .nr Vx 0
 .de Vx
 .\" once those are done this `.de Vx' can go away.
 .nr Vx 0
 .de Vx