diff options
-rw-r--r-- | share/man/man7/mdoc.7 | 8 | ||||
-rw-r--r-- | share/man/man7/mdoc.samples.7 | 5 | ||||
-rw-r--r-- | share/tmac/mdoc/doc-syms | 151 |
3 files changed, 62 insertions, 102 deletions
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7 index 6d9e26922ac..4f709ff63b4 100644 --- a/share/man/man7/mdoc.7 +++ b/share/man/man7/mdoc.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mdoc.7,v 1.34 2004/07/02 10:36:57 jmc Exp $ +.\" $OpenBSD: mdoc.7,v 1.35 2004/11/21 07:07:46 jaredy Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -362,12 +362,12 @@ The known standards for the St macro are: .It Li \&Ef Ta \&No Ta \&No Ta "End font mode." .It Li \&Em Ta Yes Ta Yes Ta "Emphasis (traditional English)." .It Li \&Eo Ta Yes Ta Yes Ta "Enclose string open quote." -.It Li \&Fx Ta \&No Ta \&No Ta FreeBSD . +.It Li \&Fx Ta Yes Ta \&No Ta FreeBSD . .It Li \&Ms Ta Yes Ta \&No Ta "Mathematical symbol." .It Li \&No Ta Yes Ta Yes Ta "Normal text (no-op)." .It Li \&Ns Ta Yes Ta Yes Ta "No space." -.It Li \&Nx Ta \&No Ta \&No Ta NetBSD . -.It Li \&Ox Ta \&No Ta \&No Ta OpenBSD . +.It Li \&Nx Ta Yes Ta \&No Ta NetBSD . +.It Li \&Ox Ta Yes Ta \&No Ta OpenBSD . .It Li \&Pc Ta Yes Ta Yes Ta "Parenthesis close quote." .It Li \&Pf Ta Yes Ta \&No Ta "Prefix string." .It Li \&Po Ta Yes Ta Yes Ta "Parenthesis open quote." diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7 index 560c8bf4bc1..82546da389b 100644 --- a/share/man/man7/mdoc.samples.7 +++ b/share/man/man7/mdoc.samples.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mdoc.samples.7,v 1.58 2004/08/10 22:21:31 jmc Exp $ +.\" $OpenBSD: mdoc.samples.7,v 1.59 2004/11/21 07:07:46 jaredy Exp $ .\" $NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -1794,8 +1794,7 @@ The and .Ql \&.Nx macros are -.Em not -parsed and are +parsed but are .Em not callable. .Ss UNIX Macro diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms index 765df80726c..1da70dfada7 100644 --- a/share/tmac/mdoc/doc-syms +++ b/share/tmac/mdoc/doc-syms @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-syms,v 1.55 2004/08/09 18:08:51 deraadt Exp $ +.\" $OpenBSD: doc-syms,v 1.56 2004/11/21 07:07:46 jaredy Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -118,114 +118,75 @@ .de Ud \¤tly under development. .. -.\" Ns Nx macro - NetBSD +.\" NS Nx macro - NetBSD .de Nx .nr cF \\n(.f .nr cZ \\n(.s .ds aa \&\f\\n(cF\s\\n(cZ .if \\n(aC==0 \{\ -. if \\n(.$==0 \&NetBSD\\*(aa +. ie \\n(.$==0 \&NetBSD\\*(aa +. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 .\} -.if \\n(.$==2 \{\ -. if "\\$1"0.8" \&NetBSD 0.8\\*(aa\\$2 -. if "\\$1"0.8a" \&NetBSD 0.8A\\*(aa\\$2 -. if "\\$1"0.9" \&NetBSD 0.9\\*(aa\\$2 -. if "\\$1"0.9a" \&NetBSD 0.9A\\*(aa\\$2 -. if "\\$1"1.0" \&NetBSD 1.0\\*(aa\\$2 -. if "\\$1"1.0a" \&NetBSD 1.0A\\*(aa\\$2 -. if "\\$1"1.1" \&NetBSD 1.1\\*(aa\\$2 -. if "\\$1"1.1a" \&NetBSD 1.1A\\*(aa\\$2 -. if "\\$1"1.2" \&NetBSD 1.2\\*(aa\\$2 -. if "\\$1"1.2a" \&NetBSD 1.2A\\*(aa\\$2 -. if "\\$1"1.2b" \&NetBSD 1.2B\\*(aa\\$2 -. if "\\$1"1.2c" \&NetBSD 1.2C\\*(aa\\$2 -. if "\\$1"1.2d" \&NetBSD 1.2D\\*(aa\\$2 -. if "\\$1"1.2e" \&NetBSD 1.2E\\*(aa\\$2 -. if "\\$1"1.3" \&NetBSD 1.3\\*(aa\\$2 -. if "\\$1"1.3a" \&NetBSD 1.3A\\*(aa\\$2 -. if "\\$1"1.4" \&NetBSD 1.4\\*(aa\\$2 -. if "\\$1"1.5" \&NetBSD 1.5\\*(aa\\$2 -. if "\\$1"1.5.1" \&NetBSD 1.5.1\\*(aa\\$2 -. if "\\$1"1.6" \&NetBSD 1.6\\*(aa\\$2 -. if "\\$1"1.6.2" \&NetBSD 1.6.2\\*(aa\\$2 -. if "\\$1"2.0" \&NetBSD 2.0\\*(aa\\$2 -.\} -.if \\n(.$==1 \{\ -. if "\\$1"0.8" \&NetBSD 0.8\\*(aa -. if "\\$1"0.8a" \&NetBSD 0.8A\\*(aa -. if "\\$1"0.9" \&NetBSD 0.9\\*(aa -. if "\\$1"0.9a" \&NetBSD 0.9A\\*(aa -. if "\\$1"1.0" \&NetBSD 1.0\\*(aa -. if "\\$1"1.0a" \&NetBSD 1.0A\\*(aa -. if "\\$1"1.1" \&NetBSD 1.1\\*(aa -. if "\\$1"1.2" \&NetBSD 1.2\\*(aa -. if "\\$1"1.2a" \&NetBSD 1.2A\\*(aa -. if "\\$1"1.2b" \&NetBSD 1.2B\\*(aa -. if "\\$1"1.2c" \&NetBSD 1.2C\\*(aa -. if "\\$1"1.2d" \&NetBSD 1.2D\\*(aa -. if "\\$1"1.2e" \&NetBSD 1.2E\\*(aa -. if "\\$1"1.3" \&NetBSD 1.3\\*(aa -. if "\\$1"1.4" \&NetBSD 1.4\\*(aa -. if "\\$1"1.5" \&NetBSD 1.5\\*(aa -. if "\\$1"1.5.1" \&NetBSD 1.5.1\\*(aa -. if "\\$1"1.6" \&NetBSD 1.6\\*(aa -. if "\\$1"1.6.2" \&NetBSD 1.6.2\\*(aa -. if "\\$1"2.0" \&NetBSD 2.0\\*(aa -. if "\\$1"." \&NetBSD\\$1\\*(aa -. if "\\$1"," \&NetBSD\\$1\\*(aa +.if \\n(aC>\\n(aP \{\ +. nr aP \\n(aP+1 +. ie \\n(C\\n(aP==2 \{\ +. if "\\*(A\\n(aP"0.8" .as b1 \&NetBSD\ 0.8\\*(aa +. if "\\*(A\\n(aP"0.8a" .as b1 \&NetBSD\ 0.8A\\*(aa +. if "\\*(A\\n(aP"0.9" .as b1 \&NetBSD\ 0.9\\*(aa +. if "\\*(A\\n(aP"0.9a" .as b1 \&NetBSD\ 0.9A\\*(aa +. if "\\*(A\\n(aP"1.0" .as b1 \&NetBSD\ 1.0\\*(aa +. if "\\*(A\\n(aP"1.0a" .as b1 \&NetBSD\ 1.0A\\*(aa +. if "\\*(A\\n(aP"1.1" .as b1 \&NetBSD\ 1.1\\*(aa +. if "\\*(A\\n(aP"1.1a" .as b1 \&NetBSD\ 1.1A\\*(aa +. if "\\*(A\\n(aP"1.2" .as b1 \&NetBSD\ 1.2\\*(aa +. if "\\*(A\\n(aP"1.2a" .as b1 \&NetBSD\ 1.2A\\*(aa +. if "\\*(A\\n(aP"1.2b" .as b1 \&NetBSD\ 1.2B\\*(aa +. if "\\*(A\\n(aP"1.2c" .as b1 \&NetBSD\ 1.2C\\*(aa +. if "\\*(A\\n(aP"1.2d" .as b1 \&NetBSD\ 1.2D\\*(aa +. if "\\*(A\\n(aP"1.2e" .as b1 \&NetBSD\ 1.2E\\*(aa +. if "\\*(A\\n(aP"1.3" .as b1 \&NetBSD\ 1.3\\*(aa +. if "\\*(A\\n(aP"1.3a" .as b1 \&NetBSD\ 1.3A\\*(aa +. if "\\*(A\\n(aP"1.4" .as b1 \&NetBSD\ 1.4\\*(aa +. if "\\*(A\\n(aP"1.5" .as b1 \&NetBSD\ 1.5\\*(aa +. if "\\*(A\\n(aP"1.5.1" .as b1 \&NetBSD\ 1.5.1\\*(aa +. if "\\*(A\\n(aP"1.6" .as b1 \&NetBSD\ 1.6\\*(aa +. if "\\*(A\\n(aP"1.6.2" .as b1 \&NetBSD\ 1.6.2\\*(aa +. if "\\*(A\\n(aP"2.0" .as b1 \&NetBSD\ 2.0\\*(aa +. ie \\n(aC>\\n(aP \{\ +. nr aP \\n(aP+1 +. nR +. \} +. el .aZ +. \} +. el \{\ +. as b1 \&NetBSD\\*(aa +. nR +. \} .\} .. -.\" Ns Ox macro - OpenBSD +.\" NS Ox macro - OpenBSD .de Ox .nr cF \\n(.f .nr cZ \\n(.s .ds aa \&\f\\n(cF\s\\n(cZ .if \\n(aC==0 \{\ -. if \\n(.$==0 \&OpenBSD\\*(aa +. ie \\n(.$==0 \&OpenBSD\\*(aa +. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 .\} -.if \\n(.$==2 \{\ -. if "\\$1"1.2" \&OpenBSD 1.2\\*(aa\\$2 -. if "\\$1"2.0" \&OpenBSD 2.0\\*(aa\\$2 -. if "\\$1"2.1" \&OpenBSD 2.1\\*(aa\\$2 -. if "\\$1"2.2" \&OpenBSD 2.2\\*(aa\\$2 -. if "\\$1"2.3" \&OpenBSD 2.3\\*(aa\\$2 -. if "\\$1"2.4" \&OpenBSD 2.4\\*(aa\\$2 -. if "\\$1"2.5" \&OpenBSD 2.5\\*(aa\\$2 -. if "\\$1"2.6" \&OpenBSD 2.6\\*(aa\\$2 -. if "\\$1"2.7" \&OpenBSD 2.7\\*(aa\\$2 -. if "\\$1"2.8" \&OpenBSD 2.8\\*(aa\\$2 -. if "\\$1"2.9" \&OpenBSD 2.9\\*(aa\\$2 -. if "\\$1"3.0" \&OpenBSD 3.0\\*(aa\\$2 -. if "\\$1"3.1" \&OpenBSD 3.1\\*(aa\\$2 -. if "\\$1"3.2" \&OpenBSD 3.2\\*(aa\\$2 -. if "\\$1"3.3" \&OpenBSD 3.3\\*(aa\\$2 -. if "\\$1"3.4" \&OpenBSD 3.4\\*(aa\\$2 -. if "\\$1"3.5" \&OpenBSD 3.5\\*(aa\\$2 -. if "\\$1"3.6" \&OpenBSD 3.6\\*(aa\\$2 -. if "\\$1"3.7" \&OpenBSD 3.7\\*(aa\\$2 -.\} -.if \\n(.$==1 \{\ -. if "\\$1"1.2" \&OpenBSD 1.2\\*(aa -. if "\\$1"2.0" \&OpenBSD 2.0\\*(aa -. if "\\$1"2.1" \&OpenBSD 2.1\\*(aa -. if "\\$1"2.2" \&OpenBSD 2.2\\*(aa -. if "\\$1"2.3" \&OpenBSD 2.3\\*(aa -. if "\\$1"2.4" \&OpenBSD 2.4\\*(aa -. if "\\$1"2.5" \&OpenBSD 2.5\\*(aa -. if "\\$1"2.6" \&OpenBSD 2.6\\*(aa -. if "\\$1"2.7" \&OpenBSD 2.7\\*(aa -. if "\\$1"2.8" \&OpenBSD 2.8\\*(aa -. if "\\$1"2.9" \&OpenBSD 2.9\\*(aa -. if "\\$1"3.0" \&OpenBSD 3.0\\*(aa -. if "\\$1"3.1" \&OpenBSD 3.1\\*(aa -. if "\\$1"3.2" \&OpenBSD 3.2\\*(aa -. if "\\$1"3.3" \&OpenBSD 3.3\\*(aa -. if "\\$1"3.4" \&OpenBSD 3.4\\*(aa -. if "\\$1"3.5" \&OpenBSD 3.5\\*(aa -. if "\\$1"3.6" \&OpenBSD 3.6\\*(aa -. if "\\$1"3.7" \&OpenBSD 3.7\\*(aa -. if "\\$1"." \&OpenBSD\\$1\\*(aa -. if "\\$1"," \&OpenBSD\\$1\\*(aa +.if \\n(aC>\\n(aP \{\ +. nr aP \\n(aP+1 +. ie \\n(C\\n(aP==2 \{\ +. as b1 \&OpenBSD\ \&\\*(A\\n(aP\\*(aa +. ie \\n(aC>\\n(aP \{\ +. nr aP \\n(aP+1 +. nR +. \} +. el .aZ +. \} +. el \{\ +. as b1 \&OpenBSD\\*(aa +. nR +. \} .\} .. .\" NS Fx macro -- FreeBSD |