diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/doc.html | 73 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 103 | ||||
| -rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 16 |
3 files changed, 90 insertions, 102 deletions
diff --git a/Master/doc.html b/Master/doc.html index d05044d12f0..26ccd3b3f4e 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -7769,6 +7769,12 @@ LaTeX package for typesetting extensive games. <a href="texmf-dist/doc/latex/egameps/egameps.pdf">egameps.pdf</a> </small></li> +<li id="egpeirce"><b><a href="texmf-dist/doc/latex/egpeirce/">egpeirce</a></b><small> +(<a href="https://ctan.org/pkg/egpeirce">CTAN</a>): +Draw existential graphs invented by Charles S. Peirce. +<a href="texmf-dist/doc/latex/egpeirce/egpeirce-doc.pdf">egpeirce-doc.pdf</a> +</small></li> + <li id="egplot"><b><a href="texmf-dist/doc/latex/egplot/">egplot</a></b><small> (<a href="https://ctan.org/pkg/egplot">CTAN</a>): Encapsulate Gnuplot sources in LaTeX documents. @@ -8799,7 +8805,7 @@ Extend the standard classes' size options. <h2 id="letter-F">F</h2> -<ol start="1166"> +<ol start="1167"> <li id="facsimile"><b><a href="texmf-dist/doc/latex/facsimile/">facsimile</a></b><small> (<a href="https://ctan.org/pkg/facsimile">CTAN</a>): @@ -9024,6 +9030,12 @@ Class for academic works at FEI University Center -- Brazil. <a href="texmf-dist/doc/latex/fei/fei.pdf">fei.pdf</a> (pt-br) </small></li> +<li id="fenetrecas"><b><a href="texmf-dist/doc/latex/fenetrecas/">fenetrecas</a></b><small> +(<a href="https://ctan.org/pkg/fenetrecas">CTAN</a>): +Commands for CAS-like windows (Xcas or Geogebra) in TikZ. +<a href="texmf-dist/doc/latex/fenetrecas/FenetreCas-doc.pdf">FenetreCas-doc.pdf</a> +</small></li> + <li id="fetamont"><b><a href="texmf-dist/doc/fonts/fetamont/">fetamont</a></b><small> (<a href="https://ctan.org/pkg/fetamont">CTAN</a>): Extended version of Knuth's logo typeface. @@ -10003,7 +10015,7 @@ Get first and last words of a page. <h2 id="letter-G">G</h2> -<ol start="1336"> +<ol start="1338"> <li id="g-brief"><b><a href="texmf-dist/doc/latex/g-brief/">g-brief</a></b><small> (<a href="https://ctan.org/pkg/g-brief">CTAN</a>): @@ -11053,7 +11065,7 @@ LICR macros and encoding definition files for Greek. <li id="greek-inputenc"><b><a href="texmf-dist/doc/latex/greek-inputenc/">greek-inputenc</a></b><small> (<a href="https://ctan.org/pkg/greek-inputenc">CTAN</a>): Greek encoding support for inputenc. -<a href="texmf-dist/doc/latex/greek-inputenc/greek-inputenc.html">greek-inputenc.html</a> +<a href="texmf-dist/doc/latex/greek-inputenc/greek-inputenc-doc.html">greek-inputenc-doc.html</a> <a href="texmf-dist/doc/latex/greek-inputenc/greek-utf8.pdf">greek-utf8.pdf</a> <a href="texmf-dist/doc/latex/greek-inputenc/inputenc-iso-8859-7.pdf">inputenc-iso-8859-7.pdf</a> <a href="texmf-dist/doc/latex/greek-inputenc/lgrenc.dfu.html">lgrenc.dfu.html</a> @@ -11239,7 +11251,7 @@ Bundle of classes for "La Gazette des Mathematiciens". <h2 id="letter-H">H</h2> -<ol start="1473"> +<ol start="1475"> <li id="h2020proposal"><b><a href="texmf-dist/doc/latex/h2020proposal/">h2020proposal</a></b><small> (<a href="https://ctan.org/pkg/h2020proposal">CTAN</a>): @@ -12013,7 +12025,7 @@ Basic support for multiple languages in Plain TeX. <h2 id="letter-I">I</h2> -<ol start="1576"> +<ol start="1578"> <li id="ibarra"><b><a href="texmf-dist/doc/fonts/ibarra/">ibarra</a></b><small> (<a href="https://ctan.org/pkg/ibarra">CTAN</a>): @@ -12588,7 +12600,7 @@ A two-element sans-serif font. <h2 id="letter-J">J</h2> -<ol start="1660"> +<ol start="1662"> <li id="jablantile"><b><a href="texmf-dist/doc/fonts/jablantile/">jablantile</a></b><small> (<a href="https://ctan.org/pkg/jablantile">CTAN</a>): @@ -12839,7 +12851,7 @@ A personal class for writing journals. <h2 id="letter-K">K</h2> -<ol start="1692"> +<ol start="1694"> <li id="kalendarium"><b><a href="texmf-dist/doc/latex/kalendarium/">kalendarium</a></b><small> (<a href="https://ctan.org/pkg/kalendarium">CTAN</a>): @@ -13445,7 +13457,7 @@ Key value parser with default handler support. <h2 id="letter-L">L</h2> -<ol start="1742"> +<ol start="1744"> <li id="l2picfaq"><b><a href="texmf-dist/doc/latex/l2picfaq/">l2picfaq</a></b><small> (<a href="https://ctan.org/pkg/l2picfaq">CTAN</a>): @@ -15609,7 +15621,7 @@ Commands to include lilypond scores within a (Lua)LaTeX document. <h2 id="letter-M">M</h2> -<ol start="2011"> +<ol start="2013"> <li id="m-tx"><b><a href="texmf-dist/doc/generic/m-tx/">m-tx</a></b><small> (<a href="https://ctan.org/pkg/m-tx">CTAN</a>): @@ -17290,7 +17302,7 @@ XeLaTeX template for writing the main body of NSFC proposals. <h2 id="letter-N">N</h2> -<ol start="2250"> +<ol start="2252"> <li id="na-box"><b><a href="texmf-dist/doc/xelatex/na-box/">na-box</a></b><small> (<a href="https://ctan.org/pkg/na-box">CTAN</a>): @@ -18017,7 +18029,7 @@ Support for the journal "North-Western European Journal of Mathematics". <h2 id="letter-O">O</h2> -<ol start="2349"> +<ol start="2351"> <li id="oberdiek"><b><a href="texmf-dist/doc/latex/oberdiek/">oberdiek</a></b><small> (<a href="https://ctan.org/pkg/oberdiek">CTAN</a>): @@ -18376,7 +18388,7 @@ Combine LaTeX commands over included graphics. <h2 id="letter-P">P</h2> -<ol start="2396"> +<ol start="2398"> <li id="padcount"><b><a href="texmf-dist/doc/latex/padcount/">padcount</a></b><small> (<a href="https://ctan.org/pkg/padcount">CTAN</a>): @@ -19790,6 +19802,7 @@ Macros for building proof trees. <li id="principia"><b><a href="texmf-dist/doc/latex/principia/">principia</a></b><small> (<a href="https://ctan.org/pkg/principia">CTAN</a>): Notations for typesetting the "Principia Mathematica". +<a href="texmf-dist/doc/latex/principia/List_of_Definitions.pdf">List_of_Definitions.pdf</a> <a href="texmf-dist/doc/latex/principia/principia.pdf">principia.pdf</a> </small></li> @@ -20917,7 +20930,7 @@ Run Python from within a document, typesetting the results. <h2 id="letter-Q">Q</h2> -<ol start="2750"> +<ol start="2752"> <li id="qcircuit"><b><a href="texmf-dist/doc/latex/qcircuit/">qcircuit</a></b><small> (<a href="https://ctan.org/pkg/qcircuit">CTAN</a>): @@ -21067,7 +21080,7 @@ Book Template for Qian Yuan Xue Fu. <h2 id="letter-R">R</h2> -<ol start="2771"> +<ol start="2773"> <li id="ragged2e"><b><a href="texmf-dist/doc/latex/ragged2e/">ragged2e</a></b><small> (<a href="https://ctan.org/pkg/ragged2e">CTAN</a>): @@ -21737,7 +21750,7 @@ Class for Ryerson Unversity Graduate School requirements. <h2 id="letter-S">S</h2> -<ol start="2859"> +<ol start="2861"> <li id="sa-tikz"><b><a href="texmf-dist/doc/latex/sa-tikz/">sa-tikz</a></b><small> (<a href="https://ctan.org/pkg/sa-tikz">CTAN</a>): @@ -21903,14 +21916,6 @@ Various layout styles for school documents. <li id="schule"><b><a href="texmf-dist/doc/latex/schule/">schule</a></b><small> (<a href="https://ctan.org/pkg/schule">CTAN</a>): Support for teachers at German schools. -<a href="texmf-dist/doc/latex/schule/Abbildungen/table02600-026FF.pdf">table02600-026FF.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table02700-027BF.pdf">table02700-027BF.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F000-1F02F.pdf">table1F000-1F02F.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F030-1F09F.pdf">table1F030-1F09F.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F0A0-1F0FF.pdf">table1F0A0-1F0FF.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F300-1F5FF.pdf">table1F300-1F5FF.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F600-1F64F.pdf">table1F600-1F64F.pdf</a> -<a href="texmf-dist/doc/latex/schule/Abbildungen/table1F680-1F6FF.pdf">table1F680-1F6FF.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/aufgabe-1.pdf">aufgabe-1.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/aufgabe-2.pdf">aufgabe-2.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/beispiel-ab-abbott.pdf">beispiel-ab-abbott.pdf</a> @@ -21925,12 +21930,16 @@ Support for teachers at German schools. <a href="texmf-dist/doc/latex/schule/Beispiele/bsp-beamerarticle.pdf">bsp-beamerarticle.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/bsp-geschichte.pdf">bsp-geschichte.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/bsp-vocab.pdf">bsp-vocab.pdf</a> +<a href="texmf-dist/doc/latex/schule/Beispiele/bsp_aufgabe1/bsp_aufgabe_01.pdf">bsp_aufgabe_01.pdf</a> +<a href="texmf-dist/doc/latex/schule/Beispiele/bsp_aufgabe1/zeichnung.pdf">zeichnung.pdf</a> +<a href="texmf-dist/doc/latex/schule/Beispiele/bsp_aufgabe2/bsp_aufgabe.pdf">bsp_aufgabe.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/hieroglyph-female.pdf">hieroglyph-female.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/hieroglyph-male.pdf">hieroglyph-male.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-ab-dev.pdf">minimal-ab-dev.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-ab.pdf">minimal-ab.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-ib.pdf">minimal-ib.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-ka.pdf">minimal-ka.pdf</a> +<a href="texmf-dist/doc/latex/schule/Beispiele/minimal-kl-aufgabenpool.pdf">minimal-kl-aufgabenpool.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-kl-et.pdf">minimal-kl-et.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-kl-teilpunkte.pdf">minimal-kl-teilpunkte.pdf</a> <a href="texmf-dist/doc/latex/schule/Beispiele/minimal-kl.pdf">minimal-kl.pdf</a> @@ -23247,8 +23256,8 @@ A free Times-like font. (<a href="https://ctan.org/pkg/stex">CTAN</a>): An Infrastructure for Semantic Preloading of LaTeX Documents. <a href="texmf-dist/doc/latex/stex/stex-doc.pdf">stex-doc.pdf</a> -<a href="texmf-dist/doc/latex/stex/stex-ide.pdf">stex-ide.pdf</a> <a href="texmf-dist/doc/latex/stex/stex-manual.pdf">stex-manual.pdf</a> +<a href="texmf-dist/doc/latex/stex/stex-tutorial.pdf">stex-tutorial.pdf</a> </small></li> <li id="stickstoo"><b><a href="texmf-dist/doc/fonts/stickstoo/">stickstoo</a></b><small> @@ -23634,7 +23643,7 @@ Format systems of equations. <h2 id="letter-T">T</h2> -<ol start="3129"> +<ol start="3131"> <li id="t-angles"><b><a href="texmf-dist/doc/latex/t-angles/">t-angles</a></b><small> (<a href="https://ctan.org/pkg/t-angles">CTAN</a>): @@ -26122,7 +26131,7 @@ Plot graphs with TikZ abbreviations. <h2 id="letter-U">U</h2> -<ol start="3438"> +<ol start="3440"> <li id="uaclasses"><b><a href="texmf-dist/doc/latex/uaclasses/">uaclasses</a></b><small> (<a href="https://ctan.org/pkg/uaclasses">CTAN</a>): @@ -26753,7 +26762,7 @@ University of Washington thesis class. <h2 id="letter-V">V</h2> -<ol start="3526"> +<ol start="3528"> <li id="vancouver"><b><a href="texmf-dist/doc/bibtex/vancouver/">vancouver</a></b><small> (<a href="https://ctan.org/pkg/vancouver">CTAN</a>): @@ -27026,7 +27035,7 @@ Variable-width multiple text columns. <h2 id="letter-W">W</h2> -<ol start="3565"> +<ol start="3567"> <li id="wadalab"><b><a href="texmf-dist/doc/fonts/wadalab/">wadalab</a></b><small> (<a href="https://ctan.org/pkg/wadalab">CTAN</a>): @@ -27270,7 +27279,7 @@ Extend LaTeX's cross-reference system. <h2 id="letter-X">X</h2> -<ol start="3595"> +<ol start="3597"> <li id="xargs"><b><a href="texmf-dist/doc/latex/xargs/">xargs</a></b><small> (<a href="https://ctan.org/pkg/xargs">CTAN</a>): @@ -27901,7 +27910,7 @@ Tree macros using XY-Pic. <h2 id="letter-Y">Y</h2> -<ol start="3669"> +<ol start="3671"> <li id="yafoot"><b><a href="texmf-dist/doc/latex/yafoot/">yafoot</a></b><small> (<a href="https://ctan.org/pkg/yafoot">CTAN</a>): @@ -28031,7 +28040,7 @@ Many-featured Young tableaux and Young diagrams. <h2 id="letter-Z">Z</h2> -<ol start="3687"> +<ol start="3689"> <li id="zbmath-review-template"><b><a href="texmf-dist/doc/xelatex/zbmath-review-template/">zbmath-review-template</a></b><small> (<a href="https://ctan.org/pkg/zbmath-review-template">CTAN</a>): @@ -28176,5 +28185,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 Mar 20 01:51:47 CET 2023 by tl-update-docindex.</small> +<small>Generated Wed Mar 22 01:48:41 CET 2023 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 2f11da59fb0..0b8b87c9592 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{2023-03-04.12} +\def\texinfoversion{2023-03-21.06} % % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc. % @@ -4102,7 +4102,6 @@ $$% \nobreak\kern\dimen0 \endgroup \itemxneedsnegativevskiptrue - \penalty 10021 % for \indexpar \fi } @@ -4219,7 +4218,6 @@ $$% % We can be in inner vertical mode in a footnote, although an % @itemize looks awful there. }% - \penalty 10021 % for \indexpar \flushcr } @@ -4784,17 +4782,11 @@ $$% % and it is the two-letter name of the index. \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx} -\def\doindexxxx #1{\indexpar\doind{\indexname}{#1}} +\def\doindexxxx #1{\doind{\indexname}{#1}} % like the previous two, but they put @code around the argument. \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\indexpar\docind{\indexname}{#1}} - -% End any open paragraph, unless we are immediately after @item in -% @itemize or @enumerate. -\def\indexpar{% -\ifnum\lastpenalty=10021 \else\endgraf\fi -} +\def\docodeindexxxx #1{\docind{\indexname}{#1}} % \definedummyword defines \#1 as \string\#1\space, thus effectively @@ -5351,9 +5343,7 @@ $$% % ..., ready, GO: % \def\safewhatsit#1{\ifhmode - \whatsitpenalty = \lastpenalty #1% - \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi \else % \lastskip and \lastpenalty cannot both be nonzero simultaneously. \whatsitskip = \lastskip @@ -7597,7 +7587,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \parseargusing\activeparens{\printdefunline\deflineheader}% } \def\deflineheader#1 #2 #3\endheader{% - \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% + \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% } \def\deftypeline{% \doingtypefntrue @@ -7660,14 +7650,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @deffn category name args \makedefun{deffn}#1 #2 #3\endheader{% \doind{fn}{\code{#2}}% - \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% + \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% } % @defop category class name args \makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}} \def\defopheaderx#1#2 #3 #4\endheader{% \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}% - \defname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}% + \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}% } % Typed functions: @@ -7676,7 +7666,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \makedefun{deftypefn}#1 #2 #3 #4\endheader{% \doind{fn}{\code{#3}}% \doingtypefntrue - \defname{#1}{#2}{#3}\defunargs{#4\unskip}% + \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% } % @deftypeop category class type name args @@ -7684,7 +7674,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\deftypeopheaderx#1#2 #3 #4 #5\endheader{% \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}% \doingtypefntrue - \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% + \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% } % Typed variables: @@ -7692,14 +7682,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @deftypevr category type var args \makedefun{deftypevr}#1 #2 #3 #4\endheader{% \doind{vr}{\code{#3}}% - \defname{#1}{#2}{#3}\defunargs{#4\unskip}% + \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% } % @deftypecv category class type var args \makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}} \def\deftypecvheaderx#1#2 #3 #4 #5\endheader{% \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}% - \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% + \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% } % Untyped variables: @@ -7716,7 +7706,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @deftp category name args \makedefun{deftp}#1 #2 #3\endheader{% \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% + \printdefname{#1}{}{#2}\defunargs{#3\unskip}% } % Remaining @defun-like shortcuts: @@ -7732,14 +7722,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% \makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof} \makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof} -% \defname, which formats the name of the @def (not the args). +% \printdefname, which formats the name of the @def (not the args). % #1 is the category, such as "Function". % #2 is the return type, if any. % #3 is the function name. % % We are followed by (but not passed) the arguments, if any. % -\def\defname#1#2#3{% +\def\printdefname#1#2#3{% \par % Get the values of \leftskip and \rightskip as they were outside the @def... \advance\leftskip by -\defbodyindent @@ -7864,7 +7854,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % If we encounter &foo, then turn on ()-hacking afterwards \newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} +\def\amprm#1 {\ampseentrue{\rm\ }} \def\parenfont{% \ifampseen @@ -8188,12 +8178,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% % % We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro % body to be transformed. -% Set \macrobody to the body of the macro, and call \defmacro. +% Set \macrobody to the body of the macro, and call \macrodef. % {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% % Make @ a letter, so that we can make private-to-Texinfo macro names. \edef\texiatcatcode{\the\catcode`\@} @@ -8412,16 +8402,17 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \xdef is used so that macro definitions will survive the file % they're defined in: @include reads the file inside a group. % -\def\defmacro{% +\def\macrodef{% \let\hash=##% convert placeholders to macro parameter chars \ifnum\paramno=1 - \def\xeatspaces##1{##1}% - % This removes the pair of braces around the argument. We don't - % use \eatspaces, because this can cause ends of lines to be lost - % when the argument to \eatspaces is read, leading to line-based - % commands like "@itemize" not being read correctly. + \long\def\xeatspaces##1{##1}% + % We don't use \xeatspaces for single-argument macros, because we + % want to keep ends of lines. This definition removes \xeatspaces + % when \macrobody is expanded below. \else - \let\xeatspaces\relax % suppress expansion + \def\xeatspaces{\string\xeatspaces}% + % This expands \xeatspaces as a sequence of character tokens, which + % stops \scantokens inserting an extra space after the control sequence. \fi \ifcase\paramno % 0 @@ -8590,40 +8581,35 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @linemacro \parseargdef\linemacro{% - \linegetargs#1 \linegetargs - \expandafter\linegetparamlist\argl;% + \getargs{#1}% now \macname is the macname and \argl the arglist + \ifx\argl\empty + \paramno=0 + \let\hash\relax + \def\paramlist{\hash 1\endlinemacro}% + \else + \expandafter\linegetparamlist\argl;% + \fi \begingroup \macrobodyctxt \usembodybackslash \parselinemacrobody } -% Parse the arguments to a @linemacro line. Set \macname to the name -% of the macro and \argl to the list of arguments. -\def\linegetargs#1 #2\linegetargs{% - \macname={#1}% - \def\argl{#2}% -} - % Build up \paramlist which will be used as the parameter text for the macro. % At the end it will be like "#1 #2 #3\endlinemacro". \def\linegetparamlist#1;{% \paramno=0\def\paramlist{}% - \let\hash\relax \let\xeatspaces\relax - \linegetparamlistxxx#1; % + \let\hash\relax + \linegetparamlistxxx#1,;,% } -\def\linegetparamlistxxx#1 {% +\def\linegetparamlistxxx#1,{% \if#1;\let\next=\linegetparamlistxxxx \else \let\next=\linegetparamlistxxx \advance\paramno by 1 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\noexpand\xeatspaces{\hash\the\paramno}}% + {\hash\the\paramno}% \edef\paramlist{\paramlist\hash\the\paramno\space}% \fi\next} \def\linegetparamlistxxxx{% - \ifx\paramlist\empty - \def\paramlist{\hash 1\endlinemacro}% - \else - \expandafter\fixparamlist\paramlist\fixparamlist - \fi + \expandafter\fixparamlist\paramlist\fixparamlist } % Replace final space token \def\fixparamlist#1 \fixparamlist{% @@ -8633,7 +8619,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Read the body of the macro, replacing backslash-surrounded variables % {\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{% -\let\xeatspaces\relax \xdef\macrobody{#1}% \endgroup \linemacrodef @@ -8642,26 +8627,20 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Make the definition \def\linemacrodef{% \let\hash=##% - \let\xeatspaces\relax \expandafter\xdef\csname\the\macname\endcsname{% \bgroup - \noexpand\scanctxt \noexpand\parsearg \expandafter\noexpand\csname\the\macname @@\endcsname } \expandafter\xdef\csname\the\macname @@\endcsname##1{% \egroup \expandafter\noexpand - \csname\the\macname @@@\endcsname##1 \noexpand\endlinemacro - % Note that we append a space to the macro line to terminate the last - % argument in case the final argument is empty. @xeatspaces may be needed - % to remove this space. + \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro } \expandafter\expandafter \expandafter\xdef \expandafter\expandafter\csname\the\macname @@@\endcsname\paramlist{% \newlinechar=13 % split \macrobody into lines - \let\noexpand\xeatspaces\noexpand\eatspaces \noexpand\scantokens{\macrobody}% } } @@ -9659,8 +9638,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \def\caption{\docaption\thiscaption} \def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} +\def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz} +\def\docaptionz#1#2{\egroup \def#1{#2}} % The parameter is the control sequence identifying the counter we are % going to use. Create it if it doesn't exist and assign it to \floatno. diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 789a922ea9e..1b381fbcfa4 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -16,7 +16,6 @@ $mirrors = { 'https://mirrors.cloud.tencent.com/CTAN/' => 1, 'https://mirrors.cqu.edu.cn/CTAN/' => 1, 'https://mirrors.hit.edu.cn/CTAN/' => 1, - 'https://mirrors.pku.edu.cn/ctan/' => 1, 'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, 'https://mirrors.sustech.edu.cn/CTAN/' => 1, 'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, @@ -30,7 +29,6 @@ $mirrors = { 'https://mirror.niser.ac.in/ctan/' => 1, }, 'Indonesia' => { - 'http://repo.ugm.ac.id/ctan/' => 1, 'https://mirror.unpad.ac.id/ctan/' => 1, }, 'Iran' => { @@ -40,12 +38,13 @@ $mirrors = { 'Japan' => { 'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1, 'https://ftp.jaist.ac.jp/pub/CTAN/' => 1, + 'https://ftp.kddilabs.jp/CTAN/' => 1, 'https://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1, }, 'Korea' => { 'http://ftp.ktug.org/tex-archive/' => 1, - 'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1, 'https://lab.uklee.pe.kr/tex-archive/' => 1, + 'https://mirror.kakao.com/CTAN/' => 1, 'https://mirror.navercorp.com/CTAN/' => 1, }, 'Singapore' => { @@ -94,12 +93,14 @@ $mirrors = { 'https://ctan.kako-dev.de/' => 1, 'https://ctan.mc1.root.project-creative.net/' => 1, 'https://ctan.mirror.norbert-ruehl.de/' => 1, + 'https://ctan.net/' => 1, 'https://ctan.space-pro.be/tex-archive/' => 1, 'https://ftp.agdsn.de/pub/mirrors/latex/dante/' => 1, 'https://ftp.fau.de/ctan/' => 1, 'https://ftp.gwdg.de/pub/ctan/' => 1, 'https://ftp.rrze.uni-erlangen.de/ctan/' => 1, 'https://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1, + 'https://ftp.tu-chemnitz.de/pub/tex/' => 1, 'https://mirror.clientvps.com/CTAN/' => 1, 'https://mirror.dogado.de/tex-archive/' => 1, 'https://mirror.informatik.hs-fulda.de/tex-archive/' => 1, @@ -120,6 +121,7 @@ $mirrors = { 'https://ftp.snt.utwente.nl/pub/software/tex/' => 1, 'https://mirror.koddos.net/CTAN/' => 1, 'https://mirror.lyrahosting.com/CTAN/' => 1, + 'https://mirrors.evoluso.com/CTAN/' => 1, }, 'Norway' => { 'https://ctan.uib.no/' => 1, @@ -149,6 +151,7 @@ $mirrors = { 'Spain' => { 'https://ctan.fisiquimicamente.com/' => 1, 'https://ctan.javinator9889.com/' => 1, + 'https://osl.ugr.es/CTAN/' => 1, }, 'Sweden' => { 'https://ftp.acc.umu.se/mirror/CTAN/' => 1, @@ -166,6 +169,7 @@ $mirrors = { }, 'North America' => { 'Canada' => { + 'https://ctan.math.ca/tex-archive/' => 1, 'https://ctan.mirror.globo.tech/' => 1, 'https://ctan.mirror.rafal.ca/' => 1, 'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1, @@ -181,7 +185,7 @@ $mirrors = { 'https://ctan.math.illinois.edu/' => 1, 'https://ctan.math.utah.edu/ctan/tex-archive/' => 1, 'https://ctan.math.washington.edu/tex-archive/' => 1, - 'https://ctan.mirrors.hoobly.com/' => 1, + 'https://mirror.las.iastate.edu/tex-archive/' => 1, 'https://mirror.math.princeton.edu/pub/CTAN/' => 1, 'https://mirror.mwt.me/ctan/' => 1, 'https://mirror2.sandyriver.net/pub/ctan/' => 1, @@ -191,14 +195,10 @@ $mirrors = { }, 'Oceania' => { 'Australia' => { - 'https://mirror.aarnet.edu.au/pub/CTAN/' => 1, 'https://mirror.cse.unsw.edu.au/pub/CTAN/' => 1, }, }, 'South America' => { - 'Brazil' => { - 'https://linorg.usp.br/CTAN/' => 1, - }, 'Chile' => { 'https://ctan.dcc.uchile.cl/' => 1, }, |