Date: Sat, 7 Apr 2001 16:00:35 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: doc@FreeBSD.org Cc: Bruce Evans <bde@FreeBSD.org>, Sheldon Hearn <sheldonh@FreeBSD.org>, Mike Pritchard <mpp@FreeBSD.org>, Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> Subject: Re: Please review: latest mdoc(7) fixes from CSRG Message-ID: <20010407160035.A66999@sunbay.com> In-Reply-To: <20010407153431.A65093@sunbay.com>; from ru@FreeBSD.org on Sat, Apr 07, 2001 at 03:34:31PM %2B0300 References: <20010407153431.A65093@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Apr 07, 2001 at 03:34:31PM +0300, Ruslan Ermilov wrote: [...] > If you have any ideas of why this should not be imported, > let me know now (I know some manpages abuse the .Fn macro > for cpp(1) macros declarations, but they basically need > this final `;' too). > I've checked all src/ -mdoc manpages, and only several contrib/bind/doc/man/*.3 manpages assert a final semicolon after the .Fn declaration in the SYNOPSIS, and we don't use these manpages. (Under -mdocNG, this would cause two `;' to be printed.) Also, both NetBSD and OpenBSD based their -mdoc sources on these latest CSRG revisions. Also, here attached is the patch, forgotten in the original message, for those interested. Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: doc-common =================================================================== RCS file: /home/ncvs/src/contrib/groff/tmac/doc-common,v retrieving revision 1.44 diff -u -p -r1.44 doc-common --- doc-common 2001/04/05 07:59:19 1.44 +++ doc-common 2001/04/07 12:14:17 @@ -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: src/contrib/groff/tmac/doc-common,v 1.44 2001/04/05 07:59:19 ru Exp $ .\" .\" %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, Index: doc-ditroff =================================================================== RCS file: /home/ncvs/src/contrib/groff/tmac/doc-ditroff,v retrieving revision 1.3 diff -u -p -r1.3 doc-ditroff --- doc-ditroff 2001/02/01 16:17:06 1.3 +++ doc-ditroff 2001/04/07 12:14:17 @@ -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: src/contrib/groff/tmac/doc-ditroff,v 1.3 2001/02/01 16:17:06 ru Exp $ .\" .\" 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 Index: doc-nroff =================================================================== RCS file: /home/ncvs/src/contrib/groff/tmac/doc-nroff,v retrieving revision 1.4 diff -u -p -r1.4 doc-nroff --- doc-nroff 2001/02/01 16:17:06 1.4 +++ doc-nroff 2001/04/07 12:14:17 @@ -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: src/contrib/groff/tmac/doc-nroff,v 1.4 2001/02/01 16:17:06 ru Exp $ .\" .\" tmac.mdoc-nroff Index: doc-syms =================================================================== RCS file: /home/ncvs/src/contrib/groff/tmac/doc-syms,v retrieving revision 1.38 diff -u -p -r1.38 doc-syms --- doc-syms 2001/03/12 17:19:38 1.38 +++ doc-syms 2001/04/07 12:14:17 @@ -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: src/contrib/groff/tmac/doc-syms,v 1.38 2001/03/12 17:19:38 ru Exp $ .\" .\" %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 @@ -152,6 +152,9 @@ . 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 \\n(.$==0 \{\ +\&\\*(tNAT&T UNIX\\*(aa .\} .. .\" NS Fx macro - FreeBSD Index: tmac.doc =================================================================== RCS file: /home/ncvs/src/contrib/groff/tmac/tmac.doc,v retrieving revision 1.21 diff -u -p -r1.21 tmac.doc --- tmac.doc 2001/03/01 12:46:29 1.21 +++ tmac.doc 2001/04/07 12:14:18 @@ -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: src/contrib/groff/tmac/tmac.doc,v 1.21 2001/03/01 12:46:29 ru Exp $ .\" 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. @@ -3047,6 +3057,37 @@ . nr dK \\n(dK+1 . nr Kl \\n(Kl+1 . ds rS dK +. 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 %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 --WIyZ46R2i8wDzkSu-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010407160035.A66999>