gnulib: build-aux/texinfo.tex comparison

comparison build-aux/texinfo.tex @ 40209:c43e83386661

autoupdate

author	Karl Berry <karl@freefriends.org>
date	Fri, 08 Mar 2019 09:27:47 -0800
parents	053dfcf64bef
children	bb9e295185c8

comparison

equal deleted inserted replaced

-:f746878ee9be
+:c43e83386661
 % 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-03-03.15}
+\def\texinfoversion{2019-03-07.19}
 %
 % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % Have to do this stuff outside the \shipout because we want it to
 % take effect in \write's, yet the group defined by the \vbox ends
 % before the \shipout runs.
 %
 \indexdummies         % don't expand commands in the output.
-\normalturnoffactive  % \ in index entries must not stay \, e.g., if
+\turnoffactive
-% the page break happens to be in the middle of an example.
-% We don't want .vr (or whatever) entries like this:
-% \entry{{\indexbackslash }acronym}{32}{\code {\acronym}}
-% "\acronym" won't work when it's read back in;
-% it needs to be
-% {\code {{\backslashcurfont }acronym}
 \shipout\vbox{%
 % Do this early so pdf references go to the beginning of the page.
 \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
 %
 \unvbox\headlinebox
 % Used when writing an index entry out to an index file to prevent
 % expansion of Texinfo commands that can appear in an index entry.
 %
 \def\indexdummies{%
-\escapechar = `\\     % use backslash in output files.
 \definedummyletter\@%
 \definedummyletter\ %
 %
 % For texindex which always views { and } as separators.
 \def\{{\lbracechar{}}%
 \def\}{\rbracechar{}}%
 %
 % Do the redefinitions.
 \definedummies
+\otherbackslash
 }
 % Used for the aux and toc files, where @ is the escape character.
 %
 \def\atdummies{%
 \commondummyword\verb
 \commondummyword\w
 \commondummyword\xref
 }
-% This does nothing, but for a time it was recommended to use
-% \usebracesinindexestrue to be able to use braces in index entries.
 \let\indexlbrace\relax
 \let\indexrbrace\relax
+\let\indexatchar\relax
 {\catcode`\@=0
 \catcode`\\=13
 @gdef@backslashdisappear{@def\{}}
 }
 \def\@{}%
 \fi
 }
 \gdef\indexnonalnumreappear{%
-\useindexbackslash
 \let-\normaldash
 \let<\normalless
-\def\@{@}%
 }
 }
 % \indexnofonts is used when outputting the strings to sort the index
 % preceding skips.
 \typeout{Writing index file \jobname.\suffix}%
 \fi}
 \def\indexisfl{fl}
-% Output \ as {\indexbackslash}, because \ is an escape character in
-% the index files.
-\let\indexbackslash=\relax
-{\catcode`\@=0 \catcode`\\=\active
-@gdef@useindexbackslash{@def\{{@indexbackslash}}}
-}
 % Definition for writing index entry sort key.
 {
 \catcode`\-=13
 \gdef\indexwritesortas{%
 \begingroup
 % The braces around the commands are recognized by texindex.
 \def\lbracechar{{\indexlbrace}}%
 \def\rbracechar{{\indexrbrace}}%
 \let\{=\lbracechar
 \let\}=\rbracechar
+\def\@{{\indexatchar}}%
+\def\atchar##1{\@}%
 %
 \let\indexsortkey\empty
 % Execute the segment and throw away the typeset output.  This executes
 % any @sortas commands in this segment.
 \setbox\dummybox = \hbox{\segment}%
 \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
 \fi
 %
 % 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.
 %
 % Split the entry into primary entry and any subentries, and get the index
 % sort key.
 \splitindexentry\indextext
 %
 \smallfonts \rm
 \tolerance = 9500
 \plainfrenchspacing
 \everypar = {}% don't want the \kern\-parindent from indentation suppression.
 %
-% See if the index file exists and is nonempty.
-% Change catcode of @ here so that if the index file contains
-% \initial {@}
-% as its first line, TeX doesn't complain about mismatched braces
-% (because it thinks @} is a control sequence).
-\catcode`\@ = 12
 % See comment in \requireopenindexfile.
 \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
+%
+% See if the index file exists and is nonempty.
 \openin 1 \jobname.\indexname s
 \ifeof 1
 % \enddoublecolumns gets confused if there is no text in the index,
 % and it loses the chapter title and the aux file entries for the
 % index.  The easiest way to prevent this problem is to make sure
 % there is some text.
 \putwordIndexNonexistent
 \typeout{No file \jobname.\indexname s.}%
 \else
-\catcode`\\ = 0
-%
 % If the index file exists but is empty, then \openin leaves \ifeof
 % false.  We have to make TeX try to read something from the file, so
 % it can discover if there is anything in it.
 \read 1 to \thisline
 \ifeof 1
 \putwordIndexIsEmpty
 \else
-% Index files are almost Texinfo source, but we use \ as the escape
+\expandafter\printindexzz\thisline\relax\relax\finish%
-% character.  It would be better to use @, but that's too big a change
-% to make right now.
-\def\indexbackslash{\ttbackslash}%
-\let\indexlbrace\{   % Likewise, set these sequences for braces
-\let\indexrbrace\}   % used in the sort key.
-\begindoublecolumns
-\let\dotheinsertentrybox\dotheinsertentryboxwithpenalty
-%
-% Read input from the index file line by line.
-\loopdo
-\ifeof1 \else
-\read 1 to \nextline
-\fi
-%
-\indexinputprocessing
-\thisline
-%
-\ifeof1\else
-\let\thisline\nextline
-\repeat
-%%
-\enddoublecolumns
 \fi
 \fi
 \closein 1
 \endgroup}
 \def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
 \def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
+% If the index file starts with a backslash, forgo reading the index
+% file altogether.  If somebody upgrades texinfo.tex they may still have
+% old index files using \ as the escape character.  Reading this would
+% at best lead to typesetting garbage, at worst a TeX syntax error.
+\def\printindexzz#1#2\finish{%
+% NB this won't work if the index file starts with a group...
+\uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
+\message{skipping sorted index file}%
+(Skipped sorted index file in obsolete format)
+\else
+\printindexzzz
+\fi
+}
+\def\printindexzzz{%
+\begindoublecolumns
+\let\dotheinsertentrybox\dotheinsertentryboxwithpenalty
+%
+% Read input from the index file line by line.
+\loopdo
+\ifeof1 \else
+\read 1 to \nextline
+\fi
+%
+\indexinputprocessing
+\thisline
+%
+\ifeof1\else
+\let\thisline\nextline
+\repeat
+%%
+\enddoublecolumns
+}
 \def\indexinputprocessing{%
 \ifeof1
 \let\firsttoken\relax
 \else
 {\catcode`\/=13 \catcode`\-=13 \catcode`\^=13 \catcode`\~=13 \catcode`\_=13
 \catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13
 \catcode`\$=3
 \gdef\initialglyphs{%
+% special control sequences used in the index sort key
+\let\indexlbrace\{%
+\let\indexrbrace\}%
+\let\indexatchar\@%
+%
 % Some changes for non-alphabetic characters.  Using the glyphs from the
 % math fonts looks more consistent than the typewriter font used elsewhere
 % for these characters.
-\def\indexbackslash{\math{\backslash}}%
+\uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}}
-\let\\=\indexbackslash
+%
-%
+% In case @\ is used for backslash
+\uppercase{\let\\=~}
 % Can't get bold backslash so don't use bold forward slash
 \catcode`\/=13
 \def/{{\secrmnotbold \normalslash}}%
 \def-{{\normaldash\normaldash}}% en dash `--'
 \def^{{\chapbf \normalcaret}}%

Mercurial > gnulib

comparison build-aux/texinfo.tex @ 40209:c43e83386661