diff options
-rw-r--r-- | Build/source/build-aux/texinfo.tex | 32 | ||||
-rw-r--r-- | Master/doc.html | 57 | ||||
-rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 32 | ||||
-rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 1 |
4 files changed, 60 insertions, 62 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex index 929418c760e..33d982a6a01 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{2019-02-23.16} +\def\texinfoversion{2019-02-28.20} % % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. @@ -5216,11 +5216,12 @@ end {% \requireopenindexfile{#1}% % Store the main index entry text (including the third arg). - \toks0 = {#2}% % If third arg is present, precede it with a space. \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% + \ifx\thirdarg\empty + \def\indextext{#2}% + \else + \def\indextext{#2\space#3}% \fi % \edef\writeto{\csname#1indfile\endcsname}% @@ -5255,13 +5256,9 @@ end } % Definition for writing index entry text. -\def\sortas#1{\ignorespaces}% +\def\sortas#1{}% -% Definition for writing index entry sort key. Should occur at the at -% the beginning of the index entry, like -% @cindex @sortas{september} \september -% The \ignorespaces takes care of following space, but there's no way -% to remove space before it. +% Definition for writing index entry sort key. { \catcode`\-=13 \gdef\indexwritesortas{% @@ -5297,10 +5294,9 @@ end \indexnonalnumdisappear \xdef\indexsortkey{}% \let\sortas=\indexwritesortas - \edef\temp{\the\toks0}% - \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas + \setbox\dummybox = \hbox{\indextext}% Execute any \sortas \ifx\indexsortkey\empty - \xdef\indexsortkey{\temp}% + \xdef\indexsortkey{\indextext}% \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi \fi }% @@ -5310,6 +5306,11 @@ end % 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}}% @@ -5418,11 +5419,6 @@ end \def\tindex {\tpindex} \def\pindex {\pgindex} -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - % Define the macros used in formatting output of the sorted index material. % @printindex causes a particular index (the ??s file) to get printed. diff --git a/Master/doc.html b/Master/doc.html index 54357449ce8..6a8d5c97026 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -2227,6 +2227,11 @@ Process bibliographies for LaTeX, etc <a href="texmf-dist/doc/man/man1/bibtex.man1.pdf">bibtex.man1.pdf</a>. </small></li> +<li><b><a href="texmf-dist/doc/bibtexu/examples">bibtexu</a></b>:<small> +BibTeX variant supporting Unicode (UTF-8) +<a href="texmf-dist/doc/bibtexu/examples/test.pdf">test.pdf</a>. +</small></li> + <li><b><a href="texmf-dist/doc/latex/bibtopic">bibtopic</a></b>:<small> Include multiple bibliographies in a document <a href="texmf-dist/doc/latex/bibtopic/bibtopic.pdf">bibtopic.pdf</a>. @@ -2712,7 +2717,7 @@ Create illustrations for network protocol specifications <h2 id="letter-C">C</h2> -<ol start="409"> +<ol start="410"> <li><b><a href="texmf-dist/doc/fonts/enc/c90">c90</a></b>:<small> c90 font encoding for Thai @@ -4485,7 +4490,7 @@ Cyrillic bibtex and makeindex <h2 id="letter-D">D</h2> -<ol start="674"> +<ol start="675"> <li><b><a href="texmf-dist/doc/fonts/dad">dad</a></b>:<small> Simple typesetting system for mixed Arabic/Latin documents @@ -5346,7 +5351,7 @@ Construct Dynkin tree diagrams <h2 id="letter-E">E</h2> -<ol start="821"> +<ol start="822"> <li><b><a href="texmf-dist/doc/generic/e-french">e-french</a></b>:<small> Comprehensive LaTeX support for French-language typesetting @@ -6286,7 +6291,7 @@ Extend the standard classes' size options <h2 id="letter-F">F</h2> -<ol start="975"> +<ol start="976"> <li><b><a href="texmf-dist/doc/latex/facsimile">facsimile</a></b>:<small> Document class for preparing faxes @@ -7207,7 +7212,7 @@ Get first and last words of a page <h2 id="letter-G">G</h2> -<ol start="1124"> +<ol start="1125"> <li><b><a href="texmf-dist/doc/latex/g-brief">g-brief</a></b>:<small> Letter document class @@ -8016,7 +8021,7 @@ Bundle of classes for "La Gazette des Mathematiciens" <h2 id="letter-H">H</h2> -<ol start="1243"> +<ol start="1244"> <li><b><a href="texmf-dist/doc/latex/h2020proposal/manual">h2020proposal</a></b>:<small> LaTeX class and template for EU H2020 RIA proposal @@ -8386,7 +8391,7 @@ Basic support for multiple languages in Plain TeX <h2 id="letter-I">I</h2> -<ol start="1302"> +<ol start="1303"> <li><b><a href="texmf-dist/doc/latex/ibycus-babel">ibycus-babel</a></b>:<small> Use the Ibycus 4 Greek font with Babel @@ -8814,7 +8819,7 @@ A two-element sans-serif font <h2 id="letter-J">J</h2> -<ol start="1374"> +<ol start="1375"> <li><b><a href="texmf-dist/doc/fonts/jablantile">jablantile</a></b>:<small> Metafont version of tiles in the style of Slavik Jablan @@ -8982,7 +8987,7 @@ A replacement for LaTeX's verbatim package <h2 id="letter-K">K</h2> -<ol start="1396"> +<ol start="1397"> <li><b><a href="texmf-dist/doc/latex/kalendarium">kalendarium</a></b>:<small> Print dates according to the classical Latin calendar @@ -9409,7 +9414,7 @@ Create Karnaugh maps with LaTeX <h2 id="letter-L">L</h2> -<ol start="1434"> +<ol start="1435"> <li><b><a href="texmf-dist/doc/latex/l2picfaq">l2picfaq</a></b>:<small> LaTeX pictures "how-to" (German) @@ -10853,7 +10858,7 @@ Commands to include lilypond scores within a (Lua)LaTeX document <h2 id="letter-M">M</h2> -<ol start="1644"> +<ol start="1645"> <li><b><a href="texmf-dist/doc/generic/m-tx">m-tx</a></b>:<small> A preprocessor for pmx @@ -12110,7 +12115,7 @@ XeLaTeX template for writing the main body of NSFC proposals <h2 id="letter-N">N</h2> -<ol start="1847"> +<ol start="1848"> <li><b><a href="texmf-dist/doc/xelatex/na-box">na-box</a></b>:<small> Arabic-aware version of pas-cours package @@ -12589,7 +12594,7 @@ Support for the journal "North-Western European Journal of Mathematics" <h2 id="letter-O">O</h2> -<ol start="1923"> +<ol start="1924"> <li><b><a href="texmf-dist/doc/latex/oberdiek">oberdiek</a></b>:<small> A bundle of packages submitted by Heiko Oberdiek @@ -12915,7 +12920,7 @@ Combine LaTeX commands over included graphics <h2 id="letter-P">P</h2> -<ol start="1962"> +<ol start="1963"> <li><b><a href="texmf-dist/doc/latex/padcount">padcount</a></b>:<small> Pad numbers with arbitrary characters @@ -14792,7 +14797,7 @@ Run Python from within a document, typesetting the results <h2 id="letter-Q">Q</h2> -<ol start="2260"> +<ol start="2261"> <li><b><a href="texmf-dist/doc/latex/qcircuit">qcircuit</a></b>:<small> Macros to generate quantum ciruits @@ -14878,7 +14883,7 @@ German translations to the quran package <h2 id="letter-R">R</h2> -<ol start="2274"> +<ol start="2275"> <li><b><a href="texmf-dist/doc/latex/raleway">raleway</a></b>:<small> Use Raleway with TeX(-alike) systems @@ -15351,7 +15356,7 @@ Class for Ryerson Unversity Graduate School requirements <h2 id="letter-S">S</h2> -<ol start="2345"> +<ol start="2346"> <li><b><a href="texmf-dist/doc/latex/sa-tikz">sa-tikz</a></b>:<small> TikZ library to draw switching architectures @@ -16703,7 +16708,7 @@ Format systems of equations <h2 id="letter-T">T</h2> -<ol start="2559"> +<ol start="2560"> <li><b><a href="texmf-dist/doc/latex/t-angles">t-angles</a></b>:<small> Draw tangles, trees, Hopf algebra operations and other pictures @@ -16880,9 +16885,9 @@ Doc/docstrip for tcl <li><b><a href="texmf-dist/doc/latex/tcolorbox">tcolorbox</a></b>:<small> Coloured boxes, for LaTeX examples and theorems, etc <a href="texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf">tcolorbox-example-poster.pdf</a>, -<a href="texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf">tcolorbox-example.pdf</a> (en), +<a href="texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf">tcolorbox-example.pdf</a>, <a href="texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf">tcolorbox-tutorial-poster.pdf</a>, -<a href="texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf">tcolorbox.pdf</a> (en). +<a href="texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf">tcolorbox.pdf</a>. </small></li> <li><b><a href="texmf-dist/doc/latex/tdclock">tdclock</a></b>:<small> @@ -18539,7 +18544,7 @@ Print a typographic grid <h2 id="letter-U">U</h2> -<ol start="2810"> +<ol start="2811"> <li><b><a href="texmf-dist/doc/latex/uaclasses">uaclasses</a></b>:<small> University of Arizona thesis and dissertation format @@ -18906,7 +18911,7 @@ University of Washington thesis class <h2 id="letter-V">V</h2> -<ol start="2871"> +<ol start="2872"> <li><b><a href="texmf-dist/doc/bibtex/vancouver">vancouver</a></b>:<small> Bibliographic style file for Biomedical Journals @@ -19110,7 +19115,7 @@ Variable-width multiple text columns <h2 id="letter-W">W</h2> -<ol start="2905"> +<ol start="2906"> <li><b><a href="texmf-dist/doc/fonts/wadalab">wadalab</a></b>:<small> Wadalab (Japanese) font packages @@ -19280,7 +19285,7 @@ Extend LaTeX's cross-reference system <h2 id="letter-X">X</h2> -<ol start="2927"> +<ol start="2928"> <li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small> Define commands with many optional arguments @@ -19742,7 +19747,7 @@ Tree macros using XY-Pic <h2 id="letter-Y">Y</h2> -<ol start="2990"> +<ol start="2991"> <li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small> A bundle of miscellaneous footnote packages @@ -19811,7 +19816,7 @@ Many-featured Young tableaux and Young diagrams <h2 id="letter-Z">Z</h2> -<ol start="3001"> +<ol start="3002"> <li><b><a href="texmf-dist/doc/latex/zed-csp">zed-csp</a></b>:<small> Typesetting Z and CSP format specifications diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 929418c760e..33d982a6a01 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{2019-02-23.16} +\def\texinfoversion{2019-02-28.20} % % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. @@ -5216,11 +5216,12 @@ end {% \requireopenindexfile{#1}% % Store the main index entry text (including the third arg). - \toks0 = {#2}% % If third arg is present, precede it with a space. \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% + \ifx\thirdarg\empty + \def\indextext{#2}% + \else + \def\indextext{#2\space#3}% \fi % \edef\writeto{\csname#1indfile\endcsname}% @@ -5255,13 +5256,9 @@ end } % Definition for writing index entry text. -\def\sortas#1{\ignorespaces}% +\def\sortas#1{}% -% Definition for writing index entry sort key. Should occur at the at -% the beginning of the index entry, like -% @cindex @sortas{september} \september -% The \ignorespaces takes care of following space, but there's no way -% to remove space before it. +% Definition for writing index entry sort key. { \catcode`\-=13 \gdef\indexwritesortas{% @@ -5297,10 +5294,9 @@ end \indexnonalnumdisappear \xdef\indexsortkey{}% \let\sortas=\indexwritesortas - \edef\temp{\the\toks0}% - \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas + \setbox\dummybox = \hbox{\indextext}% Execute any \sortas \ifx\indexsortkey\empty - \xdef\indexsortkey{\temp}% + \xdef\indexsortkey{\indextext}% \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi \fi }% @@ -5310,6 +5306,11 @@ end % 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}}% @@ -5418,11 +5419,6 @@ end \def\tindex {\tpindex} \def\pindex {\pgindex} -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - % Define the macros used in formatting output of the sorted index material. % @printindex causes a particular index (the ??s file) to get printed. diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 36adc5f36a6..f6df994e9f8 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -22,6 +22,7 @@ $mirrors = { 'http://mirrors.ustc.edu.cn/CTAN/' => 1 }, 'India' => { + 'http://ctan.imsc.res.in/' => 1, 'http://mirror.iopb.res.in/tex-archive/' => 1 }, 'Iran' => { |