MFC:
- New Darwin, FreeBSD, and NetBSD versions. - DragonFly support including the new .Dx macro. - New .St strings: -isoC-amd1, -isoC-tcor1, -isoC-tcor2, and -ieee1275-94.
This commit is contained in:
parent
e8138dad13
commit
1251340d68
@ -431,11 +431,13 @@
|
||||
.ds doc-operating-system-NetBSD-1.6 1.6
|
||||
.ds doc-operating-system-NetBSD-1.6.1 1.6.1
|
||||
.ds doc-operating-system-NetBSD-1.6.2 1.6.2
|
||||
.ds doc-operating-system-NetBSD-1.6.3 1.6.3
|
||||
.ds doc-operating-system-NetBSD-2.0 2.0
|
||||
.ds doc-operating-system-NetBSD-2.0.1 2.0.1
|
||||
.ds doc-operating-system-NetBSD-2.0.2 2.0.2
|
||||
.ds doc-operating-system-NetBSD-2.1 2.1
|
||||
.ds doc-operating-system-NetBSD-3.0 3.0
|
||||
.ds doc-operating-system-NetBSD-4.0 4.0
|
||||
.
|
||||
.ds doc-operating-system-FreeBSD-1.0 1.0
|
||||
.ds doc-operating-system-FreeBSD-1.1 1.1
|
||||
@ -480,13 +482,24 @@
|
||||
.ds doc-operating-system-FreeBSD-5.2.1 5.2.1
|
||||
.ds doc-operating-system-FreeBSD-5.3 5.3
|
||||
.ds doc-operating-system-FreeBSD-5.4 5.4
|
||||
.ds doc-operating-system-FreeBSD-5.5 5.5
|
||||
.ds doc-operating-system-FreeBSD-6.0 6.0
|
||||
.ds doc-operating-system-FreeBSD-6.1 6.1
|
||||
.ds doc-operating-system-FreeBSD-7.0 7.0
|
||||
.
|
||||
.ds doc-operating-system-Darwin-8.0.0 8.0.0
|
||||
.ds doc-operating-system-Darwin-8.1.0 8.1.0
|
||||
.ds doc-operating-system-Darwin-8.2.0 8.2.0
|
||||
.ds doc-operating-system-Darwin-8.3.0 8.3.0
|
||||
.ds doc-operating-system-Darwin-8.4.0 8.4.0
|
||||
.ds doc-operating-system-Darwin-8.5.0 8.5.0
|
||||
.
|
||||
.ds doc-operating-system-DragonFly-1.0 1.0
|
||||
.ds doc-operating-system-DragonFly-1.1 1.1
|
||||
.ds doc-operating-system-DragonFly-1.2 1.2
|
||||
.ds doc-operating-system-DragonFly-1.3 1.3
|
||||
.ds doc-operating-system-DragonFly-1.4 1.4
|
||||
.ds doc-operating-system-DragonFly-1.5 1.5
|
||||
.
|
||||
.de Os
|
||||
. ie "\$1"" \
|
||||
|
@ -260,6 +260,70 @@
|
||||
..
|
||||
.
|
||||
.
|
||||
.\" NS Dx user macro
|
||||
.\" NS print DragonFly
|
||||
.\" NS
|
||||
.\" NS modifies:
|
||||
.\" NS doc-arg-ptr
|
||||
.\" NS doc-curr-font
|
||||
.\" NS doc-curr-size
|
||||
.\" NS doc-macro-name
|
||||
.\" NS
|
||||
.\" NS local variable:
|
||||
.\" NS doc-str-Dx
|
||||
.\" NS doc-str-Dx1
|
||||
.\" NS
|
||||
.\" NS width register `Dx' defined in doc-common
|
||||
.
|
||||
.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common
|
||||
.
|
||||
.de Dx
|
||||
. nr doc-curr-font \n[.f]
|
||||
. nr doc-curr-size \n[.ps]
|
||||
. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
|
||||
.
|
||||
. \" default value if no argument
|
||||
. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx]
|
||||
.
|
||||
. if !\n[doc-arg-limit] \
|
||||
. if \n[.$] \{\
|
||||
. ds doc-macro-name Dx
|
||||
. doc-parse-args \$@
|
||||
. \}
|
||||
.
|
||||
. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
|
||||
. nr doc-arg-ptr +1
|
||||
. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
|
||||
. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
|
||||
. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \
|
||||
. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]]
|
||||
. el \{\
|
||||
. tmc mdoc warning: .Dx: Unknown DragonFly version
|
||||
. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
|
||||
. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
|
||||
. \}\}
|
||||
. el \
|
||||
. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
|
||||
. \}
|
||||
. el \
|
||||
. nr doc-arg-ptr -1
|
||||
. \}
|
||||
.
|
||||
. \" replace current argument with result
|
||||
. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1]
|
||||
. nr doc-type\n[doc-arg-ptr] 2
|
||||
. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
|
||||
.
|
||||
. \" recompute space vector for remaining arguments
|
||||
. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
|
||||
. nr doc-arg-limit \n[doc-arg-ptr]
|
||||
. if \n[doc-num-args] \
|
||||
. doc-parse-space-vector
|
||||
.
|
||||
. doc-print-recursive
|
||||
..
|
||||
.
|
||||
.
|
||||
.\" NS Fx user macro
|
||||
.\" NS print FreeBSD
|
||||
.\" NS
|
||||
@ -543,6 +607,12 @@
|
||||
.als doc-str-St--isoC-90 doc-str-St--isoC
|
||||
.ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999
|
||||
.as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
|
||||
.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
|
||||
.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
|
||||
.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
|
||||
.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq])
|
||||
.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995
|
||||
.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq])
|
||||
.
|
||||
.\" POSIX Part 1: System API
|
||||
.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
|
||||
@ -604,6 +674,8 @@
|
||||
.
|
||||
.\" Miscellaneous
|
||||
.ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985
|
||||
.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
|
||||
.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
|
||||
.ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989
|
||||
.
|
||||
.de St
|
||||
|
@ -183,6 +183,7 @@ as follows:
|
||||
. It "BSD Macro"
|
||||
. It "NetBSD Macro"
|
||||
. It "FreeBSD Macro"
|
||||
. It "DragonFly Macro"
|
||||
. It "OpenBSD Macro"
|
||||
. It "BSD/OS Macro"
|
||||
. It "UNIX Macro"
|
||||
@ -869,8 +870,10 @@ the release ID.
|
||||
2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
|
||||
4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
|
||||
5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1
|
||||
.It DragonFly
|
||||
1.0, 1.1, 1.2, 1.3, 1.4, 1.5
|
||||
.It Darwin
|
||||
8.0.0, 8.1.0, 8.2.0, 8.3.0
|
||||
8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0
|
||||
.El
|
||||
.Ed
|
||||
.Pp
|
||||
@ -2169,6 +2172,25 @@ see the description of the
|
||||
command above in section
|
||||
.Sx "TITLE MACROS" .
|
||||
.
|
||||
.Ss "DragonFly Macro"
|
||||
.
|
||||
.Pp
|
||||
.Dl Usage: .Dx Oo Ao version Ac Oc ...
|
||||
.Pp
|
||||
.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n
|
||||
.It Li .Dx
|
||||
.Dx
|
||||
.It Li ".Dx 1.4 ."
|
||||
.Dx 1.4 .
|
||||
.El
|
||||
.Pp
|
||||
For possible values of
|
||||
.Ao version Ac
|
||||
see the description of the
|
||||
.Ql .Os
|
||||
command above in section
|
||||
.Sx "TITLE MACROS" .
|
||||
.
|
||||
.Ss "OpenBSD Macro"
|
||||
.
|
||||
.Pp
|
||||
|
Loading…
Reference in New Issue
Block a user