gnulib: build-aux/texinfo.tex comparison

comparison build-aux/texinfo.tex @ 40204:db8428454956

autoupdate

author	Karl Berry <karl@freefriends.org>
date	Sun, 03 Mar 2019 14:09:37 -0800
parents	30d91797009f
children	053dfcf64bef

comparison

equal deleted inserted replaced

-:30d91797009f
+:db8428454956
 % texinfo.tex -- TeX macros to handle Texinfo files.
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2019-02-28.20}
+\def\texinfoversion{2019-03-02.16}
 %
 % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % (\thissection) refers to the chapter (section) in effect at the top
 % of a page, or that at the bottom of a page.
 % \domark is called twice inside \chapmacro, to add one
 % mark before the section break, and one after.
-%   In the second call \prevchapterdefs is the same as \lastchapterdefs,
+%   In the second call \prevchapterdefs is the same as \currentchapterdefs,
-% and \prevsectiondefs is the same as \lastsectiondefs.
+% and \prevsectiondefs is the same as \currentsectiondefs.
 %   Then if the page is not broken at the mark, some of the previous
 % section appears on the page, and we can get the name of this section
 % from \firstmark for @everyheadingmarks top.
 %   @everyheadingmarks bottom uses \botmark.
 %
 % See page 260 of The TeXbook.
 \def\domark{%
-\toks0=\expandafter{\lastchapterdefs}%
+\toks0=\expandafter{\currentchapterdefs}%
-\toks2=\expandafter{\lastsectiondefs}%
+\toks2=\expandafter{\currentsectiondefs}%
 \toks4=\expandafter{\prevchapterdefs}%
 \toks6=\expandafter{\prevsectiondefs}%
-\toks8=\expandafter{\lastcolordefs}%
+\toks8=\expandafter{\currentcolordefs}%
 \mark{%
 \the\toks0 \the\toks2  % 0: marks for @everyheadingmarks top
 \noexpand\or \the\toks4 \the\toks6  % 1: for @everyheadingmarks bottom
 \noexpand\else \the\toks8             % 2: color marks
 }%
 % page or the contents), so we use \firstmark there -- this gets us
 % the mark with the chapter defs, unless the user sneaks in, e.g.,
 % @setcolor (or @url, or @link, etc.) between @contents and the very
 % first @chapter.
 \def\gettopheadingmarks{%
-\ifcase0\topmark\fi
+\ifcase0\the\savedtopmark\fi
 \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
 }
 \def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
+\def\getcolormarks{\ifcase2\the\savedtopmark\fi}
 % Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
+\def\currentchapterdefs{}
-\def\lastsectiondefs{}
+\def\currentsectiondefs{}
-\def\lastsection{}
+\def\currentsection{}
 \def\prevchapterdefs{}
 \def\prevsectiondefs{}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
 % Margin to add to right of even pages, to left of odd pages.
 \newdimen\bindingoffset
 \newdimen\normaloffset
 \newdimen\txipagewidth \newdimen\txipageheight
 % Main output routine.
 %
 \chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
+\output = {\savetopmark\onepageout{\pagecontents\PAGE}}
 \newbox\headlinebox
 \newbox\footlinebox
+% When outputting the double column layout for indices, an output routine
+% is run several times, which hides the original value of \topmark.  This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index.  Hence, save the contents of \topmark at the beginning of
+% the output routine.  The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
+% away and the index auxiliary file would remain empty.)
+%
+\newtoks\savedtopmark
+\newif\iftopmarksaved
+\topmarksavedtrue
+\def\savetopmark{%
+\iftopmarksaved\else
+\global\savedtopmark=\expandafter{\topmark}%
+\global\topmarksavedtrue
+\fi
+}
 % \onepageout takes a vbox as an argument.
 % \shipout a vbox for a single page, adding an optional header, footer
 % and footnote.  This also causes index entries for this page to be written
 % to the auxiliary files.
 \hoffset=\normaloffset
 %
 \ifodd\pageno  \advance\hoffset by \bindingoffset
 \else \advance\hoffset by -\bindingoffset\fi
 %
-% Common context changes for both heading and footing.
-% Do this outside of the \shipout so @code etc. will be expanded in
-% the headline as they should be, not taken literally (outputting ''code).
-\def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
-%
 % Retrieve the information for the headings from the marks in the page,
 % and call Plain TeX's \makeheadline and \makefootline, which use the
 % values in \headline and \footline.
 %
 % This is used to check if we are on the first page of a chapter.
-\ifcase1\topmark\fi
+\ifcase1\the\savedtopmark\fi
 \let\prevchaptername\thischaptername
 \ifcase0\firstmark\fi
 \let\curchaptername\thischaptername
 %
 \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
-\ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
 %
 \ifx\curchaptername\prevchaptername
 \let\thischapterheading\thischapter
 \else
 % \thischapterheading is the same as \thischapter except it is blank
 % for the first page of a chapter.  This is to prevent the chapter name
 % being shown twice.
 \def\thischapterheading{}%
 \fi
 %
+% Common context changes for both heading and footing.
+% Do this outside of the \shipout so @code etc. will be expanded in
+% the headline as they should be, not taken literally (outputting ''code).
+\def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+%
 \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+%
+\ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
 \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
 %
 {%
 % Set context for writing to auxiliary files like index files.
 % Have to do this stuff outside the \shipout because we want it to
 % The \baselineskip=24pt in plain's \makefootline has no effect.
 \vskip 24pt
 \unvbox\footlinebox
 \fi
 %
-}% end of \shipout\vbox
+}%
-}% end of group with \indexdummies
+}%
+\global\topmarksavedfalse
 \advancepageno
 \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
 \newinsert\margin \dimen\margin=\maxdimen
 \def\pdfsetcolor#1{\pdfliteral{#1 rg  #1 RG}}
 %
 % Set color, and create a mark which defines \thiscolor accordingly,
 % so that \makeheadline knows which color to restore.
 \def\setcolor#1{%
-\xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+\xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
 \domark
 \pdfsetcolor{#1}%
 }
 %
 \def\maincolor{\rgbBlack}
 \pdfsetcolor{\maincolor}
 \edef\thiscolor{\maincolor}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
 %
 \def\makefootline{%
 \baselineskip24pt
 \line{\pdfsetcolor{\maincolor}\the\footline}%
 }
 \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
 %
 % Set color, and create a mark which defines \thiscolor accordingly,
 % so that \makeheadline knows which color to restore.
 \def\setcolor#1{%
-\xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+\xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
 \domark
 \pdfsetcolor{#1}%
 }
 %
 \def\maincolor{\rgbBlack}
 \pdfsetcolor{\maincolor}
 \edef\thiscolor{\maincolor}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
 %
 \def\makefootline{%
 \baselineskip24pt
 \line{\pdfsetcolor{\maincolor}\the\footline}%
 }
 \let\indexbackslash=\relax
 {\catcode`\@=0 \catcode`\\=\active
 @gdef@useindexbackslash{@def\{{@indexbackslash}}}
 }
-% Definition for writing index entry text.
-\def\sortas#1{}%
 % Definition for writing index entry sort key.
 {
 \catcode`\-=13
 \gdef\indexwritesortas{%
 \begingroup
 \indexwritesortasxxx}
 \gdef\indexwritesortasxxx#1{%
 \xdef\indexsortkey{#1}\endgroup}
 }
+% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
+%   * Set \bracedtext to "{aaa}{bbb}"
+%   * Set \fullindexsortkey to "aaa @subentry ZZZ"
+%
+\def\splitindexentry#1{%
+\gdef\fullindexsortkey{}%
+\xdef\bracedtext{}%
+\def\sep{}%
+\expandafter\doindexsegment#1\subentry\finish\subentry
+}
+% append the results from the next segment
+\def\doindexsegment#1\subentry{%
+\def\segment{#1}%
+\ifx\segment\isfinish
+\else
+%
+% Fully expand the segment, throwing away any @sortas directives, and
+% trim spaces.
+\def\sortas##1{}%
+\edef\trimmed{\segment}%
+\edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+%
+\xdef\bracedtext{\bracedtext{\trimmed}}%
+%
+% Get the string to sort by.  Process the segment with all
+% font commands turned off.
+\bgroup
+\let\sortas\indexwritesortas
+\indexnofonts
+% The braces around the commands are recognized by texindex.
+\def\lbracechar{{\indexlbrace}}%
+\def\rbracechar{{\indexrbrace}}%
+\let\{=\lbracechar
+\let\}=\rbracechar
+%
+\let\indexsortkey\empty
+% Execute the segment and throw away the typeset output.  This executes
+% any @sortas commands in this segment.
+\setbox\dummybox = \hbox{\segment}%
+\ifx\indexsortkey\empty{%
+\indexnonalnumdisappear
+\xdef\trimmed{\segment}%
+\xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+\xdef\indexsortkey{\trimmed}%
+\ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+}\fi
+%
+% Append to \fullindexsortkey.
+\edef\tmp{\gdef\noexpand\fullindexsortkey{%
+\fullindexsortkey\sep\indexsortkey}}%
+\tmp
+\egroup
+\def\sep{\subentry}%
+%
+\expandafter\doindexsegment
+\fi
+}
+\def\isfinish{\finish}%
+\let\subentry\relax
 % Write the entry in \toks0 to the index file.
 %
 \def\dosubindwrite{%
 % Put the index entry in the margin if desired.
 %
 % Remember, we are within a group.
 \indexdummies % Must do this here, since \bf, etc expand at this stage
 \useindexbackslash % \indexbackslash isn't defined now so it will be output
 % as is; and it will print as backslash.
-% The braces around \indexbrace are recognized by texindex.
+%
-%
+% Split the entry into primary entry and any subentries, and get the index
-% Get the string to sort by, by processing the index entry with all
+% sort key.
-% font commands turned off.
+\splitindexentry\indextext
-{\indexnofonts
-\def\lbracechar{{\indexlbrace}}%
-\def\rbracechar{{\indexrbrace}}%
-\let\{=\lbracechar
-\let\}=\rbracechar
-\indexnonalnumdisappear
-\xdef\indexsortkey{}%
-\let\sortas=\indexwritesortas
-\setbox\dummybox = \hbox{\indextext}% Execute any \sortas
-\ifx\indexsortkey\empty
-\xdef\indexsortkey{\indextext}%
-\ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
-\fi
-}%
 %
 % Set up the complete index entry, with both the sort key and
 % the original text, including any font commands.  We write
 % three arguments to \entry to the .?? file (four in the
 % subentry case), texindex reduces to two when writing the .??s
 % sorted result.
 %
-% Fully expand the text of the index entry and trim spaces.
-\edef\indextext{\indextext}%
-\edef\indextext{\expandafter\eatspaces\expandafter{\indextext}}%
-\toks0=\expandafter{\indextext}%
 \edef\temp{%
 \write\writeto{%
-\string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
+\string\entry{\fullindexsortkey}{\noexpand\folio}\bracedtext}%
 }%
 \temp
 }
 \newbox\dummybox % used above
 \catcode`\@=11  % private names
 \newbox\partialpage
 \newdimen\doublecolumnhsize
-% Use inside an output routine to save \topmark and \firstmark
-\def\savemarks{%
-\global\savedtopmark=\expandafter{\topmark }%
-\global\savedfirstmark=\expandafter{\firstmark }%
-}
-\newtoks\savedtopmark
-\newtoks\savedfirstmark
-% Set \topmark and \firstmark for next time \output runs.
-% Can't be run from withinside \output (because any material
-% added while an output routine is active, including
-% penalties, is saved for after it finishes).  The page so far
-% should be empty, otherwise what's on it will be thrown away.
-\def\restoremarks{%
-\mark{\the\savedtopmark}%
-\bgroup\output = {%
-\setbox\dummybox=\box\PAGE
-}abc\eject\egroup
-% "abc" because output routine doesn't fire for a completely empty page.
-\mark{\the\savedfirstmark}%
-}
 \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
 % If not much space left on page, start a new page.
 \ifdim\pagetotal>0.8\vsize\vfill\eject\fi
 %
 % Grab any single-column material above us.
 \output = {%
+\savetopmark
 %
 % Here is a possibility not foreseen in manmac: if we accumulate a
 % whole lot of material, we might end up calling this \output
 % routine twice in a row (see the doublecol-lose test, which is
 % essentially a couple of indexes with @setchapternewpage off).  In
 \global\setbox\partialpage = \vbox{%
 % Unvbox the main output page.
 \unvbox\PAGE
 \kern-\topskip \kern\baselineskip
 }%
-\savemarks
 }%
 \eject % run that output routine to set \partialpage
-\restoremarks
-%
-% We recover the two marks that the last output routine saved in order
-% to propagate the information in marks added around a chapter heading,
-% which could be otherwise be lost by the time the final page is output.
-%
 %
 % Use the double-column output routine for subsequent pages.
 \output = {\doublecolumnout}%
 %
 % Change the page size parameters.  We could do this once outside this
 % The double-column output routine for all double-column pages except
 % the last, which is done by \balancecolumns.
 %
 \def\doublecolumnout{%
 %
+\savetopmark
 \splittopskip=\topskip \splitmaxdepth=\maxdepth
 \dimen@ = \vsize
 \divide\dimen@ by 2
 %
 % box0 will be the left-hand column, box2 the right.
 % page builder, unlike penalties (see The TeXbook, pp. 280-281).
 \penalty0
 %
 \output = {%
 % Split the last of the double-column material.
-\savemarks
+\savetopmark
 \balancecolumns
 }%
 \eject % call the \output just set
 \ifdim\pagetotal=0pt
 % Having called \balancecolumns once, we do not
 % want to call it again.  Therefore, reset \output to its normal
 % definition right away.
 \global\output = {\onepageout{\pagecontents\PAGE}}%
 %
 \endgroup % started in \begindoublecolumns
-\restoremarks
 % Leave the double-column material on the current page, no automatic
 % page break.
 \box\balancedcolumns
 %
 % \pagegoal was set to the doubled \vsize above, since we restarted
 %
 \def\chapmacro#1#2#3{%
 \expandafter\ifx\thisenv\titlepage\else
 \checkenv{}% chapters, etc., should not start inside an environment.
 \fi
-% FIXME: \chapmacro is currently called from inside \titlepage when
-% \setcontentsaftertitlepage to print the "Table of Contents" heading, but
-% this should probably be done by \sectionheading with an option to print
-% in chapter size.
-%
 % Insert the first mark before the heading break (see notes for \domark).
-\let\prevchapterdefs=\lastchapterdefs
+\let\prevchapterdefs=\currentchapterdefs
-\let\prevsectiondefs=\lastsectiondefs
+\let\prevsectiondefs=\currentsectiondefs
-\gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+\gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
 \gdef\thissection{}}%
 %
 \def\temptype{#2}%
 \ifx\temptype\Ynothingkeyword
-\gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+\gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
 \gdef\thischapter{\thischaptername}}%
 \else\ifx\temptype\Yomitfromtockeyword
-\gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+\gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
 \gdef\thischapter{}}%
 \else\ifx\temptype\Yappendixkeyword
 \toks0={#1}%
-\xdef\lastchapterdefs{%
+\xdef\currentchapterdefs{%
 \gdef\noexpand\thischaptername{\the\toks0}%
 \gdef\noexpand\thischapternum{\appendixletter}%
 % \noexpand\putwordAppendix avoids expanding indigestible
 % commands in some of the translations.
 \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
 \noexpand\thischapternum:
 \noexpand\thischaptername}%
 }%
 \else
 \toks0={#1}%
-\xdef\lastchapterdefs{%
+\xdef\currentchapterdefs{%
 \gdef\noexpand\thischaptername{\the\toks0}%
 \gdef\noexpand\thischapternum{\the\chapno}%
 % \noexpand\putwordChapter avoids expanding indigestible
 % commands in some of the translations.
 \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
 % Insert the chapter heading break.
 \pchapsepmacro
 %
 % Now the second mark, after the heading break.  No break points
 % between here and the heading.
-\let\prevchapterdefs=\lastchapterdefs
+\let\prevchapterdefs=\currentchapterdefs
-\let\prevsectiondefs=\lastsectiondefs
+\let\prevsectiondefs=\currentsectiondefs
 \domark
 %
 {%
 \chapfonts \rm
 \let\footnote=\errfootnoteheading % give better error message
 %
-% Have to define \lastsection before calling \donoderef, because the
+% Have to define \currentsection before calling \donoderef, because the
 % xref code eventually uses it.  On the other hand, it has to be called
 % after \pchapsepmacro, or the headline will change too soon.
-\gdef\lastsection{#1}%
+\gdef\currentsection{#1}%
 %
 % Only insert the separating space if we have a chapter/appendix
 % number, and don't print the unnumbered ``number''.
 \ifx\temptype\Ynothingkeyword
 \setbox0 = \hbox{}%
 %
 % Switch to the right set of fonts.
 \csname #2fonts\endcsname \rm
 %
 % Insert first mark before the heading break (see notes for \domark).
-\let\prevsectiondefs=\lastsectiondefs
+\let\prevsectiondefs=\currentsectiondefs
 \ifx\temptype\Ynothingkeyword
 \ifx\sectionlevel\seckeyword
-\gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+\gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
 \gdef\thissection{\thissectionname}}%
 \fi
 \else\ifx\temptype\Yomitfromtockeyword
 % Don't redefine \thissection.
 \else\ifx\temptype\Yappendixkeyword
 \ifx\sectionlevel\seckeyword
 \toks0={#1}%
-\xdef\lastsectiondefs{%
+\xdef\currentsectiondefs{%
 \gdef\noexpand\thissectionname{\the\toks0}%
 \gdef\noexpand\thissectionnum{#4}%
 % \noexpand\putwordSection avoids expanding indigestible
 % commands in some of the translations.
 \gdef\noexpand\thissection{\noexpand\putwordSection{}
 }%
 \fi
 \else
 \ifx\sectionlevel\seckeyword
 \toks0={#1}%
-\xdef\lastsectiondefs{%
+\xdef\currentsectiondefs{%
 \gdef\noexpand\thissectionname{\the\toks0}%
 \gdef\noexpand\thissectionnum{#4}%
 % \noexpand\putwordSection avoids expanding indigestible
 % commands in some of the translations.
 \gdef\noexpand\thissection{\noexpand\putwordSection{}
 % Insert space above the heading.
 \csname #2headingbreak\endcsname
 %
 % Now the second mark, after the heading break.  No break points
 % between here and the heading.
-\global\let\prevsectiondefs=\lastsectiondefs
+\global\let\prevsectiondefs=\currentsectiondefs
 \domark
 %
 % Only insert the space after the number if we have a section number.
 \ifx\temptype\Ynothingkeyword
 \setbox0 = \hbox{}%
 \def\toctype{unn}%
-\gdef\lastsection{#1}%
+\gdef\currentsection{#1}%
 \else\ifx\temptype\Yomitfromtockeyword
 % for @headings -- no section number, don't include in toc,
-% and don't redefine \lastsection.
+% and don't redefine \currentsection.
 \setbox0 = \hbox{}%
 \def\toctype{omit}%
 \let\sectionlevel=\empty
 \else\ifx\temptype\Yappendixkeyword
 \setbox0 = \hbox{#4\enspace}%
 \def\toctype{app}%
-\gdef\lastsection{#1}%
+\gdef\currentsection{#1}%
 \else
 \setbox0 = \hbox{#4\enspace}%
 \def\toctype{num}%
-\gdef\lastsection{#1}%
+\gdef\currentsection{#1}%
 \fi\fi\fi
 %
 % Write the toc entry (before \donoderef).  See comments in \chapmacro.
 \writetocentry{\toctype\sectionlevel}{#1}{#4}%
 %
 \def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
 \def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
 % anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
+% 1) NAME-title - the current sectioning name taken from \currentsection,
 %                 or the anchor name.
 % 2) NAME-snt   - section number and type, passed as the SNT arg, or
 %                 empty for anchors.
 % 3) NAME-pg    - the page number.
 %
 \def\value##1{##1}%
 \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
 	  ##1}{##2}}% these are parameters of \writexrdef
 }%
-\toks0 = \expandafter{\lastsection}%
+\toks0 = \expandafter{\currentsection}%
 \immediate \writexrdef{title}{\the\toks0 }%
 \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
 \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
 }%
 \fi
 %
 \expandafter\getfloatno\csname\safefloattype floatno\endcsname
 \global\advance\floatno by 1
 %
 {%
-% This magic value for \lastsection is output by \setref as the
+% This magic value for \currentsection is output by \setref as the
 % XREFLABEL-title value.  \xrefX uses it to distinguish float
 % labels (which have a completely different output format) from
 % node and anchor labels.  And \xrdef uses it to construct the
 % lists of floats.
 %
-\edef\lastsection{\floatmagic=\safefloattype}%
+\edef\currentsection{\floatmagic=\safefloattype}%
 \setref{\floatlabel}{Yfloat}%
 }%
 \fi
 %
 % start with \parskip glue, I guess.
 % distinguish floats from other xref types.
 \def\floatmagic{!!float!!}
 % #1 is the control sequence we are passed; we expand into a conditional
 % which is true if #1 represents a float ref.  That is, the magic
-% \lastsection value which we \setref above.
+% \currentsection value which we \setref above.
 %
 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
 %
 % #1 is (maybe) the \floatmagic string.  If so, #2 will be the
 % (safe) float type for this float.  We set \iffloattype to #2.

Mercurial > gnulib

comparison build-aux/texinfo.tex @ 40204:db8428454956