[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Fri Jul 1 12:22:01 EDT 2005)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Fri Jul 1 12:22:01 EDT 2005) |
|
Date: |
Fri, 01 Jul 2005 12:22:08 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.516
retrieving revision 1.517
diff -c -r1.516 -r1.517
*** ChangeLog 1 Jul 2005 06:26:47 -0000 1.516
--- ChangeLog 1 Jul 2005 16:17:13 -0000 1.517
***************
*** 1,5 ****
--- 1,25 ----
2005-07-01 Stepan Kasal <address@hidden>
+ * doc/texinfo.tex: Remove all occurences of \normalturnoffactive or
+ \turnoffactive attached to \indexdummies or \atdummies, since they
+ are redundant; \indexdummies and \atdummies both call \commondummies,
+ which calls \normalturnoffactive, which calls \turnoffactive.
+ (\indexdummies, \atdummies): Move the definitions of \definedummy* ...
+ (\commondummies): ... here; they now take a control sequence as their
+ parameter; all callers fixed.
+ (\indexnofonts): Fixed the definitions of \definedummy* macros.
+ (\indexdummies): Define \escapechar = `\\ ...
+ (\onepageout): ... thus remove it from here.
+ (\macrolist): Now has the form of \definedummyword\macro1... It also
+ gathers user-defined aliases, so there is ...
+ (\addtomacrolist): ... a new macro ...
+ (\macroxxx, \aliasyyy): ... caled from these two.
+ (\unmacro, \unmacrodo): Adapted to the new form of \macrolist.
+ (\turnoffmacros, \emptyusermacros): Removed, mere \macrolist is enough
+ now.
+
+ 2005-07-01 Stepan Kasal <address@hidden>
+
* doc/texinfo.tex (\nonarrowing): Update the description.
(\cartouche): Set \nonarrowing to "t", not \comment.
(\nonfillstart, \quotation): Reset \nonarrowing.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.193
retrieving revision 1.194
diff -c -r1.193 -r1.194
*** doc/texinfo.tex 1 Jul 2005 13:12:01 -0000 1.193
--- doc/texinfo.tex 1 Jul 2005 16:17:13 -0000 1.194
***************
*** 3,9 ****
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2005-07-01.06}
%
% 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-07-01.11}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 310,319 ****
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \escapechar = `\\ % use backslash in output files.
\indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
--- 310,316 ----
***************
*** 364,370 ****
\egroup % \vbox from first cropmarks clause
\fi
}% end of \shipout\vbox
! }% end of group with \normalturnoffactive
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
--- 361,367 ----
\egroup % \vbox from first cropmarks clause
\fi
}% end of \shipout\vbox
! }% end of group with \indexdummies
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
***************
*** 1282,1288 ****
% 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
--- 1279,1284 ----
***************
*** 3222,3227 ****
--- 3218,3224 ----
% we have to laboriously prevent expansion for those that we don't.
%
\def\indexdummies{%
+ \escapechar = `\\ % use backslash in output files.
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.
***************
*** 3230,3256 ****
\let\{ = \mylbrace
\let\} = \myrbrace
%
- % \definedummyword defines \#1 as \realbackslash #1\space, thus
- % effectively preventing its expansion. This is used only for control
- % 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}%
- }%
- \def\definedummyletter##1{%
- \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
- }%
- \let\definedummyaccent\definedummyletter
- %
% Do the redefinitions.
\commondummies
}
--- 3227,3232 ----
***************
*** 3266,3341 ****
\let\{ = \lbraceatcmd
\let\} = \rbraceatcmd
%
- % (See comments in \indexdummies.)
- \def\definedummyword##1{%
- \expandafter\def\csname address@hidden
- }%
- \def\definedummyletter##1{%
- \expandafter\def\csname address@hidden
- }%
- \let\definedummyaccent\definedummyletter
- %
% Do the redefinitions.
\commondummies
}
! % Called from \indexdummies and \atdummies. \definedummyword and
! % \definedummyletter must be defined first.
%
\def\commondummies{%
- %
\normalturnoffactive
%
\commondummiesnofonts
%
! \definedummyletter{_}%
%
% Non-English letters.
! \definedummyword{AA}%
! \definedummyword{AE}%
! \definedummyword{L}%
! \definedummyword{OE}%
! \definedummyword{O}%
! \definedummyword{aa}%
! \definedummyword{ae}%
! \definedummyword{l}%
! \definedummyword{oe}%
! \definedummyword{o}%
! \definedummyword{ss}%
! \definedummyword{exclamdown}%
! \definedummyword{questiondown}%
! \definedummyword{ordf}%
! \definedummyword{ordm}%
%
% Although these internal commands shouldn't show up, sometimes they do.
! \definedummyword{bf}%
! \definedummyword{gtr}%
! \definedummyword{hat}%
! \definedummyword{less}%
! \definedummyword{sf}%
! \definedummyword{sl}%
! \definedummyword{tclose}%
! \definedummyword{tt}%
%
! \definedummyword{LaTeX}%
! \definedummyword{TeX}%
%
% Assorted special characters.
! \definedummyword{bullet}%
! \definedummyword{comma}%
! \definedummyword{copyright}%
! \definedummyword{registeredsymbol}%
! \definedummyword{dots}%
! \definedummyword{enddots}%
! \definedummyword{equiv}%
! \definedummyword{error}%
! \definedummyword{euro}%
! \definedummyword{expansion}%
! \definedummyword{minus}%
! \definedummyword{pounds}%
! \definedummyword{point}%
! \definedummyword{print}%
! \definedummyword{result}%
%
% Handle some cases of @value -- where it does not contain any
% (non-fully-expandable) commands.
--- 3242,3323 ----
\let\{ = \lbraceatcmd
\let\} = \rbraceatcmd
%
% Do the redefinitions.
\commondummies
}
! % Called from \indexdummies and \atdummies.
%
\def\commondummies{%
\normalturnoffactive
%
+ % \definedummyword defines \#1 as \string\#1\space, thus effectively
+ % preventing its expansion. This is used only for control% 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{\def##1{\string##1\space}}%
+ \def\definedummyletter##1{\def##1{\string##1}}%
+ \let\definedummyaccent\definedummyletter
+ %
\commondummiesnofonts
%
! \definedummyletter\_%
%
% Non-English letters.
! \definedummyword\AA
! \definedummyword\AE
! \definedummyword\L
! \definedummyword\OE
! \definedummyword\O
! \definedummyword\aa
! \definedummyword\ae
! \definedummyword\l
! \definedummyword\oe
! \definedummyword\o
! \definedummyword\ss
! \definedummyword\exclamdown
! \definedummyword\questiondown
! \definedummyword\ordf
! \definedummyword\ordm
%
% Although these internal commands shouldn't show up, sometimes they do.
! \definedummyword\bf
! \definedummyword\gtr
! \definedummyword\hat
! \definedummyword\less
! \definedummyword\sf
! \definedummyword\sl
! \definedummyword\tclose
! \definedummyword\tt
%
! \definedummyword\LaTeX
! \definedummyword\TeX
%
% Assorted special characters.
! \definedummyword\bullet
! \definedummyword\comma
! \definedummyword\copyright
! \definedummyword\registeredsymbol
! \definedummyword\dots
! \definedummyword\enddots
! \definedummyword\equiv
! \definedummyword\error
! \definedummyword\euro
! \definedummyword\expansion
! \definedummyword\minus
! \definedummyword\pounds
! \definedummyword\point
! \definedummyword\print
! \definedummyword\result
%
% Handle some cases of @value -- where it does not contain any
% (non-fully-expandable) commands.
***************
*** 3344,3351 ****
% Normal spaces, not active ones.
\unsepspaces
%
! % No macro expansion.
! \turnoffmacros
}
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
--- 3326,3333 ----
% Normal spaces, not active ones.
\unsepspaces
%
! % We want to disable all macros so that they are not expanded by \write.
! \macrolist
}
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
***************
*** 3355,3411 ****
\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{samp}%
! \definedummyword{strong}%
! \definedummyword{tie}%
! \definedummyword{uref}%
! \definedummyword{url}%
! \definedummyword{var}%
! \definedummyword{verb}%
! \definedummyword{w}%
}
}
--- 3337,3393 ----
\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\samp
! \definedummyword\strong
! \definedummyword\tie
! \definedummyword\uref
! \definedummyword\url
! \definedummyword\var
! \definedummyword\verb
! \definedummyword\w
}
}
***************
*** 3416,3428 ****
%
\def\indexnofonts{%
% Accent commands should become @asis.
! \def\definedummyaccent##1{%
! \expandafter\let\csname ##1\endcsname\asis
! }%
% We can just ignore other control letters.
! \def\definedummyletter##1{%
! \expandafter\def\csname ##1\endcsname{}%
! }%
% Hopefully, all control words can become @asis.
\let\definedummyword\definedummyaccent
%
--- 3398,3406 ----
%
\def\indexnofonts{%
% Accent commands should become @asis.
! \def\definedummyaccent##1{\let##1\asis}%
% We can just ignore other control letters.
! \def\definedummyletter##1{\let##1\empty}%
% Hopefully, all control words can become @asis.
\let\definedummyword\definedummyaccent
%
***************
*** 3476,3483 ****
\def\print{-|}%
\def\result{=>}%
%
! % Don't write macro names.
! \emptyusermacros
}
\let\indexbackslash=0 %overridden during \printindex.
--- 3454,3470 ----
\def\print{-|}%
\def\result{=>}%
%
! % We need to get rid of all macros, leaving only the arguments (if present).
! % Of course this is not nearly correct, but it is the best we can do for
now.
! % makeinfo does not expand macros in the argument to @deffn, which ends up
! % writing an index entry, and texindex isn't prepared for an index sort
entry
! % that starts with \.
! %
! % Since macro invocations are followed by braces, we can just redefine them
! % to take a single TeX argument. The case of a macro invocation that
! % goes to end-of-line is not handled.
! %
! \macrolist
}
\let\indexbackslash=0 %overridden during \printindex.
***************
*** 3524,3530 ****
%
% Remember, we are within a group.
\indexdummies % Must do this here, since \bf, etc expand at this stage
- \escapechar=`\\
\def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
% so it will be output as is; and it will print as backslash.
%
--- 3511,3516 ----
***************
*** 4584,4590 ****
\fi
%
\iflinks
! {\atdummies \turnoffactive
\edef\temp{%
address@hidden
\temp
--- 4570,4576 ----
\fi
%
\iflinks
! {\atdummies
\edef\temp{%
address@hidden
\temp
***************
*** 5680,5687 ****
\newcount\paramno % Count of parameters
\newtoks\macname % Macro name
\newif\ifrecursive % Is it recursive?
! \def\macrolist{} % List of all defined macros in the form
! % \do\macro1\do\macro2...
% Utility routines.
% This does \let #1 = #2, with \csnames; that is,
--- 5666,5684 ----
\newcount\paramno % Count of parameters
\newtoks\macname % Macro name
\newif\ifrecursive % Is it recursive?
!
! % List of all defined macros in the form
! % \definedummyword\macro1\definedummyword\macro2...
! % Currently is also contains all @aliases; the list can be split
! % if there is a need.
! \def\macrolist{}
!
! % Add the macro to \macrolist
! \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
! \def\addtomacrolistxxx#1{%
! \toks0 = \expandafter{\macrolist\definedummyword#1}%
! \xdef\macrolist{\the\toks0}%
! }
% Utility routines.
% This does \let #1 = #2, with \csnames; that is,
***************
*** 5779,5788 ****
\else \errmessage{Macro name \the\macname\space already defined}\fi
\global\cslet{macsave.\the\macname}{\the\macname}%
\global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
! % Add the macroname to \macrolist
! \toks0 = \expandafter{\macrolist\do}%
! \xdef\macrolist{\the\toks0
! \expandafter\noexpand\csname\the\macname\endcsname}%
\fi
\begingroup \macrobodyctxt
\ifrecursive \expandafter\parsermacbody
--- 5776,5782 ----
\else \errmessage{Macro name \the\macname\space already defined}\fi
\global\cslet{macsave.\the\macname}{\the\macname}%
\global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
! \addtomacrolist{\the\macname}%
\fi
\begingroup \macrobodyctxt
\ifrecursive \expandafter\parsermacbody
***************
*** 5796,5802 ****
% Remove the macro name from \macrolist:
\begingroup
\expandafter\let\csname#1\endcsname \relax
! \let\do\unmacrodo
\xdef\macrolist{\macrolist}%
\endgroup
\else
--- 5790,5796 ----
% Remove the macro name from \macrolist:
\begingroup
\expandafter\let\csname#1\endcsname \relax
! \let\definedummyword\unmacrodo
\xdef\macrolist{\macrolist}%
\endgroup
\else
***************
*** 5808,5817 ****
% macro definitions that have been changed to \relax.
%
\def\unmacrodo#1{%
! \ifx#1\relax
% remove this
\else
! \noexpand\do \noexpand #1%
\fi
}
--- 5802,5811 ----
% macro definitions that have been changed to \relax.
%
\def\unmacrodo#1{%
! \ifx #1\relax
% remove this
\else
! \noexpand\definedummyword \noexpand#1%
\fi
}
***************
*** 5930,5954 ****
\expandafter\parsearg
\fi \next}
- % We want to disable all macros during \shipout so that they are not
- % expanded by \write.
- \def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
- \edef\next{\macrolist}\expandafter\endgroup\next}
-
- % For \indexnofonts, we need to get rid of all macros, leaving only the
- % arguments (if present). Of course this is not nearly correct, but it
- % is the best we can do for now. makeinfo does not expand macros in the
- % argument to @deffn, which ends up writing an index entry, and texindex
- % isn't prepared for an index sort entry that starts with \.
- %
- % Since macro invocations are followed by braces, we can just redefine them
- % to take a single TeX argument. The case of a macro invocation that
- % goes to end-of-line is not handled.
- %
- \def\emptyusermacros{\begingroup
- \def\do##1{\let\noexpand##1=\noexpand\asis}%
- \edef\next{\macrolist}\expandafter\endgroup\next}
-
% @alias.
% We need some trickery to remove the optional spaces around the equal
--- 5924,5929 ----
***************
*** 5958,5963 ****
--- 5933,5939 ----
\def\aliasyyy #1=#2\relax{%
{%
\expandafter\let\obeyedspace=\empty
+ \addtomacrolist{#1}%
\xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
}%
\next
***************
*** 6027,6033 ****
\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
--- 6003,6008 ----
***************
*** 6695,6701 ****
% \floatlabel-lof. Besides \floatident, we include the short
% 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
% we don't write the literal three characters "^^M" into the aux file.
--- 6670,6676 ----
% \floatlabel-lof. Besides \floatident, we include the short
% caption if specified, else the full caption if specified, else
nothing.
{%
! \atdummies
% 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
% we don't write the literal three characters "^^M" into the aux file.
P ChangeLog
P doc/texinfo.tex
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Fri Jul 1 12:22:01 EDT 2005),
Karl Berry <=