[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Aug 15 11:22:01 EDT 2005)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon Aug 15 11:22:01 EDT 2005) |
|
Date: |
Mon, 15 Aug 2005 11:22:05 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.529
retrieving revision 1.530
diff -c -r1.529 -r1.530
*** ChangeLog 15 Aug 2005 13:05:23 -0000 1.529
--- ChangeLog 15 Aug 2005 15:17:06 -0000 1.530
***************
*** 1,3 ****
--- 1,27 ----
+ 2005-08-15 Stepan Kasal <address@hidden>
+
+ * doc/texinfo.tex (\normalturnoffactive): Now contains the body of
+ \turnoffactive. Don't explicitly restore the original value of active \
+ ---just let it be.
+ (\turnoffactive): Can now be redefined as \normalturnoffactive
+ \otherbackslash.
+ (\atdummies): All calls were followed by \turnoffactive; remove that
+ and add \otherbackslash to the definition, since it already calls
+ \normalturnoffactive indirectly.
+ (\xrefX): One of the calls of \refx missed the second parameter;
+ fix that.
+ (\commondummiesnofonts): No need to make ~ other for the definition;
+ it contains only \~ now.
+ (\backChar, \plusChar, \underChar): Nuke.
+ (\colonChar, \commaChar, \dotChar, \exclamChar, \questChar, \semiChar):
+ Move just before the definition of ...
+ (\plainfrenchspacing): ... since it's the only place where it's used.
+ (\activebackslash): Remove both definitions; the first one was shadowed
+ by the second one; and the second one can easily be eliminated; it
+ was used only on one place.
+ (\backslashlparen): No need for this; \realbackslash( is enough.
+ (\backslashrparen): Likewise.
+
2005-08-14 Per Bothner <address@hidden>
* makeinfo/index.c (cm_printindex): Don't defer index if docbook,
***************
*** 13,19 ****
2005-08-13 Karl Berry <address@hidden>
* doc/texinfo.tex (\writetocentry, ...): restore calls to
! \turnoffactive after \atdummies removed in the July 1 change (v.193).
\turnoffactive and \normalturnoffactive are not the same -- we need
actual backslash characters in the pdf destinations and .aux and
index files, not expansions. (I'm not sure we ever need
--- 37,43 ----
2005-08-13 Karl Berry <address@hidden>
* doc/texinfo.tex (\writetocentry, ...): restore calls to
! \turnoffactive after \atdummies removed in the July 1 change (v.194).
\turnoffactive and \normalturnoffactive are not the same -- we need
actual backslash characters in the pdf destinations and .aux and
index files, not expansions. (I'm not sure we ever need
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.200
retrieving revision 1.201
diff -c -r1.200 -r1.201
*** doc/texinfo.tex 13 Aug 2005 15:58:08 -0000 1.200
--- doc/texinfo.tex 15 Aug 2005 15:17:06 -0000 1.201
***************
*** 3,9 ****
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2005-08-13.08}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
--- 3,9 ----
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2005-08-15.08}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 153,179 ****
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
! % In some macros, we cannot use the `\? notation---the left quote is
! % in some cases the escape char.
! \chardef\backChar = `\\
! \chardef\colonChar = `\:
! \chardef\commaChar = `\,
! \chardef\dotChar = `\.
! \chardef\exclamChar= `\!
! \chardef\plusChar = `\+
! \chardef\questChar = `\?
! \chardef\semiChar = `\;
! \chardef\underChar = `\_
!
! \chardef\spaceChar = `\ %
\chardef\spacecat = 10
! \def\spaceisspace{\catcode\spaceChar=\spacecat}
!
! {% for help with debugging.
! % example usage: \expandafter\show\activebackslash
! \catcode`\! = 0 \catcode`\\ = \active
! !global!def!activebackslash{\}
! }
% Ignore a token.
%
--- 153,161 ----
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
! % Since the category of space is not known, we have to be careful.
\chardef\spacecat = 10
! \def\spaceisspace{\catcode`\ =\spacecat}
% Ignore a token.
%
***************
*** 1051,1059 ****
% _ active, and distinguish by seeing if the current family is \slfam,
% which is what @var uses.
{
! \catcode\underChar = \active
\gdef\mathunderscore{%
! \catcode\underChar=\active
\def_{\ifnum\fam=\slfam \_\else\sb\fi}%
}
}
--- 1033,1041 ----
% _ active, and distinguish by seeing if the current family is \slfam,
% which is what @var uses.
{
! \catcode`\_ = \active
\gdef\mathunderscore{%
! \catcode`\_=\active
\def_{\ifnum\fam=\slfam \_\else\sb\fi}%
}
}
***************
*** 1197,1217 ****
\fi
\fi
! % PDF uses PostScript string constants for the names of xref targets, to
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
% interpreted as a newline (\n), followed by o, d, e. Not good.
% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
% (and related messages, the final outcome is that it is up to the TeX
% user to double the backslashes and otherwise make the string valid, so
! % that's we do).
% double active backslashes.
%
address@hidden \catcode`\\=\active
- @address@hidden@address@hidden@active @otherbackslash}
@address@hidden
! @address@hidden@active
@address@hidden
}
--- 1179,1198 ----
\fi
\fi
! % PDF uses PostScript string constants for the names of xref targets,
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
% interpreted as a newline (\n), followed by o, d, e. Not good.
% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
% (and related messages, the final outcome is that it is up to the TeX
% user to double the backslashes and otherwise make the string valid, so
! % that's what we do).
% double active backslashes.
%
address@hidden \catcode`\\=\active
@address@hidden
! @address@hidden@active
@address@hidden
}
***************
*** 1243,1255 ****
\def\backslashparens#1{%
\xdef#1{#1}% redefine it as its expansion; the definition is simply
% \lastnode when called from \setref -> \pdfmkdest.
! \HyPsdSubst{(}{\backslashlparen}{#1}%
! \HyPsdSubst{)}{\backslashrparen}{#1}%
! }
!
! {\catcode\exclamChar = 0 \catcode\backChar = \other
! !gdef!backslashlparen{\(}%
! !gdef!backslashrparen{\)}%
}
\ifpdf
--- 1224,1231 ----
\def\backslashparens#1{%
\xdef#1{#1}% redefine it as its expansion; the definition is simply
% \lastnode when called from \setref -> \pdfmkdest.
! \HyPsdSubst{(}{\realbackslash(}{#1}%
! \HyPsdSubst{)}{\realbackslash)}{#1}%
}
\ifpdf
***************
*** 1279,1285 ****
% We have to set dummies so commands such as @code, and characters
% such as \, aren't expanded when present in a section title.
\atdummies
- \turnoffactive
\activebackslashdouble
\def\pdfdestname{#1}%
\backslashparens\pdfdestname
--- 1255,1260 ----
***************
*** 1391,1397 ****
% now, I guess we'll just let the pdf reader have its way.
\indexnofonts
\setupdatafile
! \activebackslash
\input \jobname.toc
\endgroup
}
--- 1366,1372 ----
% now, I guess we'll just let the pdf reader have its way.
\indexnofonts
\setupdatafile
! \catcode`\\=\active \otherbackslash
\input \jobname.toc
\endgroup
}
***************
*** 1811,1816 ****
--- 1786,1798 ----
% Can't use plain's \frenchspacing because it uses the `\x notation, and
% sometimes \x has an active definition that messes things up.
%
+ \chardef\colonChar = `\:
+ \chardef\commaChar = `\,
+ \chardef\dotChar = `\.
+ \chardef\exclamChar= `\!
+ \chardef\questChar = `\?
+ \chardef\semiChar = `\;
+ %
address@hidden
\def\plainfrenchspacing{%
\sfcode\dotChar address@hidden address@hidden address@hidden
***************
*** 3245,3250 ****
--- 3227,3233 ----
%
% Do the redefinitions.
\commondummies
+ \otherbackslash
}
% Called from \indexdummies and \atdummies.
***************
*** 3331,3396 ****
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
%
! % Better have this without active chars.
! {
! \catcode`\~=\other
! \gdef\commondummiesnofonts{%
! % Control letters and accents.
! \definedummyletter\!%
! \definedummyaccent\"%
! \definedummyaccent\'%
! \definedummyletter\*%
! \definedummyaccent\,%
! \definedummyletter\.%
! \definedummyletter\/%
! \definedummyletter\:%
! \definedummyaccent\=%
! \definedummyletter\?%
! \definedummyaccent\^%
! \definedummyaccent\`%
! \definedummyaccent\~%
! \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
! %
! % Commands that take arguments.
! \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\pxref
! \definedummyword\ref
! \definedummyword\samp
! \definedummyword\strong
! \definedummyword\tie
! \definedummyword\uref
! \definedummyword\url
! \definedummyword\var
! \definedummyword\verb
! \definedummyword\w
! \definedummyword\xref
! }
}
% \indexnofonts is used when outputting the strings to sort the index
--- 3314,3375 ----
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
%
! \def\commondummiesnofonts{%
! % Control letters and accents.
! \definedummyletter\!%
! \definedummyaccent\"%
! \definedummyaccent\'%
! \definedummyletter\*%
! \definedummyaccent\,%
! \definedummyletter\.%
! \definedummyletter\/%
! \definedummyletter\:%
! \definedummyaccent\=%
! \definedummyletter\?%
! \definedummyaccent\^%
! \definedummyaccent\`%
! \definedummyaccent\~%
! \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
! %
! % Commands that take arguments.
! \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\pxref
! \definedummyword\ref
! \definedummyword\samp
! \definedummyword\strong
! \definedummyword\tie
! \definedummyword\uref
! \definedummyword\url
! \definedummyword\var
! \definedummyword\verb
! \definedummyword\w
! \definedummyword\xref
}
% \indexnofonts is used when outputting the strings to sort the index
***************
*** 4573,4579 ****
%
\iflinks
{\atdummies
- \turnoffactive
\edef\temp{%
address@hidden
\temp
--- 4552,4557 ----
***************
*** 6006,6012 ****
\iflinks
{%
\atdummies % preserve commands, but don't expand them
- \turnoffactive
\edef\writexrdef##1##2{%
address@hidden #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
--- 5984,5989 ----
***************
*** 6091,6097 ****
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
\ifdim\wd0 = 0pt
! \refx{#1-snt}%
\else
\printedrefname
\fi
--- 6068,6074 ----
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
\ifdim\wd0 = 0pt
! \refx{#1-snt}{}%
\else
\printedrefname
\fi
***************
*** 6675,6681 ****
% caption if specified, else the full caption if specified, else
nothing.
{%
\atdummies
- \turnoffactive
%
% since we read the caption text in the macro world, where ^^M
% is turned into a normal character, we have to scan it back, so
--- 6652,6657 ----
***************
*** 7126,7131 ****
--- 7102,7130 ----
% \otherifyactive is called near the end of this file.
\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
+ % Same as @turnoffactive below, but backslash retains it's normal definition.
+ % (Before 2004-08-15, this macro explicitly assigned @address@hidden,
+ % but it doesn't seem to be necessary. --kasal)
+ \def\normalturnoffactive{%
+ \let"=\normaldoublequote
+ \let~=\normaltilde
+ \let^=\normalcaret
+ \let_=\normalunderscore
+ \let|=\normalverticalbar
+ \let<=\normalless
+ \let>=\normalgreater
+ \let+=\normalplus
+ \let$=\normaldollar %$ font-lock fix
+ \unsepspaces
+ }
+
+ % Used sometimes to turn off (effectively) the active characters even after
+ % parsing them.
+ \def\turnoffactive{%
+ \normalturnoffactive
+ \otherbackslash
+ }
+
address@hidden
% \backslashcurfont outputs one backslash character in current font,
***************
*** 7133,7176 ****
\global\chardef\backslashcurfont=`\\
\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
- % \rawbackslash defines an active \ to do \backslashcurfont.
- % \otherbackslash defines an active \ to be a literal `\' character with
- % catcode other.
- {\catcode`\\=\active
- @address@hidden@address@hidden
- @address@hidden@address@hidden
- }
-
% \realbackslash is an actual character `\' with catcode other, and
% \doublebackslash is two of them (for the pdf outlines).
{\catcode`\\=\other @address@hidden @address@hidden
! % \normalbackslash outputs one backslash in fixed width font.
! \def\normalbackslash{{\tt\backslashcurfont}}
!
\catcode`\\=\active
! % Used sometimes to turn off (effectively) the active characters
! % even after parsing them.
! @address@hidden
! @let"address@hidden
! @address@hidden
! @address@hidden
! @address@hidden
! @address@hidden
! @let|address@hidden
! @let<address@hidden
! @let>address@hidden
! @address@hidden
! @address@hidden %$ font-lock fix
! @unsepspaces
! }
!
! % 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.
% This is canceled by @fixbackslash.
--- 7132,7153 ----
\global\chardef\backslashcurfont=`\\
\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
% \realbackslash is an actual character `\' with catcode other, and
% \doublebackslash is two of them (for the pdf outlines).
{\catcode`\\=\other @address@hidden @address@hidden
! % In texinfo, backslash is an active character; it prints the backslash
! % in fixed width font.
\catcode`\\=\active
+ @address@hidden@address@hidden
+ % On startup, @fixbackslash assigns:
+ % @let \ = @normalbackslash
! % \rawbackslash defines an active \ to do \backslashcurfont.
! % \otherbackslash defines an active \ to be a literal `\' character with
! % catcode other.
! @address@hidden@address@hidden
! @address@hidden@address@hidden
% Make _ and + \other characters, temporarily.
% This is canceled by @fixbackslash.
***************
*** 7184,7190 ****
@address@hidden = @eatinput
% On the other hand, perhaps the file did not have a `\input texinfo'. Then
! % the first `\{ in the file would cause an error. This macro tries to fix
% that, assuming it is called before the first `\' could plausibly occur.
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
--- 7161,7167 ----
@address@hidden = @eatinput
% On the other hand, perhaps the file did not have a `\input texinfo'. Then
! % the first `\' in the file would cause an error. This macro tries to fix
% that, assuming it is called before the first `\' could plausibly occur.
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
P ChangeLog
P doc/texinfo.tex
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Aug 15 11:22:01 EDT 2005),
Karl Berry <=