From f3c9372abd972f62dd34e2996df0427e05457506 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 9 Apr 2001 13:02:20 +0000 Subject: [PATCH] Merge in latest CSRG revisions: - .Fn and .Fc now print a final semicolon (`;') after a function declaration in the SYNOPSIS - .%I implemented - .At outputs ``AT&T UNIX'' if called without arguments - minor cleanup Obtained from: CSRG archives --- contrib/groff/tmac/doc-common | 18 ++------- contrib/groff/tmac/doc-ditroff | 8 ++-- contrib/groff/tmac/doc-nroff | 6 +-- contrib/groff/tmac/doc-syms | 13 ++++--- contrib/groff/tmac/tmac.doc | 67 +++++++++++++++++++++++++++------- 5 files changed, 72 insertions(+), 40 deletions(-) diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common index 32d06ad9c750..3d4f7242bbc8 100644 --- a/contrib/groff/tmac/doc-common +++ b/contrib/groff/tmac/doc-common @@ -1,5 +1,5 @@ -.\" Copyright (c) 1991 The Regents of the University of California. -.\" All rights reserved. +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)doc-common 5.7 (Berkeley) 8/5/91 +.\" @(#)doc-common 8.1 (Berkeley) 06/08/93 .\" $FreeBSD$ .\" .\" %beginstrip% @@ -54,15 +54,12 @@ .nr Bx 12n .nr Cd 12n .nr Cm 10n -.nr Co 15n -.nr Cx 20n .nr Dc 3 .nr Do 10n .nr Dq 12n .nr Ds 6n .nr Dq 12n .nr Dv 12n -.nr tI \n(Dsu .nr Ec 3 .nr El 1 .nr Eo 12n @@ -70,14 +67,12 @@ .nr Em 10n .nr Er 17n .nr Ev 15n -.nr Ex 10n .nr Fa 12n .nr Fx 12n .nr Fl 10n .nr Fc 3 .nr Fo 16n .nr Fn 16n -.nr Hl 1 .nr I1 6n .nr I2 12n .nr I3 18n @@ -104,12 +99,6 @@ .nr Sq 12n .nr Sy 6n .nr Sx 16n -.nr Ra 1 -.nr Rj 1 -.nr Rn 1 -.nr Ro 1 -.nr Rr 1 -.nr Rt 1 .nr Rv 1 .nr Tn 10n .nr Ta 1 @@ -287,7 +276,6 @@ . \} . ev .\} -.\" .tm IN 444 fM .k == \\n(.k and nl == \\n(nl .. .de lM .\" We may still have a partial line in the enviroment. If this is the case, diff --git a/contrib/groff/tmac/doc-ditroff b/contrib/groff/tmac/doc-ditroff index 86185905009b..affcfd801b12 100644 --- a/contrib/groff/tmac/doc-ditroff +++ b/contrib/groff/tmac/doc-ditroff @@ -1,5 +1,5 @@ -.\" Copyright (c) 1991 The Regents of the University of California. -.\" All rights reserved. +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)doc-ditroff 5.8 (Berkeley) 8/5/91 +.\" @(#)doc-ditroff 8.1 (Berkeley) 06/08/93 .\" $FreeBSD$ .\" .\" tmac.mdoc-ditroff @@ -203,7 +203,7 @@ . if (\\n(aP>0) \{\ . ds A\\n(aP Li . nr aP \\n(aP -1 -. \} +. \} . if (\\n(aP==0) \{\ . rm C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 . rm S1 S2 S3 S4 S5 S6 S7 S8 S9 diff --git a/contrib/groff/tmac/doc-nroff b/contrib/groff/tmac/doc-nroff index d27a492e5881..7c7126aee328 100644 --- a/contrib/groff/tmac/doc-nroff +++ b/contrib/groff/tmac/doc-nroff @@ -1,5 +1,5 @@ -.\" Copyright (c) 1991 The Regents of the University of California. -.\" All rights reserved. +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)doc-nroff 5.6 (Berkeley) 8/5/91 +.\" @(#)doc-nroff 8.1 (Berkeley) 06/08/93 .\" $FreeBSD$ .\" .\" tmac.mdoc-nroff diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms index 91a3ec906957..ceb17840dfb1 100644 --- a/contrib/groff/tmac/doc-syms +++ b/contrib/groff/tmac/doc-syms @@ -1,5 +1,5 @@ -.\" Copyright (c) 1991 The Regents of the University of California. -.\" All rights reserved. +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)doc-syms 5.6 (Berkeley) 8/5/91 +.\" @(#)doc-syms 8.1 (Berkeley) 06/08/93 .\" $FreeBSD$ .\" .\" %beginstrip% @@ -52,7 +52,7 @@ .\} .el .aZ .. -.\" NS Bx macro -BSD UNIX (fix smaller nroff version) +.\" NS Bx macro -BSD (fix smaller nroff version) .de Bx .nr cF \\n(.f .nr cZ \\n(.s @@ -120,7 +120,7 @@ .de Ud \¤tly under development. .. -.\" Ns At macro - AT&T UNIX +.\" Ns At macro - AT&T UNIX (this macro does not handle punctuation) .de At .nr cF \\n(.f .nr cZ \\n(.s @@ -153,6 +153,9 @@ . 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 \\n(.$==0 \{\ +\&\\*(tNAT&T UNIX\\*(aa +.\} .. .\" NS Fx macro - FreeBSD .\" NS b0 string local temporary diff --git a/contrib/groff/tmac/tmac.doc b/contrib/groff/tmac/tmac.doc index 65c5c05c5994..b7ca00bbac08 100644 --- a/contrib/groff/tmac/tmac.doc +++ b/contrib/groff/tmac/tmac.doc @@ -1,5 +1,5 @@ -.\" Copyright (c) 1991 The Regents of the University of California. -.\" All rights reserved. +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)doc 5.8 (Berkeley) 8/5/91 +.\" @(#)doc 8.1 (Berkeley) 06/08/93 .\" $FreeBSD$ .\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be .\" installed as mdoc/doc-* rather than tmac.doc-* (the filename @@ -2287,7 +2287,6 @@ . aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 . \} .\} -.\} .if \\n(aC>\\n(aP \{\ . nr aP \\n(aP+1 . as b1 \\*(sX @@ -2600,8 +2599,7 @@ . \} .\" . \} . 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 +. as b1 \&\f\\n(cF\s\\n(cZ\|,\\*(S\\n(aP\\*(fA\\*(A\\n(aP\fP\s0 . \} . if \\n(fC==1 \{\ . as b1 \&\|\\*(fA\\*(A\\n(aP\fP\s0 @@ -2682,7 +2680,8 @@ . f\\n(C\\n(aP . \} . el \{\ -. as b1 \|\\*(rp +. ie \\n(nS>0 .as b1 \|\\*(rp\fR;\fP +. el .as b1 \|\\*(rp . aZ . \} . if \\n(nS>0 \{\ @@ -2696,7 +2695,8 @@ .\" NS f3 macro - punctuation .\" NS f4 macro - write out function .de f1 -.as b1 \\*(rp\f\\n(cF\s\\n(cZ +.ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ +.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ .\\*(A\\n(aP .. .de f2 @@ -2720,19 +2720,22 @@ . f\\n(C\\n(aP .\} .el \{\ -. as b1 \\*(rp\f\\n(cF\s\\n(cZ +. ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ +. el .as b1 \\*(rp\f\\n(cF\s\\n(cZ . aZ .\} .. .de f3 -.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP +.ie \\n(nS>0 .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP +.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP .ie \\n(aC>\\n(aP \{\ . No .\} .el .aZ .. .de f4 -.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP +.ie \\n(nS>0 .as b1 \\*(rp\fR;\fP\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP +.el .as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP .ie \\n(aC>\\n(aP \{\ . nr aP \\n(aP+1 . No @@ -2823,7 +2826,8 @@ .\} .nr fC 0 .nr oM \\n(oM-1 -.as b1 \|\\*(rp +.ie \\n(nS>0 .as b1 \|\\*(rp\fR;\fP +.el .as b1 \|\\*(rp .ie \\n(aC>\\n(aP \{\ . nr aP \\n(aP+1 . \\*(A\\n(aP @@ -2884,6 +2888,7 @@ .de rC .nr uK 0 .nr jK 0 +.nr iK 0 .nr nK 0 .nr oK 0 .nr qK 0 @@ -2895,7 +2900,7 @@ .nr bK 0 .ds rS .rm U1 U2 U3 U4 U5 U6 U7 U8 -.rm uK jK nK oK rK qK tK vK dK pK bK +.rm uK jK iK nK oK rK qK tK vK dK pK bK .. .\" NS rZ macro - reference print .de rZ @@ -2924,6 +2929,11 @@ . if \\n(Kl==0 \&\\*(eM\\*(bK\\*(nO. . if \\n(Kl>0 \&\\*(eM\\*(bK\\*(nO, .\} +.if \\n(iK \{\ +. nr Kl \\n(Kl-1 +. if \\n(Kl==0 \&\\*(eM\\*(iK\\*(nO. +. if \\n(Kl>0 \&\\*(eM\\*(iK\\*(nO, +.\} .if \\n(jK \{\ . nr Kl \\n(Kl-1 . if \\n(Kl==0 \&\\*(eM\\*(jK\\*(nO. @@ -3067,6 +3077,37 @@ . rR .\} .. +.\" NS %I macro - [reference] Issuer/Publisher Name +.\" NS jK register - [reference] Issuer/Publisher Name flag +.\" NS jK string - [reference] Issuer/Publisher Name +.de %I +.if \\n(aC==0 \{\ +. ie \\n(.$==0 .tm Usage: .%I Issuer/Publisher Name (#\\n(.c) +. el \{\ +. ds mN %I +. nr iK \\n(iK+1 +. ds rS iK +. nr Kl \\n(Kl+1 +. 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 \{\ +. nr aP \\n(aP+1 +. nr cF \\n(.f +. nr cZ \\n(.s +. rR +.\} +.. .\" NS %J macro - [reference] Journal Name .\" NS jK register - [reference] Journal Name flag .\" NS jK string - [reference] Journal Name