diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-13 23:53:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-13 23:53:43 +0000 |
commit | 488533e5de8e29b1cbb633e54230d9352fc1ade7 (patch) | |
tree | 39386c298ba978ea633976ffcbc31dcf32bb222b | |
parent | aa4fd8d1460738e284e23bab6f7a5384bda12354 (diff) |
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@55833 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/build-aux/texinfo.tex | 36 | ||||
-rw-r--r-- | Master/doc.html | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 36 |
3 files changed, 75 insertions, 17 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex index d3136db38aa..0d2a1fdbc8f 100644 --- a/Build/source/build-aux/texinfo.tex +++ b/Build/source/build-aux/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2020-05-22.11} +\def\texinfoversion{2020-06-25.17} % % Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc. % @@ -4922,7 +4922,7 @@ end % like the previous two, but they put @code around the argument. \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} +\def\docodeindexxxx #1{\docind{\indexname}{#1}} % Used for the aux, toc and index files to prevent expansion of Texinfo @@ -5294,6 +5294,20 @@ end \fi } +% Same as \doind, but for code indices +\def\docind#1#2{% + \iflinks + {% + % + \requireopenindexfile{#1}% + \edef\writeto{\csname#1indfile\endcsname}% + % + \def\indextext{#2}% + \safewhatsit\docindwrite + }% + \fi +} + % Check if an index file has been opened, and if not, open it. \def\requireopenindexfile#1{% \ifnum\csname #1indfile\endcsname=0 @@ -5360,6 +5374,9 @@ end % trim spaces. \edef\trimmed{\segment}% \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% + \ifincodeindex + \edef\trimmed{\noexpand\code{\trimmed}}% + \fi % \xdef\bracedtext{\bracedtext{\trimmed}}% % @@ -5425,7 +5442,12 @@ end % Write the entry in \indextext to the index file. % -\def\doindwrite{% + +\newif\ifincodeindex +\def\doindwrite{\incodeindexfalse\doindwritex} +\def\docindwrite{\incodeindextrue\doindwritex} + +\def\doindwritex{% \maybemarginindex % \atdummies @@ -5645,7 +5667,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% \else \begindoublecolumns \catcode`\\=0\relax - \catcode`\@=12\relax + % + % Make @ an escape character to give macros a chance to work. This + % should work because we (hopefully) don't otherwise use @ in index files. + %\catcode`\@=12\relax + \catcode`\@=0\relax \input \jobname.\indexname s \enddoublecolumns \fi @@ -7562,7 +7588,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \let\nonarrowing = t% \nonfillstart \tt % easiest (and conventionally used) font for verbatim - \def\par{\egroup\box\verbbox\endgraf\starttabbox}% + \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, diff --git a/Master/doc.html b/Master/doc.html index 6c5ba50b2e3..ddd7d33465f 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -22158,6 +22158,12 @@ Atomic and molecular orbitals using TikZ. <a href="texmf-dist/doc/latex/tikzorbital/tikzorbital.pdf">tikzorbital.pdf</a>. </small></li> +<li id="tikzpackets"><b><a href="texmf-dist/doc/latex/tikzpackets/">tikzpackets</a></b><small> +(<a href="https://ctan.org/pkg/tikzpackets">CTAN</a>): +Display network packets. +<a href="texmf-dist/doc/latex/tikzpackets/tikzPackets.pdf">tikzPackets.pdf</a>. +</small></li> + <li id="tikzpagenodes"><b><a href="texmf-dist/doc/latex/tikzpagenodes/">tikzpagenodes</a></b><small> (<a href="https://ctan.org/pkg/tikzpagenodes">CTAN</a>): A single TikZ node for the whole page. @@ -22883,7 +22889,7 @@ Print a typographic grid. <h2 id="letter-U">U</h2> -<ol start="3027"> +<ol start="3028"> <li id="uaclasses"><b><a href="texmf-dist/doc/latex/uaclasses/">uaclasses</a></b><small> (<a href="https://ctan.org/pkg/uaclasses">CTAN</a>): @@ -23369,7 +23375,7 @@ University of Washington thesis class. <h2 id="letter-V">V</h2> -<ol start="3096"> +<ol start="3097"> <li id="vancouver"><b><a href="texmf-dist/doc/bibtex/vancouver/">vancouver</a></b><small> (<a href="https://ctan.org/pkg/vancouver">CTAN</a>): @@ -23635,7 +23641,7 @@ Variable-width multiple text columns. <h2 id="letter-W">W</h2> -<ol start="3134"> +<ol start="3135"> <li id="wadalab"><b><a href="texmf-dist/doc/fonts/wadalab/">wadalab</a></b><small> (<a href="https://ctan.org/pkg/wadalab">CTAN</a>): @@ -23842,7 +23848,7 @@ Extend LaTeX's cross-reference system. <h2 id="letter-X">X</h2> -<ol start="3158"> +<ol start="3159"> <li id="xargs"><b><a href="texmf-dist/doc/latex/xargs/">xargs</a></b><small> (<a href="https://ctan.org/pkg/xargs">CTAN</a>): @@ -24434,7 +24440,7 @@ Tree macros using XY-Pic. <h2 id="letter-Y">Y</h2> -<ol start="3227"> +<ol start="3228"> <li id="yafoot"><b><a href="texmf-dist/doc/latex/yafoot/">yafoot</a></b><small> (<a href="https://ctan.org/pkg/yafoot">CTAN</a>): @@ -24536,7 +24542,7 @@ Many-featured Young tableaux and Young diagrams. <h2 id="letter-Z">Z</h2> -<ol start="3241"> +<ol start="3242"> <li id="zebra-goodies"><b><a href="texmf-dist/doc/latex/zebra-goodies/">zebra-goodies</a></b><small> (<a href="https://ctan.org/pkg/zebra-goodies">CTAN</a>): @@ -24635,5 +24641,5 @@ Standard conforming typesetting of Japanese, for XeLaTeX. <p><a href="#letter-1">1</a> - <a href="#letter-2">2</a> - <a href="#letter-A">A</a> - <a href="#letter-B">B</a> - <a href="#letter-C">C</a> - <a href="#letter-D">D</a> - <a href="#letter-E">E</a> - <a href="#letter-F">F</a> - <a href="#letter-G">G</a> - <a href="#letter-H">H</a> - <a href="#letter-I">I</a> - <a href="#letter-J">J</a> - <a href="#letter-K">K</a> - <a href="#letter-L">L</a> - <a href="#letter-M">M</a> - <a href="#letter-N">N</a> - <a href="#letter-O">O</a> - <a href="#letter-P">P</a> - <a href="#letter-Q">Q</a> - <a href="#letter-R">R</a> - <a href="#letter-S">S</a> - <a href="#letter-T">T</a> - <a href="#letter-U">U</a> - <a href="#letter-V">V</a> - <a href="#letter-W">W</a> - <a href="#letter-X">X</a> - <a href="#letter-Y">Y</a> - <a href="#letter-Z">Z</a></p> <hr> -<small>Generated Mon Jul 13 01:53:28 CEST 2020 by tl-update-docindex.</small> +<small>Generated Tue Jul 14 01:53:41 CEST 2020 by tl-update-docindex.</small> </body></html> diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index d3136db38aa..0d2a1fdbc8f 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2020-05-22.11} +\def\texinfoversion{2020-06-25.17} % % Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc. % @@ -4922,7 +4922,7 @@ end % like the previous two, but they put @code around the argument. \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} +\def\docodeindexxxx #1{\docind{\indexname}{#1}} % Used for the aux, toc and index files to prevent expansion of Texinfo @@ -5294,6 +5294,20 @@ end \fi } +% Same as \doind, but for code indices +\def\docind#1#2{% + \iflinks + {% + % + \requireopenindexfile{#1}% + \edef\writeto{\csname#1indfile\endcsname}% + % + \def\indextext{#2}% + \safewhatsit\docindwrite + }% + \fi +} + % Check if an index file has been opened, and if not, open it. \def\requireopenindexfile#1{% \ifnum\csname #1indfile\endcsname=0 @@ -5360,6 +5374,9 @@ end % trim spaces. \edef\trimmed{\segment}% \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% + \ifincodeindex + \edef\trimmed{\noexpand\code{\trimmed}}% + \fi % \xdef\bracedtext{\bracedtext{\trimmed}}% % @@ -5425,7 +5442,12 @@ end % Write the entry in \indextext to the index file. % -\def\doindwrite{% + +\newif\ifincodeindex +\def\doindwrite{\incodeindexfalse\doindwritex} +\def\docindwrite{\incodeindextrue\doindwritex} + +\def\doindwritex{% \maybemarginindex % \atdummies @@ -5645,7 +5667,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% \else \begindoublecolumns \catcode`\\=0\relax - \catcode`\@=12\relax + % + % Make @ an escape character to give macros a chance to work. This + % should work because we (hopefully) don't otherwise use @ in index files. + %\catcode`\@=12\relax + \catcode`\@=0\relax \input \jobname.\indexname s \enddoublecolumns \fi @@ -7562,7 +7588,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \let\nonarrowing = t% \nonfillstart \tt % easiest (and conventionally used) font for verbatim - \def\par{\egroup\box\verbbox\endgraf\starttabbox}% + \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, |