[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gcc-patches
Subject:    texinfo.tex updated
From:       "Joseph S. Myers" <jsm () polyomino ! org ! uk>
Date:       2003-12-31 21:20:49
Message-ID: Pine.LNX.4.58.0312312119320.22095 () digraph ! polyomino ! org ! uk
[Download RAW message or body]

I've updated texinfo.tex on mainline to the current version (note the
change of comments therein about the location of current versions, the
copy on ftp.gnu.org is currently out of date; texinfo CVS on savannah
is also slightly out of date, though gnulib CVS has the current
texinfo.tex).  This should avoid the sort of licensing FUD found in
Debian bug 183860, without actually fixing any of the underlying
defects with the GFDL as a documentation licence.  The changes to
gcc.texi and gccint.texi are because texinfo.tex now defaults to
fixed-width fonts for @def... commands so a local hack is no longer
needed.

Tested with "make info" and "make dvi".

2003-12-31  Joseph S. Myers  <jsm@polyomino.org.uk>

	* doc/include/texinfo.tex: Update to version 2003-12-21.10.
	* doc/gcc.texi, doc/gccint.texi: Don't set font for
	@def... commands.
	* doc/invoke.texi: Don't use empty @opindex.

diff -ruN GCC.orig/gcc/doc/gcc.texi GCC/gcc/doc/gcc.texi
--- GCC.orig/gcc/doc/gcc.texi	2003-10-04 07:34:27.000000000 +0000
+++ GCC/gcc/doc/gcc.texi	2003-12-31 17:11:20.000000000 +0000
@@ -54,12 +54,6 @@
 @c \global\normaloffset =0.75in
 @c @end tex
 
-@c Change the font used for @def... commands, since the default
-@c proportional one used is bad for names starting __.
-@tex
-\global\setfont\defbf\ttbshape{10}{\magstep1}
-@end tex
-
 @copying
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
diff -ruN GCC.orig/gcc/doc/gccint.texi GCC/gcc/doc/gccint.texi
--- GCC.orig/gcc/doc/gccint.texi	2003-03-23 18:46:00.000000000 +0000
+++ GCC/gcc/doc/gccint.texi	2003-12-31 17:11:32.000000000 +0000
@@ -40,12 +40,6 @@
 @c \global\normaloffset =0.75in
 @c @end tex
 
-@c Change the font used for @def... commands, since the default
-@c proportional one used is bad for names starting __.
-@tex
-\global\setfont\defbf\ttbshape{10}{\magstep1}
-@end tex
-
 @copying
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
diff -ruN GCC.orig/gcc/doc/invoke.texi GCC/gcc/doc/invoke.texi
--- GCC.orig/gcc/doc/invoke.texi	2003-12-31 17:05:44.000000000 +0000
+++ GCC/gcc/doc/invoke.texi	2003-12-31 19:22:50.000000000 +0000
@@ -6907,41 +6907,41 @@
 that might help in debugging programs.
 
 @item -malign-loops
-@opindex
+@opindex malign-loops
 Align all loops to a 32-byte boundary.
 
 @item -mno-align-loops
-@opindex
+@opindex mno-align-loops
 Do not enforce a 32-byte alignment for loops.  This is the default.
 
 @item -missue-rate=@var{number}
-@opindex
+@opindex missue-rate=@var{number}
 Issue @var{number} instructions per cycle.  @var{number} can only be 1
 or 2.
 
 @item -mbranch-cost=@var{number}
-@opindex
+@opindex mbranch-cost=@var{number}
 @var{number} can only be 1 or 2.  If it is 1 then branches will be
 prefered over conditional code, if it is 2, then the opposite will
 apply.
 
 @item -mflush-trap=@var{number}
-@opindex
+@opindex mflush-trap=@var{number}
 Specifies the trap number to use to flush the cache.  The default is
 12.  Valid numbers are between 0 and 15 inclusive.
 
 @item -mno-flush-trap
-@opindex
+@opindex mno-flush-trap
 Specifies that the cache cannot be flushed by using a trap.
 
 @item -mflush-func=@var{name}
-@opindex
+@opindex mflush-func=@var{name}
 Specifies the name of the operating system function to call to flush
 the cache.  The default is @emph{_flush_cache}, but a function call
 will only be used if a trap is not available.
 
 @item -mno-flush-func
-@opindex
+@opindex mno-flush-func
 Indicates that there is no OS function for flushing the cache.
 
 @end table
diff -ruN GCC.orig/gcc/doc/include/texinfo.tex GCC/gcc/doc/include/texinfo.tex
--- GCC.orig/gcc/doc/include/texinfo.tex	2003-10-04 07:34:43.000000000 +0000
+++ GCC/gcc/doc/include/texinfo.tex	2003-12-31 17:10:58.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{2003-05-04.08}
+\def\texinfoversion{2003-12-21.10}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -23,21 +23,16 @@
 % to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 % Boston, MA 02111-1307, USA.
 %
-% In other words, you are welcome to use, share and improve this program.
-% You are forbidden to forbid anyone else to use, share and improve
-% what you give them.   Help stamp out software-hoarding!
-%
+% As a special exception, when this file is read by TeX when processing
+% a Texinfo source document, you may use the result without
+% restriction.  (This has been our intent since Texinfo was invented.)
+% 
 % 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/texinfo.tex
-%     (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
 %   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.
-%
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
-%
-% The texinfo.tex in any given Texinfo distribution could well be out
+%     (and all CTAN mirrors, see http://www.ctan.org).
+% The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
 % Send bug reports to bug-texinfo@gnu.org.  Please include including a
@@ -59,6 +54,9 @@
 % It is possible to adapt texinfo.tex for other languages, to some
 % extent.  You can get the existing language-specific files from the
 % full Texinfo distribution.
+% 
+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+
[snip most of the upstream patch to texinfo.tex]

-- 
Joseph S. Myers
jsm@polyomino.org.uk
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic