This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: @copying patch 4: use @copying
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 27 Dec 2002 20:13:09 +0000 (GMT)
- Subject: Re: @copying patch 4: use @copying
On Tue, 24 Dec 2002, I wrote:
> be at toplevel, fastjar.texi can be changed as well). The cpp and gcj
> manuals are also temporarily excluded because of texinfo.tex bugs when
> @c or @ignore are used inside @copying; gnat-style.texi has no
Karl Berry's now fixed the texinfo.tex bug, patch below (tested with
"make dvi", applied to mainline). The manual patches for cpp.texi and
gcj.texi (not applied, will be applied with patch 4 once patch 3 is
reviewed) follow.
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* doc/include/texinfo.tex: Update to version 2002-12-26.16.
--- gcc/doc/include/texinfo.tex 2002-12-22 18:09:31.000000000 +0000
+++ gcc/doc/include/texinfo.tex 2002-12-27 18:11:49.000000000 +0000
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2002-11-25.11}
+\def\texinfoversion{2002-12-26.16}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@@ -29,9 +29,8 @@
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
-% ftp://ftp.gnu.org/gnu/texinfo.tex
+% ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
% (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
-% ftp://texinfo.org/texinfo/texinfo.tex
% ftp://tug.org/tex/texinfo.tex
% (and all CTAN mirrors, see http://www.ctan.org),
% and /home/gd/gnu/doc/texinfo.tex on the GNU machines.
@@ -2513,7 +2512,7 @@
\immediate\write16{If you are running another version of TeX, relax.}
\immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
\immediate\write16{ Then upgrade your TeX installation if you can.}
- \immediate\write16{ (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)}
+ \immediate\write16{ (See ftp://ftp.gnu.org/non-gnu/TeX.README.)}
\immediate\write16{If you are stuck with version 3.0, run the}
\immediate\write16{ script ``tex3patch'' from the Texinfo distribution}
\immediate\write16{ to use a workaround.}
@@ -4711,9 +4710,14 @@
% then it can also check if \lastpenalty=1. If it does, then manually
% do \par.
%
-% Seems pretty fragile, but for the limited use of getting the copying
-% text (which should be quite simple) inserted, we can hope it's ok.
-% %
+% This messes up the normal definitions of @c[omment], so we redefine
+% it. Similarly for @ignore. (These commands are used in the gcc
+% manual for man page generation.)
+%
+% Seems pretty fragile, most line-oriented commands will presumably
+% fail, but for the limited use of getting the copying text (which
+% should be quite simple) inserted, we can hope it's ok.
+%
{\catcode`\^^M=\active %
\gdef\insertcopying{\begingroup %
\parindent = 0pt % looks wrong on title page
@@ -4724,6 +4728,15 @@
\space \penalty 1 %
\fi %
}%
+ %
+ % Fix @c[omment] for catcode 13 ^^M's.
+ \def\c##1^^M{\ignorespaces}%
+ \let\comment = \c %
+ %
+ % Don't bother jumping through all the hoops that \doignore does, it
+ % would be very hard since the catcodes are already set.
+ \long\def\ignore##1\end ignore{\ignorespaces}%
+ %
\copyingtext %
\endgroup}%
}
[full ChangeLog entries:]
gcc:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* doc/cpp.texi, doc/gcc.texi, doc/gccint.texi, doc/install.texi:
Use @copying.
gcc/ada:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* gnat_rm.texi, gnat_ug.texi: Use @copying.
* gnat_ug_unx.texi, gnat_ug_vms.texi, gnat_ug_vxw.texi,
gnat_ug_wnt.texi: Regenerate.
gcc/f:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* g77.texi: Use @copying.
gcc/java:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* gcj.texi: Use @copying.
gcc/treelang:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* treelang.texi: Use @copying.
libstdc++-v3:
2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk>
* docs/html/17_intro/porting.texi: Use @copying.
* docs/html/17_intro/porting.html: Regenerate.
--- gcc/doc/cpp.texi 2002-12-22 17:50:41.000000000 +0000
+++ gcc/doc/cpp.texi 2002-12-23 00:08:02.000000000 +0000
@@ -6,7 +6,7 @@
@c @cropmarks
@c @finalout
-@macro copyrightnotice
+@copying
@c man begin COPYRIGHT
Copyright @copyright{} 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
1997, 1998, 1999, 2000, 2001, 2002
@@ -23,9 +23,7 @@
man page gfdl(7).
@c man end
@end ignore
-@end macro
-@macro covertexts
@c man begin COPYRIGHT
This manual contains no Invariant Sections. The Front-Cover Texts are
(a) (see below), and the Back-Cover Texts are (b) (see below).
@@ -40,7 +38,7 @@
software. Copies published by the Free Software Foundation raise
funds for GNU development.
@c man end
-@end macro
+@end copying
@macro gcctabopt{body}
@code{\body\}
@@ -70,8 +68,7 @@
@c There is a fill at the bottom of the page, so we need a filll to
@c override it.
@vskip 0pt plus 1filll
-@copyrightnotice{}
-@covertexts{}
+@insertcopying
@end titlepage
@contents
@page
@@ -180,8 +177,7 @@
@end detailmenu
@end menu
-@copyrightnotice{}
-@covertexts{}
+@insertcopying
@end ifnottex
@node Overview
--- gcc/java/gcj.texi 2002-12-23 11:47:06.000000000 +0000
+++ gcc/java/gcj.texi 2002-12-24 13:42:51.000000000 +0000
@@ -15,33 +15,9 @@
@c Versions
@set which-gcj GCC-@value{version-GCC}
-@ifinfo
-@format
-@dircategory Programming
-@direntry
-* Gcj: (gcj). Ahead-of-time compiler for the Java language
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* gcjh: (gcj)Invoking gcjh.
- Generate header files from Java class files
-* jv-scan: (gcj)Invoking jv-scan.
- Print information about Java source files
-* jcf-dump: (gcj)Invoking jcf-dump.
- Print information about Java class files
-* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode
-* jv-convert: (gcj)Invoking jv-convert.
- Convert file from one encoding to another
-* rmic: (gcj)Invoking rmic.
- Generate stubs for Remote Method Invocation.
-* rmiregistry: (gcj)Invoking rmiregistry.
- The remote object registry.
-@end direntry
-@end format
-
+@copying
@c man begin COPYRIGHT
-Copyright (C) @value{copyrights-gcj} Free Software Foundation, Inc.
+Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -69,6 +45,34 @@
software. Copies published by the Free Software Foundation raise
funds for GNU development.
@c man end
+@end copying
+
+@ifinfo
+@format
+@dircategory Programming
+@direntry
+* Gcj: (gcj). Ahead-of-time compiler for the Java language
+@end direntry
+
+@dircategory Individual utilities
+@direntry
+* gcjh: (gcj)Invoking gcjh.
+ Generate header files from Java class files
+* jv-scan: (gcj)Invoking jv-scan.
+ Print information about Java source files
+* jcf-dump: (gcj)Invoking jcf-dump.
+ Print information about Java class files
+* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode
+* jv-convert: (gcj)Invoking jv-convert.
+ Convert file from one encoding to another
+* rmic: (gcj)Invoking rmic.
+ Generate stubs for Remote Method Invocation.
+* rmiregistry: (gcj)Invoking rmiregistry.
+ The remote object registry.
+@end direntry
+@end format
+
+@insertcopying
@end ifinfo
@titlepage
@@ -77,31 +81,13 @@
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc.
-@sp 2
For the @value{which-gcj} Version*
@sp 1
Published by the Free Software Foundation @*
59 Temple Place - Suite 330@*
Boston, MA 02111-1307, USA@*
@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below). A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
- A GNU Manual
-
-(b) The FSF's Back-Cover Text is:
-
- You have freedom to copy and modify this GNU Manual, like GNU
- software. Copies published by the Free Software Foundation raise
- funds for GNU development.
+@insertcopying
@end titlepage
@contents
@page
--
Joseph S. Myers
jsm28@cam.ac.uk