diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lib/Automake/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/Makefile.in | 7 | ||||
| -rw-r--r-- | lib/am/Makefile.in | 3 | ||||
| -rwxr-xr-x | lib/config.guess | 4 | ||||
| -rw-r--r-- | lib/config.sub | 5 | ||||
| -rw-r--r-- | lib/texinfo.tex | 252 | ||||
| -rw-r--r-- | m4/Makefile.in | 4 |
8 files changed, 148 insertions, 133 deletions
@@ -1,5 +1,8 @@ 2004-01-11 Alexandre Duret-Lutz <adl@gnu.org> + * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream + versions. + * m4/as.m4, m4/depend.m4, m4/maintainer.m4, m4/multi.m4: Update copyright years and serial. diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 8baf4d21c..df50ef23f 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -35,7 +35,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = lib/Automake -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_perllib_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \ diff --git a/lib/Makefile.in b/lib/Makefile.in index a46b06ac2..33d4aa1ff 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -35,9 +35,10 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING \ - INSTALL ansi2knr.1 ansi2knr.c compile config.guess config.sub \ - depcomp elisp-comp install-sh mdate-sh missing mkinstalldirs \ +DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING INSTALL \ + ansi2knr.1 ansi2knr.c compile config.guess config.sub depcomp \ + elisp-comp install-sh mdate-sh missing mkinstalldirs \ py-compile texinfo.tex ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index b00cba41a..80beb631a 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -35,7 +35,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = lib/am -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_am_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \ diff --git a/lib/config.guess b/lib/config.guess index 61f2e4c60..e8c6fc0c3 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-10-20' +timestamp='2004-01-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1186,7 +1186,7 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) diff --git a/lib/config.sub b/lib/config.sub index fac519512..463186dbf 100644 --- a/lib/config.sub +++ b/lib/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-11-20' +timestamp='2004-01-05' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -380,6 +380,9 @@ case $basic_machine in amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv diff --git a/lib/texinfo.tex b/lib/texinfo.tex index baeb005b5..77b391f24 100644 --- a/lib/texinfo.tex +++ b/lib/texinfo.tex @@ -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{2004-01-03.14} +\def\texinfoversion{2004-01-05.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software @@ -3055,26 +3055,11 @@ width0pt\relax} \fi % \normalturnoffactive % - % Control letters and accents. + \commondummiesnofonts + % \definedummyletter{_}% - \definedummyletter{,}% - \definedummyletter{"}% - \definedummyletter{`}% - \definedummyletter{'}% - \definedummyletter{^}% - \definedummyletter{~}% - \definedummyletter{=}% - \definedummyword{u}% - \definedummyword{v}% - \definedummyword{H}% - \definedummyword{dotaccent}% - \definedummyword{ringaccent}% - \definedummyword{tieaccent}% - \definedummyword{ubaraccent}% - \definedummyword{udotaccent}% - \definedummyword{dotless}% - % - % Other non-English letters. + % + % Non-English letters. \definedummyword{AA}% \definedummyword{AE}% \definedummyword{L}% @@ -3101,35 +3086,9 @@ width0pt\relax} \fi \definedummyword{tclose}% \definedummyword{tt}% % - % Texinfo font commands. - \definedummyword{b}% - \definedummyword{i}% - \definedummyword{r}% - \definedummyword{sc}% - \definedummyword{t}% - % \definedummyword{LaTeX}% \definedummyword{TeX}% - \definedummyword{acronym}% - \definedummyword{cite}% - \definedummyword{code}% - \definedummyword{command}% - \definedummyword{dfn}% \definedummyword{dots}% - \definedummyword{emph}% - \definedummyword{env}% - \definedummyword{file}% - \definedummyword{kbd}% - \definedummyword{key}% - \definedummyword{math}% - \definedummyword{option}% - \definedummyword{samp}% - \definedummyword{strong}% - \definedummyword{uref}% - \definedummyword{url}% - \definedummyword{var}% - \definedummyword{verb}% - \definedummyword{w}% % % Assorted special characters. \definedummyword{bullet}% @@ -3157,40 +3116,83 @@ width0pt\relax} \fi \turnoffmacros } +% \commondummiesnofonts: common to \commondummies and \indexnofonts. +% +% Better have this without active chars. +{ + \catcode`\~=\other + \gdef\commondummiesnofonts{% + % Control letters and accents. + \definedummyletter{,}% + \definedummyletter{"}% + \definedummyletter{`}% + \definedummyletter{'}% + \definedummyletter{^}% + \definedummyletter{~}% + \definedummyletter{=}% + \definedummyword{u}% + \definedummyword{v}% + \definedummyword{H}% + \definedummyword{dotaccent}% + \definedummyword{ringaccent}% + \definedummyword{tieaccent}% + \definedummyword{ubaraccent}% + \definedummyword{udotaccent}% + \definedummyword{dotless}% + % + % Texinfo font commands. + \definedummyword{b}% + \definedummyword{i}% + \definedummyword{r}% + \definedummyword{sc}% + \definedummyword{t}% + % + \definedummyword{acronym}% + \definedummyword{cite}% + \definedummyword{code}% + \definedummyword{command}% + \definedummyword{dfn}% + \definedummyword{emph}% + \definedummyword{env}% + \definedummyword{file}% + \definedummyword{kbd}% + \definedummyword{key}% + \definedummyword{math}% + \definedummyword{option}% + \definedummyword{samp}% + \definedummyword{strong}% + \definedummyword{uref}% + \definedummyword{url}% + \definedummyword{var}% + \definedummyword{verb}% + \definedummyword{w}% + } +} % \indexnofonts is used when outputting the strings to sort the index % by, and when constructing control sequence names. It eliminates all % control sequences and just writes whatever the best ASCII sort string % would be for a given command (usually its argument). % -\def\indexdummylatex{LaTeX} -\def\indexdummytex{TeX} -\def\indexdummydots{...} -% \def\indexnofonts{% + \def\definedummyword##1{% + \expandafter\let\csname ##1\endcsname\asis + }% + \let\definedummyletter=\definedummyword + % + \commondummiesnofonts + % + % Don't no-op \tt, since it isn't a user-level command + % and is used in the definitions of the active chars like <, >, |, etc. + % Likewise with the other plain tex font commands. + %\let\tt=\asis + % \def\ { }% \def\@{@}% % how to handle braces? \def\_{\normalunderscore}% % - \let\,=\asis - \let\"=\asis - \let\`=\asis - \let\'=\asis - \let\^=\asis - \let\~=\asis - \let\==\asis - \let\u=\asis - \let\v=\asis - \let\H=\asis - \let\dotaccent=\asis - \let\ringaccent=\asis - \let\tieaccent=\asis - \let\ubaraccent=\asis - \let\udotaccent=\asis - \let\dotless=\asis - % - % Other non-English letters. + % Non-English letters. \def\AA{AA}% \def\AE{AE}% \def\L{L}% @@ -3207,40 +3209,9 @@ width0pt\relax} \fi \def\ordf{a}% \def\ordm{o}% % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis - % - % Texinfo font commands. - \let\b=\asis - \let\i=\asis - \let\r=\asis - \let\sc=\asis - \let\t=\asis - % - \let\LaTeX=\indexdummylatex - \let\TeX=\indexdummytex - \let\acronym=\asis - \let\cite=\asis - \let\code=\asis - \let\command=\asis - \let\dfn=\asis - \let\dots=\indexdummydots - \let\emph=\asis - \let\env=\asis - \let\file=\asis - \let\kbd=\asis - \let\key=\asis - \let\math=\asis - \let\option=\asis - \let\samp=\asis - \let\strong=\asis - \let\uref=\asis - \let\url=\asis - \let\var=\asis - \let\verb=\asis - \let\w=\asis + \def\LaTeX{LaTeX}% + \def\TeX{TeX}% + \def\dots{...}% } \let\indexbackslash=0 %overridden during \printindex. @@ -3288,7 +3259,7 @@ width0pt\relax} \fi % Remember, we are within a group. \indexdummies % Must do this here, since \bf, etc expand at this stage \escapechar=`\\ - \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now + \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now % so it will be output as is; and it will print as backslash. % % Process the index entry with all font commands turned off, to @@ -3447,7 +3418,7 @@ width0pt\relax} \fi % Index files are almost Texinfo source, but we use \ as the escape % character. It would be better to use @, but that's too big a change % to make right now. - \def\indexbackslash{\rawbackslashxx}% + \def\indexbackslash{\backslashcurfont}% \catcode`\\ = 0 \escapechar = `\\ \begindoublecolumns @@ -4742,17 +4713,36 @@ width0pt\relax} \fi \let\exdent=\nofillexdent } +% If you want all examples etc. small: @set dispenvsize small. +% If you want even small examples the full size: @set dispenvsize nosmall. +% This affects the following displayed environments: +% @example, @display, @format, @lisp +% +\def\smallword{small} +\def\nosmallword{nosmall} +\let\SETdispenvsize\relax +\def\setnormaldispenv{% + \ifx\SETdispenvsize\smallword + \smallexamplefonts \rm + \fi +} +\def\setsmalldispenv{% + \ifx\SETdispenvsize\nosmallword + \else + \smallexamplefonts \rm + \fi +} + % We often define two environments, @foo and @smallfoo. % Let's do it by one command: \def\makedispenv #1#2{ - \expandafter\envdef\csname#1\endcsname{#2} - \expandafter\envdef\csname small#1\endcsname - {\smallexamplefonts \rm #2} + \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2} + \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2} \expandafter\let\csname E#1\endcsname \afterenvbreak \expandafter\let\csname Esmall#1\endcsname \afterenvbreak } -% And there are often two synonyms: +% Define two synonyms: \def\maketwodispenvs #1#2#3{ \makedispenv{#1}{#3} \makedispenv{#2}{#3} @@ -4778,13 +4768,20 @@ width0pt\relax} \fi } % @format/@smallformat: same as @display except don't narrow margins. -% @flushleft (same as @format). (Note: @smallflushleft not documeted.) % -\maketwodispenvs {format}{flushleft}{% +\makedispenv{format}{% + \let\nonarrowing = t% + \nonfillstart + \gobble +} + +% @flushleft: same as @format, but doesn't obey \SETdispenvsize. +\envdef\flushleft{% \let\nonarrowing = t% \nonfillstart \gobble } +\let\Eflushleft = \afterenvbreak % @flushright. % @@ -5718,7 +5715,7 @@ width0pt\relax} \fi \pdfmkdest{#1}% \iflinks {% - \indexnofonts + \atdummies % preserve commands, but don't expand them \turnoffactive \otherbackslash \edef\writexrdef##1##2{% @@ -6103,8 +6100,8 @@ width0pt\relax} \fi \fi } -% This \insert replacements works for both \insert\footins{xx} and -% \insert\footins\bgroup xx\egroup, but it doesn't work for \insert27{xx}. +% This \insert replacements works for both \insert\footins{foo} and +% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. % \def\saveinsert#1{% \edef\next{\noexpand\savetobox \makeSAVEname#1}% @@ -6245,10 +6242,17 @@ width0pt\relax} \fi % xx should we indent the whole thing? center it? % \ifx\floattype\empty \else - % For now, assume the FLOATTYPE is entirely letters, so we just use it - % in a control sequence name literally. We want each FLOATTYPE to be - % numbered separately (Figure 1, Table 1, Figure 2, ...). - \expandafter\getfloatno\csname\floattype floatno\endcsname + {% + % the floattype might have accents or other special characters, + % but we need to use it in a control sequence name. + \indexnofonts + \turnoffactive + \xdef\safefloattype{\floattype}% + }% + % We want each FLOATTYPE to be numbered separately (Figure 1, + % Table 1, Figure 2, ...). + % + \expandafter\getfloatno\csname\safefloattype floatno\endcsname \global\advance\floatno by 1 % \ifx\floatlabel\empty \else @@ -6256,7 +6260,7 @@ width0pt\relax} \fi % This magic value for \thissection is output by \setref as the % XREFLABEL-title value. \xrefX uses it to distinguish float % labels (which have a completely different output format) from - % nodes and xref labels. + % node and anchor labels. % \let\thissection=\floatmagic \setref{\floatlabel}{Yfloat}% @@ -6288,7 +6292,7 @@ width0pt\relax} \fi \ifx\printedsomething\empty \vskip.5\parskip % space above caption \else - :\space % had a number, so print a colon. + :\space % had a number, so print a colon before the caption. \fi % % Print caption text. @@ -6642,15 +6646,15 @@ should work if nowhere else does.} \catcode`\@=0 -% \rawbackslashxx outputs one backslash character in current font, +% \backslashcurfont outputs one backslash character in current font, % as in \char`\\. -\global\chardef\rawbackslashxx=`\\ +\global\chardef\backslashcurfont=`\\ -% \rawbackslash defines an active \ to do \rawbackslashxx. +% \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with % catcode other. {\catcode`\\=\active - @gdef@rawbackslash{@let\=@rawbackslashxx} + @gdef@rawbackslash{@let\=@backslashcurfont} @gdef@otherbackslash{@let\=@realbackslash} } @@ -6658,7 +6662,7 @@ should work if nowhere else does.} {\catcode`\\=\other @gdef@realbackslash{\}} % \normalbackslash outputs one backslash in fixed width font. -\def\normalbackslash{{\tt\rawbackslashxx}} +\def\normalbackslash{{\tt\backslashcurfont}} \catcode`\\=\active diff --git a/m4/Makefile.in b/m4/Makefile.in index 8f480deac..6664937d1 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -35,7 +35,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_m4data_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \ @@ -211,6 +212,7 @@ CTAGS: distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../m4 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ |