[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: update third party files (HEAD)
|
From: |
Alexandre Duret-Lutz |
|
Subject: |
FYI: update third party files (HEAD) |
|
Date: |
Sun, 18 May 2003 10:37:17 +0200 |
|
User-agent: |
Gnus/5.090016 (Oort Gnus v0.16) Emacs/21.3 (gnu/linux) |
I'm installing this on HEAD.
2003-05-18 Alexandre Duret-Lutz <address@hidden>
* lib/Autom4te/XFile.pm, lib/config.guess, lib/config.sub,
lib/texinfo.tex: New upstream versions.
Index: lib/config.guess
===================================================================
RCS file: /cvs/automake/automake/lib/config.guess,v
retrieving revision 1.31
diff -u -r1.31 config.guess
--- lib/config.guess 18 Apr 2003 17:23:20 -0000 1.31
+++ lib/config.guess 18 May 2003 07:13:59 -0000
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-02-22'
+timestamp='2003-05-09'
# 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
@@ -744,7 +744,7 @@
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
- *:FreeBSD:*:*)
+ *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
# Determine whether the default compiler uses glibc.
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -1033,7 +1033,7 @@
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
Index: lib/config.sub
===================================================================
RCS file: /cvs/automake/automake/lib/config.sub,v
retrieving revision 1.168
diff -u -r1.168 config.sub
--- lib/config.sub 18 Apr 2003 17:23:20 -0000 1.168
+++ lib/config.sub 18 May 2003 07:14:00 -0000
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-02-22'
+timestamp='2003-05-09'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -372,6 +372,9 @@
am29k)
basic_machine=a29k-none
os=-bsd
+ ;;
+ amd64)
+ basic_machine=x86_64-pc
;;
amdahl)
basic_machine=580-amdahl
Index: lib/texinfo.tex
===================================================================
RCS file: /cvs/automake/automake/lib/texinfo.tex,v
retrieving revision 1.25
diff -u -r1.25 texinfo.tex
--- lib/texinfo.tex 23 Apr 2003 19:08:47 -0000 1.25
+++ lib/texinfo.tex 18 May 2003 07:14:10 -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-04-21.17}
+\def\texinfoversion{2003-05-04.08}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -34,12 +34,12 @@
% 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
% of date, so if that's what you're using, please check.
-%
+%
% Send bug reports to address@hidden Please include including a
% complete document in each bug report with which we can reproduce the
% problem. Patches are, of course, greatly appreciated.
@@ -55,7 +55,7 @@
% The extra TeX runs get the cross-reference information correct.
% Sometimes one run after texindex suffices, and sometimes you need more
% than two; texi2dvi does it as many times as necessary.
-%
+%
% 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.
@@ -205,7 +205,7 @@
% add check for \lastpenalty to plain's definitions. If the last thing
% we did was a \nobreak, we don't want to insert more space.
-%
+%
\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
\removelastskip\penalty-50\smallskip\fi\fi}
\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
@@ -570,7 +570,7 @@
% explicit \vfill so that the extra space is at the bottom. The
% threshold for doing this is if the group is more than \vfilllimit
% percent of a page (\vfilllimit can be changed inside of @tex).
-%
+%
\newbox\groupbox
\def\vfilllimit{0.7}
%
@@ -776,10 +776,10 @@
% @inmargin{TEXT [, RIGHT-TEXT]}
% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
% else use TEXT for both).
-%
+%
\def\inmargin#1{\parseinmargin #1,,\finish}
\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
- \setbox0 = \hbox{\ignorespaces #2}%
+ \setbox0 = \hbox{\ignorespaces #2}%
\ifdim\wd0 > 0pt
\def\lefttext{#1}% have both texts
\def\righttext{#2}%
@@ -850,7 +850,7 @@
% We'll use ems for NCHARS, close enough.
% NCHARS can also be the word `asis' or `none'.
% We cannot feasibly implement @paragraphindent asis, though.
-%
+%
\def\asisword{asis} % no translation, these are keywords
\def\noneword{none}
%
@@ -889,12 +889,12 @@
% If WORD is `none', then suppress indentation of the first paragraph
% after a section heading. If WORD is `insert', then do indentat such
% paragraphs.
-%
+%
% The paragraph indentation is suppressed or not by calling
% \suppressfirstparagraphindent, which the sectioning commands do. We
% switch the definition of this back and forth according to WORD. By
% default, we suppress indentation.
-%
+%
\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
\newdimen\currentparindent
%
@@ -915,10 +915,10 @@
% Here is how we actually suppress indentation. Redefine \everypar to
% \kern backwards by \parindent, and then reset itself to empty.
-%
+%
% We also make \indent itself not actually do anything until the next
% paragraph.
-%
+%
\gdef\dosuppressfirstparagraphindent{%
\gdef\indent{%
\global\let\indent=\ptexindent
@@ -940,14 +940,14 @@
% We don't use $'s directly in the definition of \math because we need
% to set catcodes according to plain TeX first, to allow for subscripts,
% superscripts, special math chars, etc.
-%
+%
\let\implicitmath = $%$ font-lock fix
%
% One complication: _ usually means subscripts, but it could also mean
% an actual _ character, as in @address@hidden + 1}. So make
% _ within @math be active (mathcode "8000), and distinguish by seeing
% if the current family is \slfam, which is what @var uses.
-%
+%
{\catcode\underChar = \active
\gdef\mathunderscore{%
\catcode\underChar=\active
@@ -958,7 +958,7 @@
% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
% this is not advertised and we don't care. Texinfo does not
% otherwise define @\.
-%
+%
% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
%
@@ -973,7 +973,7 @@
% Some active characters (such as <) are spaced differently in math.
% We have to reset their definitions in case the @math was an
% argument to a command which set the catcodes (such as @item or @section).
-%
+%
{
\catcode`^ = \active
\catcode`< = \active
@@ -1099,8 +1099,8 @@
\def\pdfmakeoutlines{{%
\openin 1 \jobname.toc
\ifeof 1\else\begingroup
- \closein 1
- % Thanh's hack / proper braces in bookmarks
+ \closein 1
+ % Thanh's hack / proper braces in bookmarks
\edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
\edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
%
@@ -1129,7 +1129,7 @@
\let\unnumbsubsubsecentry = \subsubsecentry
%
% Make special characters normal for writing to the pdf file.
- %
+ %
\indexnofonts
\let\tt=\relax
\turnoffactive
@@ -1144,7 +1144,7 @@
\let\nextmakelinks=\makelinks
\ifnum\lnkcount>0,\fi
\picknum{#1}%
- \startlink attr{/Border [0 0 0]}
+ \startlink attr{/Border [0 0 0]}
goto name{\pdfmkpgn{\the\pgn}}%
\linkcolor #1%
\advance\lnkcount by 1%
@@ -1199,7 +1199,7 @@
\ifx\first0\adn0
\else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
\else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
- \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+ \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
\else
\ifnum0=\countA\else\makelink\fi
\ifx\first.\let\next=\done\else
@@ -1453,12 +1453,12 @@
% 8.5x11=90+ smallbook=80 a4=90+ a5=77
% For me, subjectively, the few extra characters that fit aren't worth
% the additional smallness of 8pt. So I'm making the default 9pt.
-%
+%
% By the way, for comparison, here's what fits with @example (10pt):
% 8.5x11=71 smallbook=60 a4=75 a5=58
-%
+%
% I wish we used A4 paper on this side of the Atlantic.
-%
+%
% --karl, 24jan03.
@@ -1484,7 +1484,8 @@
% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
+ \ptexslash\fi\fi\fi}
\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
@@ -1507,7 +1508,7 @@
% Set sfcode to normal for the chars that usually have another value.
% Can't use plain's \frenchspacing because it uses the `\x notation, and
% sometimes \x has an active definition that messes things up.
-%
+%
address@hidden
\def\frenchspacing{%
\sfcode\dotChar address@hidden address@hidden address@hidden
@@ -1667,7 +1668,7 @@
% rms does not like angle brackets --karl, 17may97.
% So now @email is just like @uref, unless we are pdf.
-%
+%
%\def\email#1{\angleleft{\tt #1}\angleright}
\ifpdf
\def\email#1{\doemail#1,,\finish}
@@ -1716,7 +1717,7 @@
% we'd have to redo the font mechanism to change the \scriptstyle and
% \scriptscriptstyle font sizes to make it look right in headings.
% Adapted from the plain.tex definition of \copyright.
-%
+%
\def\registeredsymbol{%
$^{{\ooalign{\hfil\raise.07ex\hbox{$\scriptstyle\rm R$}\hfil\crcr\Orb}}%
}$%
@@ -2134,18 +2135,21 @@
\itemizey {#1}{\Eitemize}
}
-\def\itemizey #1#2{%
-\aboveenvbreak %
-\itemmax=\itemindent %
-\advance \itemmax by -\itemmargin %
-\advance \leftskip by \itemindent %
-\exdentamount=\itemindent
-\parindent = 0pt %
-\parskip = \smallskipamount %
-\ifdim \parskip=0pt \parskip=2pt \fi%
-\def#2{\endgraf\afterenvbreak\endgroup}%
-\def\itemcontents{#1}%
-\let\item=\itemizeitem}
+\def\itemizey#1#2{%
+ \aboveenvbreak
+ \itemmax=\itemindent
+ \advance\itemmax by -\itemmargin
+ \advance\leftskip by \itemindent
+ \exdentamount=\itemindent
+ \parindent=0pt
+ \parskip=\smallskipamount
+ \ifdim\parskip=0pt \parskip=2pt \fi
+ \def#2{\endgraf\afterenvbreak\endgroup}%
+ \def\itemcontents{#1}%
+ % @itemize with no arg is equivalent to @itemize @bullet.
+ \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
+ \let\item=\itemizeitem
+}
% \splitoff TOKENS\endmark defines \first to be the first token in
% TOKENS, and \rest to be the remainder.
@@ -2556,12 +2560,12 @@
% @deffn ...
% @end deffn
% @end ignore
-%
+%
% The @end deffn is going to get expanded, because we're trying to allow
% nested conditionals. But we don't want to expand the actual @deffn,
% since it might be syntactically correct and intended to be ignored.
% Since \end checks for \relax, using \empty does not cause an error.
-%
+%
\def\ignoremorecommands{%
\let\defcodeindex = \relax
\let\defcv = \empty
@@ -2966,10 +2970,10 @@
% @synindex foo bar makes index foo feed into index bar.
% Do this instead of @defindex foo if you don't want it as a separate index.
-%
+%
% @syncodeindex foo bar similar, but put all entries made for index foo
% inside @code.
-%
+%
\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
@@ -3011,13 +3015,13 @@
% Take care of Texinfo commands that can appear in an index entry.
% Since there are some commands we want to expand, and others we don't,
% we have to laboriously prevent expansion for those that we don't.
-%
+%
\def\indexdummies{%
address@hidden@}% change to @@ when we switch to @ as escape char in index
files.
\def\ {\realbackslash\space }%
% Need these in case \tex is in effect and \{ is a \delimiter again.
% But can't use \lbracecmd and \rbracecmd because texindex assumes
- % braces and backslashes are used only as delimiters.
+ % braces and backslashes are used only as delimiters.
\let\{ = \mylbrace
\let\} = \myrbrace
%
@@ -3026,14 +3030,14 @@
% words, not control letters, because the \space would be incorrect
% for control characters, but is needed to separate the control word
% from whatever follows.
- %
+ %
% For control letters, we have \definedummyletter, which omits the
% space.
- %
+ %
% These can be used both for control words that take an argument and
% those that do not. If it is followed by {arg} in the input, then
% that will dutifully get written to the index (or wherever).
- %
+ %
\def\definedummyword##1{%
\expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
}%
@@ -3046,9 +3050,9 @@
}
% For the aux file, @ is the escape character. So we want to redefine
-% everything using @ instead of \realbackslash. When everything uses
+% everything using @ instead of \realbackslash. When everything uses
% @, this will be simpler.
-%
+%
\def\atdummies{%
address@hidden@@}%
\def\ {@ }%
@@ -3069,7 +3073,7 @@
% Called from \indexdummies and \atdummies. \definedummyword and
% \definedummyletter must be defined first.
-%
+%
\def\commondummies{%
%
\normalturnoffactive
@@ -3389,6 +3393,7 @@
%
\smallfonts \rm
\tolerance = 9500
+ \everypar = {}% don't want the \kern\-parindent from indentation suppression.
\indexbreaks
%
% See if the index file exists and is nonempty.
@@ -3632,7 +3637,7 @@
\wd0=\hsize \wd2=\hsize
\hbox to\pagewidth{\box0\hfil\box2}%
}
-%
+%
% All done with double columns.
\def\enddoublecolumns{%
\output = {%
@@ -4423,7 +4428,7 @@
% @foo ... @end foo.
% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
-%
+%
% Since these characters are used in examples, it should be an even number of
% \tt widths. Each \tt character is 1en, so two makes it 1em.
%
@@ -4435,7 +4440,7 @@
% The @error{} command.
% Adapted from the TeXbook's \boxit.
-%
+%
\newbox\errorbox
%
{\tentt \global\dimen0 = 3em}% Width of the box.
@@ -4736,7 +4741,7 @@
% LaTeX-like @address@hidden verbatim and @verb{<char>...<char>}
-% If we want to allow any <char> as delimiter,
+% If we want to allow any <char> as delimiter,
% we need the curly braces so that makeinfo sees the @verb command, eg:
% address@hidden' would look like the '@verbx' command. address@hidden
%
@@ -4814,8 +4819,8 @@
\everypar{\starttabbox}%
}
-% Do the @verb magic: verbatim text is quoted by unique
-% delimiter characters. Before first delimiter expect a
+% Do the @verb magic: verbatim text is quoted by unique
+% delimiter characters. Before first delimiter expect a
% right brace, after last delimiter expect closing brace:
%
% \def\doverb'{'<char>#1<char>'}'{#1}
@@ -4834,7 +4839,7 @@
%
% address@hidden verbatim{#1}
%
-% For Texinfo it's a lot easier than for LaTeX,
+% For Texinfo it's a lot easier than for LaTeX,
% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
% we need not redefine '\', '{' and '}'.
%
@@ -4901,14 +4906,14 @@
% @copying ... @end copying.
% Save the text away for @insertcopying later. Many commands won't be
% allowed in this context, but that's ok.
-%
+%
% We save the uninterpreted tokens, rather than creating a box.
% Saving the text in a box would be much easier, but then all the
% typesetting commands (@smallbook, font changes, etc.) have to be done
% beforehand -- and a) we want @copying to be done first in the source
% file; b) letting users define the frontmatter in as flexible order as
% possible is very desirable.
-%
+%
\def\copying{\begingroup
% Define a command to swallow text until we reach address@hidden copying'.
% \ is the escape char in this texinfo.tex file, so it is the
@@ -4931,15 +4936,15 @@
% end-of-line to be a \par, as would happen with the normal active
% definition of ^^M. On the third hand, two ^^M's in a row should still
% generate a \par.
-%
+%
% Our approach is to make ^^M insert a space and a penalty1 normally;
% then it can also check if \lastpenalty=1. If it does, then manually
% do \par.
-%
+%
% 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.
@@ -4980,7 +4985,7 @@
\newcount\parencount
% We want ()&[] to print specially on the defun line.
-%
+%
\def\activeparens{%
\catcode`\(=\active \catcode`\)=\active
\catcode`\&=\active
@@ -5083,7 +5088,7 @@
% #1 is the \E... control sequence to end the definition (which we define).
% #2 is the \...x control sequence (which our caller defines).
% #3 is the control sequence to process the header, such as \defunheader.
-%
+%
\def\parsebodycommon#1#2#3{%
\begingroup\inENV
% If there are two @def commands in a row, we'll have a \nobreak,
@@ -5106,7 +5111,7 @@
}
% Common part of the \...x definitions.
-%
+%
\def\defxbodycommon{%
% As with \parsebodycommon above, allow line break if we have multiple
% x headers in a row. It's not a great place, though.
@@ -5157,7 +5162,7 @@
% to account for this both in the \...x definition and in parsing the
% input at hand. Thus also need a control sequence (passed as #5) for
% the \E... definition to assign the category name to.
-%
+%
\def\deftypeopparsebody#1#2#3#4#5 #6 {%
\parsebodycommon{#1}{#2}{#3}%
\def#2##1 ##2 ##3 {\def#4{##1}%
@@ -5262,7 +5267,7 @@
}
% This expands the args and terminates the paragraph they comprise.
-%
+%
\def\defunargs#1{\functionparens \sl
% Expand, preventing hyphenation at `-' chars.
% Note that groups don't affect changes in \hyphenchar.
@@ -5524,7 +5529,7 @@
% These definitions are used if you use @defunx (etc.)
% anywhere other than immediately after a @defun or @defunx.
-%
+%
\def\defcvx#1 address@hidden in invalid context}}
\def\deffnx#1 address@hidden in invalid context}}
\def\defivarx#1 address@hidden in invalid context}}
@@ -5696,7 +5701,7 @@
% Called by \do from \dounmacro on each macro. The idea is to omit any
% macro definitions that have been changed to \relax.
-%
+%
\def\unmacrodo#1{%
\ifx#1\relax
% remove this
@@ -5891,14 +5896,14 @@
% anchor), namely NAME-title (the corresponding @chapter/etc. name),
% NAME-pg (the page number), and NAME-snt (section number and type).
% Called from \foonoderef.
-%
+%
% We have to set \indexdummies so commands such as @code in a section
% title aren't expanded. It would be nicer not to expand the titles in
% the first place, but there's so many layers that that is hard to do.
%
% Likewise, use \turnoffactive so that punctuation chars such as underscore
% and backslash work in node names.
-%
+%
\def\setref#1#2{{%
\atdummies
\pdfmkdest{#1}%
@@ -5997,7 +6002,7 @@
% output. It's a separate macro only so it can be changed more easily,
% since not square brackets don't work in some documents. Particularly
% one that Bob is working on :).
-%
+%
\def\xrefprintnodename#1{[#1]}
% \dosetq is called from \setref to do the actual \write (\iflinks).
@@ -6014,7 +6019,7 @@
address@hidden #2\endcsname}}
% Things to be expanded by \internalsetq.
-%
+%
\def\Ypagenumber{\folio}
\def\Ytitle{\thissection}
\def\Ynothing{}
@@ -6206,7 +6211,7 @@
% In case the footnote comes at the end of a sentence, preserve the
% extra spacing after we do the footnote number.
address@hidden
- address@hidden/\fi
+ address@hidden
%
% Remove inadvertent blank space before typesetting the footnote number.
\unskip
@@ -6347,7 +6352,7 @@
\nobreak\bigskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
- % above and below.
+ % above and below.
\nobreak\vskip\parskip
\nobreak
\line\bgroup\hss
@@ -6435,7 +6440,7 @@
% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
% physical page width.
-%
+%
% We also call \setleading{\textleading}, so the caller should define
% \textleading. The caller should also set \parskip.
%
@@ -6503,7 +6508,7 @@
\parskip = 3pt plus 2pt minus 1pt
\textleading = 13.2pt
%
- % Double-side printing via postscript on Laserjet 4050
+ % Double-side printing via postscript on Laserjet 4050
% prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
% To change the settings for a different printer or situation, adjust
% \normaloffset until the front-side and back-side texts align. Then
@@ -6544,7 +6549,7 @@
\tableindent = 12mm
}}
-% A specific text layout, 24x15cm overall, intended for A4 paper.
+% A specific text layout, 24x15cm overall, intended for A4 paper.
\def\afourlatex{{\globaldefs = 1
\afourpaper
\internalpagesizes{237mm}{150mm}%
@@ -6720,7 +6725,7 @@
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
% the literal character `\'. (Thus, \ is not expandable when this is in
% effect.)
-%
+%
@address@hidden@turnoffactive @address@hidden
% Make _ and + \other characters, temporarily.
@@ -6749,7 +6754,7 @@
% Say @foo, not \foo, in error messages.
@escapechar = `@@
-% These look ok in all fonts, so just make them not special.
+% These look ok in all fonts, so just make them not special.
@catcode`@& = @other
@address@hidden = @other
@address@hidden = @other
Index: lib/Automake/XFile.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/XFile.pm,v
retrieving revision 1.3
diff -u -r1.3 XFile.pm
--- lib/Automake/XFile.pm 28 Jul 2002 18:14:38 -0000 1.3
+++ lib/Automake/XFile.pm 18 May 2003 07:14:10 -0000
@@ -1,4 +1,4 @@
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -63,9 +63,11 @@
=head1 DESCRIPTION
-C<Automake::XFile> inherits from C<IO::File>. It provides dying
-version of the methods C<open>, C<new>, and C<close>. It also overrides
-the C<getline> and C<getlines> methods to translate C<\r\n> to C<\n>.
+C<Automake::XFile> inherits from C<IO::File>. It provides the method
+C<name> returning the file name. It provides dying version of the
+methods C<close>, C<lock> (corresponding to C<flock>), C<new>,
+C<open>, C<seek>, and C<trunctate>. It also overrides the C<getline>
+and C<getlines> methods to translate C<\r\n> to C<\n>.
=head1 SEE ALSO
@@ -85,6 +87,7 @@
use strict;
use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
use Carp;
+use IO::File;
use File::Basename;
require Exporter;
@@ -92,18 +95,20 @@
@ISA = qw(IO::File Exporter DynaLoader);
-$VERSION = "1.1";
+$VERSION = "1.2";
@EXPORT = @IO::File::EXPORT;
eval {
- # Make all Fcntl O_XXX constants available for importing
- require Fcntl;
- my @O = grep /^O_/, @Fcntl::EXPORT;
- Fcntl->import(@O); # first we import what we want to export
- push(@EXPORT, @O);
+ # Make all Fcntl O_XXX and LOCK_XXX constants available for importing
+ require Fcntl;
+ my @O = grep /^(LOCK|O)_/, @Fcntl::EXPORT, @Fcntl::EXPORT_OK;
+ Fcntl->import (@O); # first we import what we want to export
+ push (@EXPORT, @O);
};
+# Used in croak error messages.
+my $me = basename ($0);
################################################
## Constructor
@@ -138,7 +143,6 @@
if (!$fh->SUPER::open (@_))
{
- my $me = basename ($0);
croak "$me: cannot open $file: $!\n";
}
@@ -158,8 +162,7 @@
my ($fh) = shift;
if (!$fh->SUPER::close (@_))
{
- my $me = basename ($0);
- my $file = ${*$fh}{'autom4te_xfile_file'};
+ my $file = $fh->name;
croak "$me: cannot close $file: $!\n";
}
}
@@ -172,11 +175,11 @@
# so we do that here.
sub getline
{
- local $_ = $_[0]->SUPER::getline;
- # Perform a _global_ replacement: $_ may can contains many lines
- # in slurp mode ($/ = undef).
- s/\015\012/\n/gs if defined $_;
- return $_;
+ local $_ = $_[0]->SUPER::getline;
+ # Perform a _global_ replacement: $_ may can contains many lines
+ # in slurp mode ($/ = undef).
+ s/\015\012/\n/gs if defined $_;
+ return $_;
}
################################################
@@ -185,10 +188,64 @@
sub getlines
{
- my @res = ();
- my $line;
- push @res, $line while $line = $_[0]->getline;
- return @res;
+ my @res = ();
+ my $line;
+ push @res, $line while $line = $_[0]->getline;
+ return @res;
+}
+
+################################################
+## Name
+##
+
+sub name
+{
+ my ($fh) = shift;
+ return ${*$fh}{'autom4te_xfile_file'};
+}
+
+################################################
+## Lock
+##
+
+sub lock
+{
+ my ($fh, $mode) = @_;
+ # Cannot use @_ here.
+ if (!flock ($fh, $mode))
+ {
+ my $file = $fh->name;
+ croak "$me: cannot lock $file with mode $mode: $!\n";
+ }
+}
+
+################################################
+## Seek
+##
+
+sub seek
+{
+ my ($fh) = shift;
+ # Cannot use @_ here.
+ if (!seek ($fh, $_[0], $_[1]))
+ {
+ my $file = $fh->name;
+ croak "$me: cannot rewind $file with @_: $!\n";
+ }
+}
+
+################################################
+## Truncate
+##
+
+sub truncate
+{
+ my ($fh, $len) = @_;
+ if (!truncate ($fh, $len))
+ {
+ my $file = $fh->name;
+ croak "$me: cannot truncate $file at $len: $!\n";
+ }
}
1;
--
Alexandre Duret-Lutz
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: update third party files (HEAD),
Alexandre Duret-Lutz <=