Improve .Os macro support (parts obtained from 4.4Lite2 and NetBSD)

Add the .Fx macro for specifying FreeBSD releases.

Add a bunch of missing standards to the .St macro.

Add Version 1 AT&T UNIX to .At macro

Updated the ".St -ansiC" macro to report "ISO 9899: 1990 (``ISO C'')"
You can also specify -iso9899, or -isoC.  Use -ansiC-89 if you still need
the X3.159-1989 string reported.

Original author: mpp
This commit is contained in:
pst 1996-09-08 00:33:24 +00:00
parent 29be27e147
commit 520e6a4171
2 changed files with 136 additions and 26 deletions

View File

@ -157,9 +157,9 @@
. ds cH \\$2 . ds cH \\$2
.\" . if "\\$3"" \{\ .\" . if "\\$3"" \{\
. if \\$2>=1 .if \\$2<=8 \{\ . if \\$2>=1 .if \\$2<=8 \{\
. ds vT UNIX Reference Manual . ds vT FreeBSD Reference Manual
. if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual . if \\$2>1 .if \\$2<6 .ds vT FreeBSD Programmer's Manual
. if "\\$2"8" .ds vT UNIX System Manager's Manual . if "\\$2"8" .ds vT FreeBSD System Manager's Manual
. nr sN \\$2 . nr sN \\$2
. \} . \}
. if "\\$2"unass" .ds vT DRAFT . if "\\$2"unass" .ds vT DRAFT
@ -168,17 +168,17 @@
.\" . \} .\" . \}
.\} .\}
.if !"\\$3"" \{\ .if !"\\$3"" \{\
. if "\\$3"USD" .ds vT UNIX User's Supplementary Documents . if "\\$3"USD" .ds vT FreeBSD User's Supplementary Documents
. if "\\$3"PS1" .ds vT UNIX Programmers's Supplementary Documents . if "\\$3"PS1" .ds vT FreeBSD Programmers's Supplementary Documents
. if "\\$3"AMD" .ds vT UNIX Ancestral Manual Documents . if "\\$3"AMD" .ds vT FreeBSD Ancestral Manual Documents
. if "\\$3"SMM" .ds vT UNIX System Manager's Manual . if "\\$3"SMM" .ds vT FreeBSD System Manager's Manual
. if "\\$3"URM" .ds vT UNIX Reference Manual . if "\\$3"URM" .ds vT FreeBSD Reference Manual
. if "\\$3"PRM" .ds vT UNIX Programmers's Manual . if "\\$3"PRM" .ds vT FreeBSD Programmers's Manual
. if "\\$3"IND" .ds vT UNIX Manual Master Index . if "\\$3"IND" .ds vT FreeBSD Manual Master Index
.\" . if "\\$3"CON" .ds vT UNIX Contributed Software Manual .\" . if "\\$3"CON" .ds vT FreeBSD Contributed Software Manual
.\" . if "\\$3"IMP" .ds vT UNIX Implementation Notes .\" . if "\\$3"IMP" .ds vT FreeBSD Implementation Notes
.\" . if "\\$3"HOW" .ds vT UNIX How Pocket Manual .\" . if "\\$3"HOW" .ds vT FreeBSD How Pocket Manual
. if "\\$3"LOCAL" .ds vT UNIX Local Manual . if "\\$3"LOCAL" .ds vT FreeBSD Local Manual
. if "\\$3"tahoe" .as vT \ (Tahoe Architecture) . if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
. if "\\$3"vax" .as vT \ (VAX Architecture) . if "\\$3"vax" .as vT \ (VAX Architecture)
. if "\\$3"hp300" .as vT \ (HP300 Architecture) . if "\\$3"hp300" .as vT \ (HP300 Architecture)
@ -193,7 +193,7 @@
.de Os .de Os
.ds oS Null .ds oS Null
.if "\\$1"" \{\ .if "\\$1"" \{\
. ds oS BSD Experimental . ds oS BSD
.\} .\}
.if "\\$2"" \{\ .if "\\$2"" \{\
. ds aa Non-Null . ds aa Non-Null
@ -220,7 +220,15 @@
. 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.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.4" .ds oS BSD Experimental . if "\\$2"4.4" .ds oS 4.4BSD
.\}
.if "\\$1"FreeBSD" \{\
. if "\\$2"2" .ds oS FreeBSD 2.0
. if "\\$2"2.0" .ds oS FreeBSD 2.0
. if "\\$2"2.0.5" .ds oS FreeBSD 2.0.5
. if "\\$2"2.1" .ds oS FreeBSD 2.1
. if "\\$2"2.1.5" .ds oS FreeBSD 2.1.5
. if "\\$2"2.2" .ds oS FreeBSD 2.2
.\} .\}
.if "\\*(oS"Null" .ds oS \0\\$1 .if "\\*(oS"Null" .ds oS \0\\$1
.if "\\*(aa"Non-Null" .as oS \0\\$2 .if "\\*(aa"Non-Null" .as oS \0\\$2

View File

@ -126,21 +126,45 @@
.ds aa \&\f\\n(cF\s\\n(cZ .ds aa \&\f\\n(cF\s\\n(cZ
.if \\n(.$==2 \{\ .if \\n(.$==2 \{\
. if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa\\$2 . if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa\\$2
. if "\\$1"v1" \&Version 1 \\*(tNAT&T UNIX\\*(aa\\$2
. if "\\$1"v6" \&Version 6 \\*(tNAT&T UNIX\\*(aa\\$2 . if "\\$1"v6" \&Version 6 \\*(tNAT&T UNIX\\*(aa\\$2
. if "\\$1"v7" \&Version 7 \\*(tNAT&T UNIX\\*(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" \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa\\$2
. if "\\$1"V.1" \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa\\$2 . if "\\$1"V.1" \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa\\$2
. if "\\$1"V.2" \&\\*(tNAT&T\\*(aa System V.2 \\*(tNUNIX\\*(aa\\$2
. if "\\$1"V.4" \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa\\$2 . if "\\$1"V.4" \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa\\$2
.\} .\}
.if \\n(.$==1 \{\ .if \\n(.$==1 \{\
. if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa . if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa
. if "\\$1"v1" \&Version 1 \\*(tNAT&T UNIX\\*(aa
. if "\\$1"v6" \&Version 6 \\*(tNAT&T UNIX\\*(aa . if "\\$1"v6" \&Version 6 \\*(tNAT&T UNIX\\*(aa
. if "\\$1"v7" \&Version 7 \\*(tNAT&T UNIX\\*(aa . if "\\$1"v7" \&Version 7 \\*(tNAT&T UNIX\\*(aa
. if "\\$1"V" \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(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.1" \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa
. if "\\$1"V.2" \&\\*(tNAT&T\\*(aa System V.2 \\*(tNUNIX\\*(aa
. if "\\$1"V.4" \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa . if "\\$1"V.4" \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa
.\} .\}
.. ..
.\" Ns Fx macro - FreeBSD
.de Fx
.nr cF \\n(.f
.nr cZ \\n(.s
.ds aa \&\f\\n(cF\s\\n(cZ
.if \\n(.$==2 \{\
. if "\\$1"2.0" \&\\*(tNFreeBSD\\*(aa 2.0\\*(aa\\$2
. if "\\$1"2.0.5" \&\\*(tNFreeBSD\\*(aa 2.0.5\\*(aa\\$2
. if "\\$1"2.1" \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa\\$2
. if "\\$1"2.1.5" \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa\\$2
. if "\\$1"2.2" \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa\\$2
.\}
.if \\n(.$==1 \{\
. if "\\$1"2.0" \&\\*(tNFreeBSD\\*(aa 2.0\\*(aa
. if "\\$1"2.0.5" \&\\*(tNFreeBSD\\*(aa 2.0.5\\*(aa
. if "\\$1"2.1" \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa
. if "\\$1"2.1.5" \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa
. if "\\$1"2.2" \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa
.\}
..
.\" The Bt macro should go away now .\" The Bt macro should go away now
.\" Ns Bt macro - prints "is currently in beta test." (HISTORY section) .\" Ns Bt macro - prints "is currently in beta test." (HISTORY section)
.de Bt .de Bt
@ -152,7 +176,7 @@
.de St .de St
.if \\n(aC==0 \{\ .if \\n(aC==0 \{\
. ie \\n(.$==0 \{\ . ie \\n(.$==0 \{\
.tm Usage: .St [-p1003.1-88 | -p1003.2 | -ansiC-89 | -iso ] \\*(Pu ... (#\\n(.c) .tm Usage: .St [-p1003.1-90 | -p1003.2 | -ansiC-89 | -iso ] \\*(Pu ... (#\\n(.c)
. \} . \}
. el \{\ . el \{\
. ds mN St . ds mN St
@ -175,6 +199,16 @@
. nr cZ \\n(.s . nr cZ \\n(.s
. ds aa \&\f\\n(cF\s\\n(cZ . ds aa \&\f\\n(cF\s\\n(cZ
. nr aP \\n(aP+1 . nr aP \\n(aP+1
. if "\\*(A\\n(aP"-p1003.1-90" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1990\\*(sV
. as b1 (``\\*(tN\\*(Px\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1990\\*(sV
. as b1 (``\\*(tN\\*(Px\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-p1003.1-88" \{\ . if "\\*(A\\n(aP"-p1003.1-88" \{\
. ie \\n(sT==1 \{\ . ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1988\\*(sV . ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1988\\*(sV
@ -185,36 +219,84 @@
. as b1 (``\\*(tN\\*(Px\\*(aa'') . as b1 (``\\*(tN\\*(Px\\*(aa'')
. \} . \}
. \} . \}
. if "\\*(A\\n(aP"-p1003.2" \{\ . if "\\*(A\\n(aP"-p1003.1" \{\
. ie \\n(sT==1 \{\ . ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2 . ds b1 \&\\*(tNIEEE Std\\*(aa1003.1\\*(sV
. as b1 (``\\*(tN\\*(Px\\*(aa'') . as b1 (``\\*(tN\\*(Px\\*(aa'')
. \} . \}
. el \{\ . el \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2\\*(sV . ds b1 \&\\*(tNIEEE Std\\*(aa1003.1\\*(sV
. as b1 (``\\*(tN\\*(Px\\*(aa'') . as b1 (``\\*(tN\\*(Px\\*(aa'')
. \} . \}
. \} . \}
. if "\\*(A\\n(aP"-p1003.2-92" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2-1992\\*(sV
. as b1 (``\\*(tN\\*(Px.2\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2-1992\\*(sV
. as b1 (``\\*(tN\\*(Px.2\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-p1003.2" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2\\*(sV
. as b1 (``\\*(tN\\*(Px.2\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa1003.2\\*(sV
. as b1 (``\\*(tN\\*(Px.2\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-ansiC" \{\ . if "\\*(A\\n(aP"-ansiC" \{\
. ie \\n(sT==1 \{\ . ie \\n(sT==1 \{\
. ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV . ds b1 \&\\*(tNISO \\*(aa9899:\ 1990\\*(sV
. as b1 (``\\*(tNANSI C\\*(aa'') . as b1 (``\\*(tNISO C\\*(aa'')
. \} . \}
. el \{\ . el \{\
. ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV . ds b1 \&\\*(tNISO \\*(aa9899:\ 1990\\*(sV
. as b1 (``\\*(tNANSI C\\*(aa'') . as b1 (``\\*(tNISO C\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-isoC" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNISO \\*(aa9899:\ 1990\\*(sV
. as b1 (``\\*(tNISO C\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNISO \\*(aa9899:\ 1990\\*(sV
. as b1 (``\\*(tNISO C\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-iso9899" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNISO \\*(aa9899: 1990\\*(sV
. as b1 (``\\*(tNISO C\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNISO \\*(aa9899: 1990\\*(sV
. as b1 (``\\*(tNISO C\\*(aa'')
. \} . \}
. \} . \}
. if "\\*(A\\n(aP"-ansiC-89" \{\ . if "\\*(A\\n(aP"-ansiC-89" \{\
. ie \\n(sT==1 \{\ . ie \\n(sT==1 \{\
. ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV . ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
. as b1 (``\\*(tNANSI C\\*(aa'') . as b1 (``\\*(tNANSI C\\*(aa'')
. \} . \}
. el \{\ . el \{\
. ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV . ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
. as b1 (``\\*(tNANSI C\\*(aa'') . as b1 (``\\*(tNANSI C\\*(aa'')
. \} . \}
. \} . \}
. if "\\*(A\\n(aP"-ieee754" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa754-1985
. \}
. el \{\
. ds b1 \&\\*(tNIEEE Std\\*(aa754-1985
. \}
. \}
. if "\\*(A\\n(aP"-iso8802-3" \{\ . if "\\*(A\\n(aP"-iso8802-3" \{\
. ie \\n(sT==1 \{\ . ie \\n(sT==1 \{\
. ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV . ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
@ -225,6 +307,26 @@
.\" . as b1 (``\\*(tNANSI C\\*(aa'') .\" . as b1 (``\\*(tNANSI C\\*(aa'')
. \} . \}
. \} . \}
. if "\\*(A\\n(aP"-xpg3" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNX/Open Portability Guide Issue 3\\*(aa\\*(sV
. as b1 (``\\*(tNXPG3\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNX/Open Portability Guide Issue 3\\*(aa\\*(sV
. as b1 (``\\*(tNXPG3\\*(aa'')
. \}
. \}
. if "\\*(A\\n(aP"-xpg4" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNX/Open Portability Guide Issue 4\\*(aa\\*(sV
. as b1 (``\\*(tNXPG4\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNX/Open Portability Guide Issue 4\\*(aa\\*(sV
. as b1 (``\\*(tNXPG4\\*(aa'')
. \}
. \}
. ie \\n(aC>\\n(aP \{\ . ie \\n(aC>\\n(aP \{\
. nr aP \\n(aP+1 . nr aP \\n(aP+1
. nR . nR