Merged in newer macros.

diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms
index ea1094f..18dc4d0 100644 (file)
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: doc-syms,v 1.2 1996/08/24 07:47:09 etheisen Exp $
+.\"    $OpenBSD: doc-syms,v 1.3 1996/09/03 08:03:12 etheisen Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -122,6 +122,44 @@
 .de Ud
 \&currently under development.
 ..
+.\" Ns Nx macro - NetBSD
+.de Nx
+.nr cF \\n(.f
+.nr cZ \\n(.s
+.ds aa \&\f\\n(cF\s\\n(cZ
+.if \\n(.$==2 \{\
+.      if "\\$1"0.8"  \&\\*(tNNetBSD\\*(aa 0.8\\*(aa\\$2
+.      if "\\$1"0.8a"  \&\\*(tNNetBSD\\*(aa 0.8a\\*(aa\\$2
+.      if "\\$1"0.9"  \&\\*(tNNetBSD\\*(aa 0.9\\*(aa\\$2
+.      if "\\$1"0.9a"  \&\\*(tNNetBSD\\*(aa 0.9a\\*(aa\\$2
+.      if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa\\$2
+.      if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa\\$2
+.      if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa\\$2
+.      if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa\\$2
+.\}
+.if \\n(.$==1 \{\
+.      if "\\$1"0.8"  \&\\*(tNNetBSD\\*(aa 0.8\\*(aa
+.      if "\\$1"0.8a"  \&\\*(tNNetBSD\\*(aa 0.8a\\*(aa
+.      if "\\$1"0.9"  \&\\*(tNNetBSD\\*(aa 0.9\\*(aa
+.      if "\\$1"0.9a"  \&\\*(tNNetBSD\\*(aa 0.9a\\*(aa
+.      if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa
+.      if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa
+.      if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa
+.      if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa
+.\}
+..
+.\" Ns Ox macro - OpenBSD
+.de Ox
+.nr cF \\n(.f
+.nr cZ \\n(.s
+.ds aa \&\f\\n(cF\s\\n(cZ
+.if \\n(.$==2 \{\
+.      if "\\$1"1.2"  \&\\*(tNOpenBSD\\*(aa 1.2\\*(aa\\$2
+.\}
+.if \\n(.$==1 \{\
+.      if "\\$1"1.2"  \&\\*(tNOpenBSD\\*(aa 1.2\\*(aa
+.\}
+..
 .\" Ns At macro - AT&T UNIX (this macro does not handle punctuation)
 .de At
 .nr cF \\n(.f
@@ -133,6 +171,8 @@
 .      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.2"  \&\\*(tNAT&T\\*(aa System V.2 \\*(tNUNIX\\*(aa\\$2
+.      if "\\$1"V.3"  \&\\*(tNAT&T\\*(aa System V.3 \\*(tNUNIX\\*(aa\\$2
 .      if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
@@ -141,6 +181,8 @@
 .      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.2"  \&\\*(tNAT&T\\*(aa System V.2 \\*(tNUNIX\\*(aa
+.      if "\\$1"V.3"  \&\\*(tNAT&T\\*(aa System V.3 \\*(tNUNIX\\*(aa
 .      if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa
 .\}
 .if \\n(.$==0 \{\
@@ -158,7 +200,7 @@
 .de St
 .if \\n(aC==0 \{\
 .      ie \\n(.$==0 \{\
-.tm Usage: .St [-p1003.1-88 | -p1003.2 | -ansiC-89 | -iso ] \\*(Pu ... (#\\n(.c)
+.tm Usage: .St [-p1003.1-88 | -p1003.1-90 | -p1003.2 | -ansiC-89 | -ieee754 | -iso | -xpg3 | -xpg4 | -xpg4.2 ] \\*(Pu ... (#\\n(.c)
 .      \}
 .      el \{\
 .              ds mN St
@@ -191,34 +233,72 @@
 .                      as b1 (``\\*(tN\\*(Px\\*(aa'')
 .              \}
 .       \}
+.       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" \{\
+.              ie \\n(sT==1 \{\
+.                      ds b1 \&\\*(tNIEEE Std\\*(aa1003.1\\*(sV
+.                      as b1 (``\\*(tN\\*(Px\\*(aa'')
+.              \}
+.              el \{\
+.                      ds b1 \&\\*(tNIEEE Std\\*(aa1003.1\\*(sV
+.                      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
-.                      as b1 (``\\*(tN\\*(Px\\*(aa'')
+.                      as b1 (``\\*(tN\\*(Px.2\\*(aa'')
 .              \}
 .              el \{\
 .                      ds b1 \&\\*(tNIEEE Std\\*(aa1003.2\\*(sV
-.                      as b1 (``\\*(tN\\*(Px\\*(aa'')
+.                      as b1 (``\\*(tN\\*(Px.2\\*(aa'')
 .              \}
 .       \}
 .       if "\\*(A\\n(aP"-ansiC" \{\
 .              ie \\n(sT==1 \{\
-.                      ds b1 \&\\*(tNANSI C \\*(aaX3.159-1989\\*(sV
+.                      ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
 .                      as b1 (``\\*(tNANSI C\\*(aa'')
 .              \}
 .              el \{\
-.                      ds b1 \&\\*(tNANSI C \\*(aaX3.159-1989\\*(sV
-.                      as b1 (``\\*(tNANSI C \\*(aa'')
+.                      ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
+.                      as b1 (``\\*(tNANSI C\\*(aa'')
 .              \}
 .       \}
 .       if "\\*(A\\n(aP"-ansiC-89" \{\
 .              ie \\n(sT==1 \{\
-.                      ds b1 \&\\*(tNANSI C \\*(aaX3.159-1989\\*(sV
-.                      as b1 (``\\*(tNANSI C \\*(aa'')
+.                      ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
+.                      as b1 (``\\*(tNANSI C\\*(aa'')
+.              \}
+.              el \{\
+.                      ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
+.                      as b1 (``\\*(tNANSI C\\*(aa'')
+.              \}
+.       \}
+.       if "\\*(A\\n(aP"-ieee754" \{\
+.              ie \\n(sT==1 \{\
+.                      ds b1 \&\\*(tNIEEE Std\\*(aa754-1985
 .              \}
 .              el \{\
-.                      ds b1 \&\\*(tNANSI C \\*(aaX3.159-1989\\*(sV
-.                      as b1 (``\\*(tNANSI C \\*(aa'')
+.                      ds b1 \&\\*(tNIEEE Std\\*(aa754-1985
 .              \}
 .       \}
 .       if "\\*(A\\n(aP"-iso8802-3" \{\
@@ -231,6 +311,36 @@
 .\" .                  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'')
+.              \}
+.       \}
+.       if "\\*(A\\n(aP"-xpg4.2" \{\
+.              ie \\n(sT==1 \{\
+.                      ds b1 \&\\*(tNX/Open Portability Guide Issue 4.2\\*(aa\\*(sV
+.                      as b1 (``\\*(tNXPG4\\*(aa'')
+.              \}
+.              el \{\
+.                      ds b1 \&\\*(tNX/Open Portability Guide Issue 4.2\\*(aa\\*(sV
+.                      as b1 (``\\*(tNXPG4\\*(aa'')
+.              \}
+.       \}
 .      ie \\n(aC>\\n(aP \{\
 .              nr aP \\n(aP+1
 .              nR