tl-update-auto

git-svn-id: svn://tug.org/texlive/trunk@57466 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 108 insertions, 161 deletions

diff --git a/Master/doc.html b/Master/doc.html
index 89f88d169bb..52378a2cb2e 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -71,6 +71,12 @@ Support for a5 paper sizes. 
 <a href="texmf-dist/doc/latex/a5comb/a5comb.pdf">a5comb.pdf</a>.
 </small></li>
 
+<li id="aalok"><b><a href="texmf-dist/doc/latex/aalok/">aalok</a></b><small>
+(<a href="https://ctan.org/pkg/aalok">CTAN</a>):
+LaTeX class file for the Marathi journal 'Aalok'.&nbsp;
+<a href="texmf-dist/doc/latex/aalok/aalok.pdf">aalok.pdf</a>&nbsp;(mr).
+</small></li>
+
 <li id="aastex"><b><a href="texmf-dist/doc/latex/aastex/">aastex</a></b><small>
 (<a href="https://ctan.org/pkg/aastex">CTAN</a>):
 Macros for Manuscript Preparation for AAS Journals.&nbsp;
@@ -1347,7 +1353,7 @@ Feynman diagrams in a LaTeX document.&nbsp;
 
 <h2 id="letter-B">B</h2>
 
-<ol start="175">
+<ol start="176">
 
 <li id="b1encoding"><b><a href="texmf-dist/doc/latex/b1encoding/">b1encoding</a></b><small>
 (<a href="https://ctan.org/pkg/b1encoding">CTAN</a>):
@@ -3475,7 +3481,7 @@ Create illustrations for network protocol specifications.&nbsp;
 
 <h2 id="letter-C">C</h2>
 
-<ol start="458">
+<ol start="459">
 
 <li id="c90"><b><a href="texmf-dist/doc/fonts/enc/c90/">c90</a></b><small>
 c90 font encoding for Thai.&nbsp;
@@ -5697,7 +5703,7 @@ Cyrillic bibtex and makeindex.&nbsp;
 
 <h2 id="letter-D">D</h2>
 
-<ol start="746">
+<ol start="747">
 
 <li id="dad"><b><a href="texmf-dist/doc/fonts/dad/">dad</a></b><small>
 (<a href="https://ctan.org/pkg/dad">CTAN</a>):
@@ -6774,7 +6780,7 @@ Construct Dynkin tree diagrams.&nbsp;
 
 <h2 id="letter-E">E</h2>
 
-<ol start="905">
+<ol start="906">
 
 <li id="e-french"><b><a href="texmf-dist/doc/generic/e-french/">e-french</a></b><small>
 (<a href="https://ctan.org/pkg/e-french">CTAN</a>):
@@ -8029,7 +8035,7 @@ Extend the standard classes' size options.&nbsp;
 
 <h2 id="letter-F">F</h2>
 
-<ol start="1083">
+<ol start="1084">
 
 <li id="facsimile"><b><a href="texmf-dist/doc/latex/facsimile/">facsimile</a></b><small>
 (<a href="https://ctan.org/pkg/facsimile">CTAN</a>):
@@ -9166,7 +9172,7 @@ Get first and last words of a page.&nbsp;
 
 <h2 id="letter-G">G</h2>
 
-<ol start="1241">
+<ol start="1242">
 
 <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>):
@@ -10143,7 +10149,7 @@ Bundle of classes for "La Gazette des Mathematiciens".&nbsp;
 
 <h2 id="letter-H">H</h2>
 
-<ol start="1369">
+<ol start="1370">
 
 <li id="h2020proposal"><b><a href="texmf-dist/doc/latex/h2020proposal/">h2020proposal</a></b><small>
 (<a href="https://ctan.org/pkg/h2020proposal">CTAN</a>):
@@ -10704,7 +10710,7 @@ Basic support for multiple languages in Plain TeX.&nbsp;
 
 <h2 id="letter-I">I</h2>
 
-<ol start="1441">
+<ol start="1442">
 
 <li id="ibarra"><b><a href="texmf-dist/doc/fonts/ibarra/">ibarra</a></b><small>
 (<a href="https://ctan.org/pkg/ibarra">CTAN</a>):
@@ -11233,7 +11239,7 @@ A two-element sans-serif font.&nbsp;
 
 <h2 id="letter-J">J</h2>
 
-<ol start="1518">
+<ol start="1519">
 
 <li id="jablantile"><b><a href="texmf-dist/doc/fonts/jablantile/">jablantile</a></b><small>
 (<a href="https://ctan.org/pkg/jablantile">CTAN</a>):
@@ -11429,7 +11435,7 @@ A replacement for LaTeX's verbatim package.&nbsp;
 
 <h2 id="letter-K">K</h2>
 
-<ol start="1541">
+<ol start="1542">
 
 <li id="kalendarium"><b><a href="texmf-dist/doc/latex/kalendarium/">kalendarium</a></b><small>
 (<a href="https://ctan.org/pkg/kalendarium">CTAN</a>):
@@ -11981,7 +11987,7 @@ Key value parser with default handler support.&nbsp;
 
 <h2 id="letter-L">L</h2>
 
-<ol start="1585">
+<ol start="1586">
 
 <li id="l2picfaq"><b><a href="texmf-dist/doc/latex/l2picfaq/">l2picfaq</a></b><small>
 (<a href="https://ctan.org/pkg/l2picfaq">CTAN</a>):
@@ -13703,6 +13709,12 @@ LuaTeX with just-in-time (jit) compiler, with and without HarfBuzz.&nbsp;
 <a href="texmf-dist/doc/man/man1/luajittex.man1.pdf">luajittex.man1.pdf</a>.
 </small></li>
 
+<li id="luakeys"><b><a href="texmf-dist/doc/luatex/luakeys/">luakeys</a></b><small>
+(<a href="https://ctan.org/pkg/luakeys">CTAN</a>):
+A Lua module for parsing key-value options.&nbsp;
+<a href="texmf-dist/doc/luatex/luakeys/luakeys.pdf">luakeys.pdf</a>.
+</small></li>
+
 <li id="lualatex-doc"><b><a href="texmf-dist/doc/lualatex/lualatex-doc/">lualatex-doc</a></b><small>
 (<a href="https://ctan.org/pkg/lualatex-doc">CTAN</a>):
 A guide to use of LaTeX with LuaTeX.&nbsp;
@@ -13874,7 +13886,7 @@ Commands to include lilypond scores within a (Lua)LaTeX document.&nbsp;
 
 <h2 id="letter-M">M</h2>
 
-<ol start="1820">
+<ol start="1822">
 
 <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>):
@@ -15447,7 +15459,7 @@ XeLaTeX template for writing the main body of NSFC proposals.&nbsp;
 
 <h2 id="letter-N">N</h2>
 
-<ol start="2042">
+<ol start="2044">
 
 <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>):
@@ -16066,7 +16078,7 @@ Support for the journal "North-Western European Journal of Mathematics".&nbsp;
 
 <h2 id="letter-O">O</h2>
 
-<ol start="2127">
+<ol start="2129">
 
 <li id="oberdiek"><b><a href="texmf-dist/doc/latex/oberdiek/">oberdiek</a></b><small>
 (<a href="https://ctan.org/pkg/oberdiek">CTAN</a>):
@@ -16404,7 +16416,7 @@ Combine LaTeX commands over included graphics.&nbsp;
 
 <h2 id="letter-P">P</h2>
 
-<ol start="2170">
+<ol start="2172">
 
 <li id="padcount"><b><a href="texmf-dist/doc/latex/padcount/">padcount</a></b><small>
 (<a href="https://ctan.org/pkg/padcount">CTAN</a>):
@@ -17658,6 +17670,12 @@ Typeset a three-dimensional product box.&nbsp;
 <a href="texmf-dist/doc/latex/productbox/productbox.pdf">productbox.pdf</a>.
 </small></li>
 
+<li id="profcollege"><b><a href="texmf-dist/doc/latex/profcollege/">profcollege</a></b><small>
+(<a href="https://ctan.org/pkg/profcollege">CTAN</a>):
+A LaTeX package for French maths teachers in college.&nbsp;
+<a href="texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf">ProfCollege-doc.pdf</a>&nbsp;(fr).
+</small></li>
+
 <li id="program"><b><a href="texmf-dist/doc/latex/program/">program</a></b><small>
 (<a href="https://ctan.org/pkg/program">CTAN</a>):
 Typesetting programs and algorithms.&nbsp;
@@ -18697,7 +18715,7 @@ Run Python from within a document, typesetting the results.&nbsp;
 
 <h2 id="letter-Q">Q</h2>
 
-<ol start="2493">
+<ol start="2496">
 
 <li id="qcircuit"><b><a href="texmf-dist/doc/latex/qcircuit/">qcircuit</a></b><small>
 (<a href="https://ctan.org/pkg/qcircuit">CTAN</a>):
@@ -18837,7 +18855,7 @@ Book Template for Qian Yuan Xue Fu.&nbsp;
 
 <h2 id="letter-R">R</h2>
 
-<ol start="2513">
+<ol start="2516">
 
 <li id="ragged2e"><b><a href="texmf-dist/doc/latex/ragged2e/">ragged2e</a></b><small>
 (<a href="https://ctan.org/pkg/ragged2e">CTAN</a>):
@@ -19465,7 +19483,7 @@ Class for Ryerson Unversity Graduate School requirements.&nbsp;
 
 <h2 id="letter-S">S</h2>
 
-<ol start="2595">
+<ol start="2598">
 
 <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>):
@@ -21222,7 +21240,7 @@ Format systems of equations.&nbsp;
 
 <h2 id="letter-T">T</h2>
 
-<ol start="2838">
+<ol start="2841">
 
 <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>):
@@ -23445,7 +23463,7 @@ Print a typographic grid.&nbsp;
 
 <h2 id="letter-U">U</h2>
 
-<ol start="3110">
+<ol start="3113">
 
 <li id="uaclasses"><b><a href="texmf-dist/doc/latex/uaclasses/">uaclasses</a></b><small>
 (<a href="https://ctan.org/pkg/uaclasses">CTAN</a>):
@@ -23955,7 +23973,7 @@ University of Washington thesis class.&nbsp;
 
 <h2 id="letter-V">V</h2>
 
-<ol start="3183">
+<ol start="3186">
 
 <li id="vancouver"><b><a href="texmf-dist/doc/bibtex/vancouver/">vancouver</a></b><small>
 (<a href="https://ctan.org/pkg/vancouver">CTAN</a>):
@@ -24221,7 +24239,7 @@ Variable-width multiple text columns.&nbsp;
 
 <h2 id="letter-W">W</h2>
 
-<ol start="3221">
+<ol start="3224">
 
 <li id="wadalab"><b><a href="texmf-dist/doc/fonts/wadalab/">wadalab</a></b><small>
 (<a href="https://ctan.org/pkg/wadalab">CTAN</a>):
@@ -24428,7 +24446,7 @@ Extend LaTeX's cross-reference system.&nbsp;
 
 <h2 id="letter-X">X</h2>
 
-<ol start="3245">
+<ol start="3248">
 
 <li id="xargs"><b><a href="texmf-dist/doc/latex/xargs/">xargs</a></b><small>
 (<a href="https://ctan.org/pkg/xargs">CTAN</a>):
@@ -25024,7 +25042,7 @@ Tree macros using XY-Pic.&nbsp;
 
 <h2 id="letter-Y">Y</h2>
 
-<ol start="3315">
+<ol start="3318">
 
 <li id="yafoot"><b><a href="texmf-dist/doc/latex/yafoot/">yafoot</a></b><small>
 (<a href="https://ctan.org/pkg/yafoot">CTAN</a>):
@@ -25126,7 +25144,7 @@ Many-featured Young tableaux and Young diagrams.&nbsp;
 
 <h2 id="letter-Z">Z</h2>
 
-<ol start="3329">
+<ol start="3332">
 
 <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>):
@@ -25225,5 +25243,5 @@ Standard conforming typesetting of Japanese, for XeLaTeX.&nbsp;
 
 <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 Jan 18 01:53:59 CET 2021 by tl-update-docindex.</small>
+<small>Generated Tue Jan 19 01:54:34 CET 2021 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 3c7051d1c74..dac7ae3d199 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-10-24.12}
+\def\texinfoversion{2020-11-25.18}
 %
 % Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc.
 %
@@ -572,10 +572,9 @@
   \fi
 }
 
-% @end foo executes the definition of \Efoo.
-% But first, it executes a specialized version of \checkenv
-%
-\parseargdef\end{%
+
+% @end foo calls \checkenv and executes the definition of \Efoo.
+\parseargdef\end{
   \if 1\csname iscond.#1\endcsname
   \else
     % The general wording of \badenverr may not be ideal.
@@ -2673,8 +2672,6 @@ end
 \definetextfontsizexi
 
 
-\message{markup,}
-
 % Check if we are currently using a typewriter font.  Since all the
 % Computer Modern typewriter fonts have zero interword stretch (and
 % shrink), and it is reasonable to expect all typewriter fonts to have
@@ -2682,68 +2679,14 @@ end
 %
 \def\ifmonospace{\ifdim\fontdimen3\font=0pt }
 
-% Markup style infrastructure.  \defmarkupstylesetup\INITMACRO will
-% define and register \INITMACRO to be called on markup style changes.
-% \INITMACRO can check \currentmarkupstyle for the innermost
-% style.
-
-\let\currentmarkupstyle\empty
-
-\def\setupmarkupstyle#1{%
-  \def\currentmarkupstyle{#1}%
-  \markupstylesetup
-}
-
-\let\markupstylesetup\empty
-
-\def\defmarkupstylesetup#1{%
-  \expandafter\def\expandafter\markupstylesetup
-    \expandafter{\markupstylesetup #1}%
-  \def#1%
-}
-
-% Markup style setup for left and right quotes.
-\defmarkupstylesetup\markupsetuplq{%
-  \expandafter\let\expandafter \temp
-    \csname markupsetuplq\currentmarkupstyle\endcsname
-  \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
-}
-
-\defmarkupstylesetup\markupsetuprq{%
-  \expandafter\let\expandafter \temp
-    \csname markupsetuprq\currentmarkupstyle\endcsname
-  \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
-}
-
 {
 \catcode`\'=\active
 \catcode`\`=\active
 
-\gdef\markupsetuplqdefault{\let`\lq}
-\gdef\markupsetuprqdefault{\let'\rq}
-
-\gdef\markupsetcodequoteleft{\let`\codequoteleft}
-\gdef\markupsetcodequoteright{\let'\codequoteright}
+\gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright}
+\gdef\setregularquotes{\let`\lq \let'\rq}
 }
 
-\let\markupsetuplqcode \markupsetcodequoteleft
-\let\markupsetuprqcode \markupsetcodequoteright
-%
-\let\markupsetuplqexample \markupsetcodequoteleft
-\let\markupsetuprqexample \markupsetcodequoteright
-%
-\let\markupsetuplqkbd     \markupsetcodequoteleft
-\let\markupsetuprqkbd     \markupsetcodequoteright
-%
-\let\markupsetuplqsamp \markupsetcodequoteleft
-\let\markupsetuprqsamp \markupsetcodequoteright
-%
-\let\markupsetuplqverb \markupsetcodequoteleft
-\let\markupsetuprqverb \markupsetcodequoteright
-%
-\let\markupsetuplqverbatim \markupsetcodequoteleft
-\let\markupsetuprqverbatim \markupsetcodequoteright
-
 % Allow an option to not use regular directed right quote/apostrophe
 % (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
 % The undirected quote is ugly, so don't make it the default, but it
@@ -2906,7 +2849,7 @@ end
 }
 
 % @samp.
-\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
+\def\samp#1{{\setcodequotes\lq\tclose{#1}\rq\null}}
 
 % @indicateurl is \samp, that is, with quotes.
 \let\indicateurl=\samp
@@ -2949,8 +2892,7 @@ end
   \global\let'=\rq \global\let`=\lq  % default definitions
   %
   \global\def\code{\begingroup
-    \setupmarkupstyle{code}%
-    % The following should really be moved into \setupmarkupstyle handlers.
+    \setcodequotes
     \catcode\dashChar=\active  \catcode\underChar=\active
     \ifallowcodebreaks
      \let-\codedash
@@ -3104,7 +3046,7 @@ end
   \urefcatcodes
   %
   \global\def\urefcode{\begingroup
-    \setupmarkupstyle{code}%
+    \setcodequotes
     \urefcatcodes
     \let&\urefcodeamp
     \let.\urefcodedot
@@ -3225,8 +3167,8 @@ end
 \def\kbdsub#1#2#3\par{%
   \def\one{#1}\def\three{#3}\def\threex{??}%
   \ifx\one\xkey\ifx\threex\three \key{#2}%
-  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+  \else{\tclose{\kbdfont\setcodequotes\look}}\fi
+  \else{\tclose{\kbdfont\setcodequotes\look}}\fi
 }
 
 % definition of @key that produces a lozenge.  Doesn't adjust to text size.
@@ -3243,7 +3185,7 @@ end
 % monospace, don't change it; that way, we respect @kbdinputstyle.  But
 % if it isn't monospace, then use \tt.
 %
-\def\key#1{{\setupmarkupstyle{key}%
+\def\key#1{{\setregularquotes
   \nohyphenation
   \ifmonospace\else\tt\fi
   #1}\null}
@@ -3373,16 +3315,20 @@ end
 {\obeylines
 \globaldefs=1
 \envdef\displaymath{%
-\tex
+\tex%
 \def\thisenv{\displaymath}%
+\begingroup\let\end\displaymathend%
 $$%
 }
 
-\def\Edisplaymath{$$
+\def\displaymathend{$$\endgroup\end}%
+
+\def\Edisplaymath{%
 \def\thisenv{\tex}%
 \end tex
 }}
 
+
 % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
 % Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
 % except specified as a normal braced arg, so no newlines to worry about.
@@ -7144,7 +7090,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % But \@ or @@ will get a plain @ character.
 
 \envdef\tex{%
-  \setupmarkupstyle{tex}%
+  \setregularquotes
   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
   \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
@@ -7370,7 +7316,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % If you want all examples etc. small: @set dispenvsize small.
 % If you want even small examples the full size: @set dispenvsize nosmall.
 % This affects the following displayed environments:
-%    @example, @display, @format, @lisp
+%    @example, @display, @format, @lisp, @verbatim
 %
 \def\smallword{small}
 \def\nosmallword{nosmall}
@@ -7416,9 +7362,9 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 %
 \maketwodispenvdef{lisp}{example}{%
   \nonfillstart
-  \tt\setupmarkupstyle{example}%
+  \tt\setcodequotes
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble % eat return
+  \parsearg\gobble
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
@@ -7576,7 +7522,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \def\setupverb{%
   \tt  % easiest (and conventionally used) font for verbatim
   \def\par{\leavevmode\endgraf}%
-  \setupmarkupstyle{verb}%
+  \setcodequotes
   \tabeightspaces
   % Respect line breaks,
   % print special symbols as themselves, and
@@ -7617,7 +7563,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \tt % easiest (and conventionally used) font for verbatim
   \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}%
   \tabexpand
-  \setupmarkupstyle{verbatim}%
+  \setcodequotes
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count.
@@ -8036,7 +7982,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   % leave the code in, but it's strange for @var to lead to typewriter.
   % Nowadays we recommend @code, since the difference between a ttsl hyphen
   % and a tt hyphen is pretty tiny.  @code also disables ?` !`.
-  \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
+  \def\var##1{{\setregularquotes\ttslanted{##1}}}%
   #1%
   \sl\hyphenchar\font=45
 }
@@ -8145,11 +8091,18 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   }
 \fi
 
+\let\E=\expandafter
+
 % Used at the time of macro expansion.
 % Argument is macro body with arguments substituted
 \def\scanmacro#1{%
   \newlinechar`\^^M
-  \def\xeatspaces{\eatspaces}%
+  % expand the expansion of \eatleadingcr twice to maybe remove a leading
+  % newline (and \else and \fi tokens), then call \eatspaces on the result.
+  \def\xeatspaces##1{%
+    \E\E\E\E\E\E\E\eatspaces\E\E\E\E\E\E\E{\eatleadingcr##1%
+  }}%
+  \def\xempty##1{}%
   %
   % Process the macro body under the current catcode regime.
   \scantokens{#1@comment}%
@@ -8202,6 +8155,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \unbrace{\gdef\trim@@@ #1 } #2@{#1}
 }
 
+{\catcode`\^^M=\other%
+\gdef\eatleadingcr#1{\if\noexpand#1\noexpand^^M\else\E#1\fi}}%
+% Warning: this won't work for a delimited argument
+% or for an empty argument
+
 % Trim a single trailing ^^M off a string.
 {\catcode`\^^M=\other \catcode`\Q=3%
 \gdef\eatcr #1{\eatcra #1Q^^MQ}%
@@ -8368,6 +8326,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \let\hash\relax
   % \hash is redefined to `#' later to get it into definitions
   \let\xeatspaces\relax
+  \let\xempty\relax
   \parsemargdefxxx#1,;,%
   \ifnum\paramno<10\relax\else
     \paramno0\relax
@@ -8379,9 +8338,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \else \let\next=\parsemargdefxxx
     \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\xeatspaces{\hash\the\paramno}}%
+        {\xeatspaces{\hash\the\paramno\noexpand\xempty{}}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
+% the \xempty{} is to give \eatleadingcr an argument in the case of an
+% empty macro argument.
 
 % \parsemacbody, \parsermacbody
 %
@@ -9107,20 +9068,22 @@ might help (with 'rm \jobname.?? \jobname.??s')%
       % output the `[mynode]' via the macro below so it can be overridden.
       \xrefprintnodename\printedrefname
       %
-      % But we always want a comma and a space:
-      ,\space
-      %
-      % output the `page 3'.
-      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-      % Add a , if xref followed by a space
-      \if\space\noexpand\tokenafterxref ,%
-      \else\ifx\	\tokenafterxref ,% @TAB
-      \else\ifx\*\tokenafterxref ,%   @*
-      \else\ifx\ \tokenafterxref ,%   @SPACE
-      \else\ifx\
-                \tokenafterxref ,%    @NL
-      \else\ifx\tie\tokenafterxref ,% @tie
-      \fi\fi\fi\fi\fi\fi
+      \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax
+        % But we always want a comma and a space:
+        ,\space
+        %
+        % output the `page 3'.
+        \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
+        % Add a , if xref followed by a space
+        \if\space\noexpand\tokenafterxref ,%
+        \else\ifx\	\tokenafterxref ,% @TAB
+        \else\ifx\*\tokenafterxref ,%   @*
+        \else\ifx\ \tokenafterxref ,%   @SPACE
+        \else\ifx\
+                  \tokenafterxref ,%    @NL
+        \else\ifx\tie\tokenafterxref ,% @tie
+        \fi\fi\fi\fi\fi\fi
+      \fi
     \fi\fi
   \fi
   \endlink
@@ -9550,7 +9513,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
   \normalturnoffactive  % allow _ et al. in names
-  \def\xprocessmacroarg{\eatspaces}% in case we are being used via a macro
+  \makevalueexpandable
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue
@@ -11603,7 +11566,7 @@ directory should work if nowhere else does.}
   \let> = \activegtr
   \let~ = \activetilde
   \let^ = \activehat
-  \markupsetuplqdefault \markupsetuprqdefault
+  \setregularquotes
   \let\b = \strong
   \let\i = \smartitalic
   % in principle, all other definitions in \tex have to be undone too.
@@ -11662,8 +11625,7 @@ directory should work if nowhere else does.}
    @let|=@normalverticalbar
    @let~=@normaltilde
    @let\=@ttbackslash
-   @markupsetuplqdefault
-   @markupsetuprqdefault
+   @setregularquotes
    @unsepspaces
  }
 }
@@ -11756,8 +11718,7 @@ directory should work if nowhere else does.}
 @c Do this last of all since we use ` in the previous @catcode assignments.
 @catcode`@'=@active
 @catcode`@`=@active
-@markupsetuplqdefault
-@markupsetuprqdefault
+@setregularquotes
 
 @c Local variables:
 @c eval: (add-hook 'before-save-hook 'time-stamp)
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 5fe7f188e57..7c79c31de1e 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -1,15 +1,7 @@
 $mirrors = {
   'Africa' => {
-    'Algeria' => {
-      'http://ctan.epst-tlemcen.dz/tex-archive/' => 1,
-    },
-    'Morocco' => {
-      'https://mirror.marwan.ma/ctan/' => 1,
-    },
     'South Africa' => {
-      'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
       'http://mirror.ufs.ac.za/ctan/' => 1,
-      'https://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1,
     },
   },
   'Asia' => {
@@ -19,17 +11,13 @@ $mirrors = {
       'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
       'https://mirrors.cqu.edu.cn/CTAN/' => 1,
       'https://mirrors.dgut.edu.cn/CTAN/' => 1,
-      'https://mirrors.hit.edu.cn/CTAN/' => 1,
+      'https://mirrors.nju.edu.cn/CTAN/' => 1,
       'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
-      'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
       'https://mirrors.ustc.edu.cn/CTAN/' => 1,
     },
     'Hong Kong' => {
       'https://mirror-hk.koddos.net/CTAN/' => 1,
     },
-    'India' => {
-      'http://ctan.imsc.res.in/' => 1,
-    },
     'Indonesia' => {
       'https://mirror.unpad.ac.id/ctan/' => 1,
     },
@@ -39,20 +27,17 @@ $mirrors = {
     },
     'Japan' => {
       'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
-      'http://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.kaist.ac.kr/pub/tex-archive/' => 1,
       'http://ftp.ktug.org/tex-archive/' => 1,
+      'https://cran.asia/tex/' => 1,
       'https://ftp.harukasan.org/CTAN/' => 1,
       'https://mirror.navercorp.com/CTAN/' => 1,
       'https://mirror.yongbok.net/ctan/' => 1,
     },
-    'Singapore' => {
-      'https://download.nus.edu.sg/mirror/ctan/' => 1,
-    },
   },
   'Europe' => {
     'Austria' => {
@@ -74,12 +59,9 @@ $mirrors = {
       'https://www.texlive.info/CTAN/' => 1,
     },
     'France' => {
-      'http://ctan.mines-albi.fr/' => 1,
       'https://ctan.crest.fr/tex-archive/' => 1,
-      'https://ctan.gutenberg.eu.org/' => 1,
       'https://ctan.tetaneutral.net/' => 1,
       'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
-      'https://mirror.ibcp.fr/pub/CTAN/' => 1,
       'https://mirrors.chevalier.io/CTAN/' => 1,
       'https://mirrors.ircam.fr/pub/CTAN/' => 1,
     },
@@ -94,13 +76,11 @@ $mirrors = {
       '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.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,
       'https://packages.oth-regensburg.de/ctan/' => 1,
     },
@@ -108,9 +88,6 @@ $mirrors = {
       'http://ftp.ntua.gr/mirror/ctan/' => 1,
       'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
     },
-    'Hungary' => {
-      'https://mirror.szerverem.hu/ctan/' => 1,
-    },
     'Italy' => {
       'https://ctan.mirror.garr.it/mirrors/ctan/' => 1,
     },
@@ -136,7 +113,6 @@ $mirrors = {
     },
     'Russia' => {
       'http://ctan.altspu.ru/' => 1,
-      'http://mirror.macomnet.net/pub/CTAN/' => 1,
       'http://mirrors.mi.ras.ru/CTAN/' => 1,
       'https://mirror.truenetwork.ru/CTAN/' => 1,
     },
@@ -146,10 +122,6 @@ $mirrors = {
     'Slovenia' => {
       'http://ctan.ijs.si/tex-archive/' => 1,
     },
-    'Spain' => {
-      'https://ctan.javinator9889.com/' => 1,
-      'https://osl.ugr.es/CTAN/' => 1,
-    },
     'Sweden' => {
       'https://ftp.acc.umu.se/mirror/CTAN/' => 1,
       'https://ftpmirror1.infania.net/mirror/CTAN/' => 1,
@@ -165,21 +137,17 @@ $mirrors = {
     'Canada' => {
       'http://ctan.mirror.colo-serv.net/' => 1,
       'http://ctan.mirror.globo.tech/' => 1,
-      'http://ctan.mirror.rafal.ca/' => 1,
       'https://ctan.math.ca/tex-archive/' => 1,
       'https://mirror.its.dal.ca/ctan/' => 1,
-      'https://muug.ca/mirror/ctan/' => 1,
     },
     'Costa Rica' => {
       'https://mirrors.ucr.ac.cr/CTAN/' => 1,
     },
     'USA' => {
       'http://ctan.math.utah.edu/ctan/tex-archive/' => 1,
-      'http://ctan.math.washington.edu/tex-archive/' => 1,
       'http://ctan.mirrors.hoobly.com/' => 1,
       'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
       'https://ctan.math.illinois.edu/' => 1,
-      'https://mirror.las.iastate.edu/tex-archive/' => 1,
       'https://mirrors.concertpass.com/tex-archive/' => 1,
       'https://mirrors.rit.edu/CTAN/' => 1,
     },