[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/doc texinfo.tex,1.30,1.31
From: |
karl |
Subject: |
texinfo/doc texinfo.tex,1.30,1.31 |
Date: |
Sat, 14 Feb 2004 19:28:42 +0100 |
Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv3917
Modified Files:
texinfo.tex
Log Message:
(\addtokens): had two identical definitions,
remove one.
(\maketoks): no space token after |ENDTOKS|,
although I guess it hasn't mattered.
(\entry): make clear what is the argument to
\pdfgettoks and what is output.
(\appendtomacro): use our own token registers,
for safety.
(\listoffloatsdoentry): fully expand the page
number, and don't expand the lof text.
Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** texinfo.tex 13 Feb 2004 18:12:09 -0000 1.30
--- texinfo.tex 14 Feb 2004 18:28:39 -0000 1.31
***************
*** 4,8 ****
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2004-02-13.09}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2004-02-14.10}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 1323,1327 ****
\def\ppnn{\pgn=\first}
\def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
- \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
--- 1323,1326 ----
***************
*** 1345,1349 ****
\startlink attr{/Border [0 0 0]}%
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
- % #1
\endgroup}
\def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
--- 1344,1347 ----
***************
*** 1352,1356 ****
\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
\def\maketoks{%
! \expandafter\poptoks\the\toksA|ENDTOKS|
\ifx\first0\adn0
\else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
--- 1350,1354 ----
\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
\def\maketoks{%
! \expandafter\poptoks\the\toksA|ENDTOKS|\relax
\ifx\first0\adn0
\else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
***************
*** 3573,3577 ****
% \hbox ensues.
\ifpdf
! \pdfgettoks#1.\ \the\toksA
\else
\ #1%
--- 3571,3576 ----
% \hbox ensues.
\ifpdf
! \pdfgettoks#1.%
! \ \the\toksA
\else
\ #1%
***************
*** 6421,6430 ****
}
! % Append the tokens #2 to the macro #1, not expanding either.
%
\def\appendtomacro#1#2{%
! \toksA = \expandafter{#1}%
! \toksB = {#2}%
! \edef#1{\the\toksA \the\toksB}%
}
--- 6420,6431 ----
}
! % Append the tokens #2 to the definition of macro #1, not expanding either.
%
+ \newtoks\appendtomacroAtoks
+ \newtoks\appendtomacroBtoks
\def\appendtomacro#1#2{%
! \appendtomacroAtoks = \expandafter{#1}%
! \appendtomacroBtoks = {#2}%
! \edef#1{\the\appendtomacroAtoks \the\appendtomacroBtoks}%
}
***************
*** 6509,6516 ****
%
\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
! \def\listoffloatsdoentry#1-title\finish{%
! % use the same \entry we use for the TOC.
! \entry{\csname XR#1-lof\endcsname}{\csname XR#1-pg\endcsname}%
! }
\message{localization,}
--- 6510,6524 ----
%
\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
! \def\listoffloatsdoentry#1-title\finish{{%
! % Can't fully expand XR#1-lof because it can contain anything. Just
! % pass the control sequence. On the other hand, XR#1-pg is just the
! % page number, and we want to fully expand that so we can get a link
! % in pdf output.
! \toksA = \expandafter{\csname XR#1-lof\endcsname}%
! %
! % use the same \entry macro we use to generate the TOC and index.
! \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
! \writeentry
! }}
\message{localization,}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/doc texinfo.tex,1.30,1.31,
karl <=