gnulib: build-aux/texinfo.tex comparison

comparison build-aux/texinfo.tex @ 40243:667e4c89e4d3

autoupdate

author	Karl Berry <karl@freefriends.org>
date	Sun, 17 Mar 2019 09:24:57 -0700
parents	331ec5f027a2
children

comparison

equal deleted inserted replaced

-:e84036edb2ff
+:667e4c89e4d3
 % 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-12.20}
+\def\texinfoversion{2019-03-16.20}
 %
 % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 \else
 \pdftrue
 \fi
 \fi
 \fi
+\newif\ifpdforxetex
+\pdforxetexfalse
+\ifpdf
+\pdforxetextrue
+\fi
+\ifx\XeTeXrevision\thisisundefined\else
+\pdforxetextrue
+\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.
 % rms does not like angle brackets --karl, 17may97.
 % So now @email is just like @uref, unless we are pdf.
 %
 %\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
+\ifpdforxetex
 \def\email#1{\doemail#1,,\finish}
 \def\doemail#1,#2,#3\finish{\begingroup
 \unsepspaces
 \pdfurl{mailto:#1}%
 \setbox0 = \hbox{\ignorespaces #2}%
 \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
 \endlink
 \endgroup}
 \else
-\ifx\XeTeXrevision\thisisundefined
+\let\email=\uref
-\let\email=\uref
-\else
-\def\email#1{\doemail#1,,\finish}
-\def\doemail#1,#2,#3\finish{\begingroup
-\unsepspaces
-\pdfurl{mailto:#1}%
-\setbox0 = \hbox{\ignorespaces #2}%
-\ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
-\endlink
-\endgroup}
-\fi
 \fi
 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \indexwritesortasxxx}
 \gdef\indexwritesortasxxx#1{%
 \xdef\indexsortkey{#1}\endgroup}
 }
-% The default definition
+\def\indexwriteseealso#1{
+\gdef\pagenumbertext{@seealso{#1}}%
+}
+% The default definitions
 \def\sortas#1{}%
+\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only
+\def\putwordSeeAlso{see also}
 % Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
 %   * Set \bracedtext to "{aaa}{bbb}"
 %   * Set \fullindexsortkey to "aaa @subentry ZZZ"
+%   * If @seealso occurs, set \pagenumbertext
 %
 \def\splitindexentry#1{%
 \gdef\fullindexsortkey{}%
 \xdef\bracedtext{}%
 \def\sep{}%
+\def\seealso##1{}%
 \expandafter\doindexsegment#1\subentry\finish\subentry
 }
 % append the results from the next segment
 \def\doindexsegment#1\subentry{%
 %
 % Get the string to sort by.  Process the segment with all
 % font commands turned off.
 \bgroup
 \let\sortas\indexwritesortas
+\let\seealso\indexwriteseealso
 \indexnofonts
 % 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
+\global\let\pagenumbertext\empty
 % Execute the segment and throw away the typeset output.  This executes
-% any @sortas commands in this segment.
+% any @sortas or @seealso commands in this segment.
 \setbox\dummybox = \hbox{\segment}%
 \ifx\indexsortkey\empty{%
 \indexnonalnumdisappear
 \xdef\trimmed{\segment}%
 \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
 % subentry case), texindex reduces to two when writing the .??s
 % sorted result.
 %
 \edef\temp{%
 \write\writeto{%
-\string\entry{\fullindexsortkey}{\noexpand\folio}\bracedtext}%
+\string\entry{\fullindexsortkey}%
+{\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}%
+\bracedtext}%
 }%
 \temp
 }
 % Put the index entry in the margin if desired (undocumented).
 %  \initial {c}
 %     before the first topic whose initial is c
 %  \entry {topic}{pagelist}
 %     for a topic that is used without subtopics
 %  \primary {topic}
+%  \entry {topic}{}
 %     for the beginning of a topic that is used with subtopics
 %  \secondary {subtopic}{pagelist}
 %     for each subtopic.
+%  \secondary {subtopic}{}
+%     for a subtopic with sub-subtopics
+%  \tertiary {subtopic}{subsubtopic}{pagelist}
+%     for each sub-subtopic.
 % Define the user-accessible indexing commands
 % @findex, @vindex, @kindex, @cindex.
 \def\findex {\fnindex}
 % it can discover if there is anything in it.
 \read 1 to \thisline
 \ifeof 1
 \putwordIndexIsEmpty
 \else
-\expandafter\printindexzz{#1}\thisline\relax\relax\finish%
+\expandafter\printindexzz\thisline\relax\relax\finish%
 \fi
 \fi
 \closein 1
 \endgroup}
 % 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#3\finish{%
+\def\printindexzz#1#2\finish{%
 % NB this won't work if the index file starts with a group...
-\uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#2
+\uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
 \message{skipping sorted index file}%
 (Skipped sorted index file in obsolete format)
 \else
 \begindoublecolumns
-\input \jobname.#1s
+\input \jobname.\indexname s
 \enddoublecolumns
 \fi
 }
 % These macros are used by the sorted index file itself.
 }
 {\catcode`\@=11
 \gdef\finishentry#1{%
 \egroup % end box A
 \dimen@ = \wd\boxA % Length of text of entry
-\global\setbox\boxA=\hbox\bgroup\unhbox\boxA
+\global\setbox\boxA=\hbox\bgroup
-% #1 is the page number.
+\unhbox\boxA
-%
+% #1 is the page number.
-% Get the width of the page numbers, and only use
-% leaders if they are present.
-\global\setbox\boxB = \hbox{#1}%
-\ifdim\wd\boxB = 0pt
-\null\nobreak\hfill\ %
-\else
 %
-\null\nobreak\indexdotfill % Have leaders before the page number.
+% Get the width of the page numbers, and only use
-%
+% leaders if they are present.
-\ifpdf
+\global\setbox\boxB = \hbox{#1}%
-\pdfgettoks#1.%
+\ifdim\wd\boxB = 0pt
-\hskip\skip\thinshrinkable\the\toksA
+\null\nobreak\hfill\ %
 \else
-\ifx\XeTeXrevision\thisisundefined
+%
-\hskip\skip\thinshrinkable #1%
+\null\nobreak\indexdotfill % Have leaders before the page number.
-\else
+%
+\ifpdforxetex
 \pdfgettoks#1.%
 \hskip\skip\thinshrinkable\the\toksA
+\else
+\hskip\skip\thinshrinkable #1%
 \fi
 \fi
-\fi
 \egroup % end \boxA
 \ifdim\wd\boxB = 0pt
-\unhbox\boxA
+\noindent\unhbox\boxA\par
+\nobreak
 \else\bgroup
 % We want the text of the entries to be aligned to the left, and the
 % page numbers to be aligned to the right.
 %
 \parindent = 0pt
 \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1filll}
 \def\primary #1{\line{#1\hfil}}
-\newskip\secondaryindent \secondaryindent=0.5cm
+\def\secondary{\indententry{0.5cm}}
-\def\secondary#1#2{{%
+\def\tertiary{\indententry{1cm}}
-\parfillskip=0in
-\parskip=0in
+\def\indententry#1#2#3{%
-\hangindent=1in
+\bgroup
-\hangafter=1
+\leftskip=#1
-\noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
+\entry{#2}{#3}%
-\ifpdf
+\egroup
-\pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+}
-\else
-\ifx\XeTeXrevision\thisisundefined
-#2
-\else
-\pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
-\fi
-\fi
-\par
-}}
 % Define two-column mode, which we use to typeset indexes.
 % Adapted from the TeXbook, page 416, which is to say,
 % the manmac.tex format used to print the TeXbook itself.
 \catcode`\@=11  % private names
 % writing pdf.  These are used in the table of contents.  We can't
 % just write one on every page because the title pages are numbered
 % 1 and 2 (the page numbers aren't printed), and so are the first
 % two pages of the document.  Thus, we'd have two destinations named
 % `1', and two named `2'.
-\ifpdf
+\ifpdforxetex
 \global\pdfmakepagedesttrue
-\else
-\ifx\XeTeXrevision\thisisundefined
-\else
-\global\pdfmakepagedesttrue
-\fi
 \fi
 }
 % These characters do not print properly in the Computer Modern roman

Mercurial > gnulib

comparison build-aux/texinfo.tex @ 40243:667e4c89e4d3