texlive[50345] trunk: tl-update-auto
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 12 02:23:47 CET 2019
Revision: 50345
http://tug.org/svn/texlive?view=revision&revision=50345
Author: karl
Date: 2019-03-12 02:23:47 +0100 (Tue, 12 Mar 2019)
Log Message:
-----------
tl-update-auto
Modified Paths:
--------------
trunk/Build/source/build-aux/texinfo.tex
trunk/Master/doc.html
trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
trunk/Master/tlpkg/installer/ctan-mirrors.pl
Modified: trunk/Build/source/build-aux/texinfo.tex
===================================================================
--- trunk/Build/source/build-aux/texinfo.tex 2019-03-12 01:18:12 UTC (rev 50344)
+++ trunk/Build/source/build-aux/texinfo.tex 2019-03-12 01:23:47 UTC (rev 50345)
@@ -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-03-07.19}
+\def\texinfoversion{2019-03-09.13}
%
% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
@@ -387,7 +387,7 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
+ \atdummies % don't expand commands in the output.
\turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
@@ -4852,24 +4852,9 @@
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
-\def\indexdummies{%
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
- \otherbackslash
-}
-
-% Used for the aux and toc files, where @ is the escape character.
-%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
@@ -4898,8 +4883,7 @@
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -5212,8 +5196,6 @@
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
% #1 is the index name, #2 is the entry text.
\def\doind#1#2{%
\iflinks
@@ -5256,6 +5238,9 @@
\xdef\indexsortkey{#1}\endgroup}
}
+% The default definition
+\def\sortas#1{}%
+
% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
% * Set \bracedtext to "{aaa}{bbb}"
% * Set \fullindexsortkey to "aaa @subentry ZZZ"
@@ -5275,7 +5260,6 @@
%
% Fully expand the segment, throwing away any @sortas directives, and
% trim spaces.
- \def\sortas##1{}%
\edef\trimmed{\segment}%
\edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
%
@@ -5317,6 +5301,7 @@
\fi
}
\def\isfinish{\finish}%
+\newbox\dummybox % used above
\let\subentry\relax
@@ -5323,14 +5308,14 @@
% Write the entry in \toks0 to the index file.
%
\def\doindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
- \fi
+ \maybemarginindex
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
+ \atdummies
%
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ %
% Split the entry into primary entry and any subentries, and get the index
% sort key.
\splitindexentry\indextext
@@ -5347,8 +5332,16 @@
}%
\temp
}
-\newbox\dummybox % used above
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
+
% Take care of unwanted page breaks/skips around a whatsit:
%
% If a skip is the last thing on the list now, preserve it
@@ -8048,9 +8041,6 @@
% alias because \c means cedilla in @tex or @math
\let\texinfoc=\c
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
@@ -8057,24 +8047,11 @@
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
\scantokens{#1 at texinfoc}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
% The \texinfoc is to remove the \newlinechar added by \scantokens, and
% can be noticed by \parsearg.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
}
% Used for copying and captions
Modified: trunk/Master/doc.html
===================================================================
--- trunk/Master/doc.html 2019-03-12 01:18:12 UTC (rev 50344)
+++ trunk/Master/doc.html 2019-03-12 01:23:47 UTC (rev 50345)
@@ -4323,8 +4323,9 @@
<a href="texmf-dist/doc/support/ctan_chk/ctan_chk.pdf">ctan_chk.pdf</a>.
</small></li>
-<li><b><a href="texmf-dist/doc/support/ctanbib">ctanbib</a></b>:<small>
+<li><b><a href="texmf-dist/doc/man/man1">ctanbib</a></b>:<small>
Export CTAN entries to bib format
+<a href="texmf-dist/doc/man/man1/ctanbib.man1.pdf">ctanbib.man1.pdf</a>,
<a href="texmf-dist/doc/support/ctanbib/ctanbib-doc.pdf">ctanbib-doc.pdf</a>.
</small></li>
Modified: trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
===================================================================
--- trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2019-03-12 01:18:12 UTC (rev 50344)
+++ trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2019-03-12 01:23:47 UTC (rev 50345)
@@ -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-03-07.19}
+\def\texinfoversion{2019-03-09.13}
%
% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
@@ -387,7 +387,7 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
+ \atdummies % don't expand commands in the output.
\turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
@@ -4852,24 +4852,9 @@
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
-\def\indexdummies{%
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
- \otherbackslash
-}
-
-% Used for the aux and toc files, where @ is the escape character.
-%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
@@ -4898,8 +4883,7 @@
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -5212,8 +5196,6 @@
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
% #1 is the index name, #2 is the entry text.
\def\doind#1#2{%
\iflinks
@@ -5256,6 +5238,9 @@
\xdef\indexsortkey{#1}\endgroup}
}
+% The default definition
+\def\sortas#1{}%
+
% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
% * Set \bracedtext to "{aaa}{bbb}"
% * Set \fullindexsortkey to "aaa @subentry ZZZ"
@@ -5275,7 +5260,6 @@
%
% Fully expand the segment, throwing away any @sortas directives, and
% trim spaces.
- \def\sortas##1{}%
\edef\trimmed{\segment}%
\edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
%
@@ -5317,6 +5301,7 @@
\fi
}
\def\isfinish{\finish}%
+\newbox\dummybox % used above
\let\subentry\relax
@@ -5323,14 +5308,14 @@
% Write the entry in \toks0 to the index file.
%
\def\doindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
- \fi
+ \maybemarginindex
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
+ \atdummies
%
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ %
% Split the entry into primary entry and any subentries, and get the index
% sort key.
\splitindexentry\indextext
@@ -5347,8 +5332,16 @@
}%
\temp
}
-\newbox\dummybox % used above
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
+
% Take care of unwanted page breaks/skips around a whatsit:
%
% If a skip is the last thing on the list now, preserve it
@@ -8048,9 +8041,6 @@
% alias because \c means cedilla in @tex or @math
\let\texinfoc=\c
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
@@ -8057,24 +8047,11 @@
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
\scantokens{#1 at texinfoc}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
% The \texinfoc is to remove the \newlinechar added by \scantokens, and
% can be noticed by \parsearg.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
}
% Used for copying and captions
Modified: trunk/Master/tlpkg/installer/ctan-mirrors.pl
===================================================================
--- trunk/Master/tlpkg/installer/ctan-mirrors.pl 2019-03-12 01:18:12 UTC (rev 50344)
+++ trunk/Master/tlpkg/installer/ctan-mirrors.pl 2019-03-12 01:23:47 UTC (rev 50345)
@@ -1,5 +1,8 @@
$mirrors = {
'Africa' => {
+ 'Algeria' => {
+ 'http://ctan.epst-tlemcen.dz/tex-archive/' => 1
+ },
'South Africa' => {
'http://ctan.mirror.ac.za/' => 1,
'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1,
@@ -29,7 +32,6 @@
'http://repo.iut.ac.ir/tex-archive/' => 1
},
'Japan' => {
- 'ftp://ftp.kddilabs.jp/CTAN/' => 1,
'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
'http://ftp.jaist.ac.jp/pub/CTAN/' => 1,
'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1
@@ -106,8 +108,7 @@
},
'Poland' => {
'ftp://ftp.gust.org.pl/TeX/' => 1,
- 'ftp://sunsite.icm.edu.pl/pub/CTAN/' => 1,
- 'http://piotrkosoft.net/pub/mirrors/CTAN/' => 1
+ 'ftp://sunsite.icm.edu.pl/pub/CTAN/' => 1
},
'Portugal' => {
'ftp://ftp.di.uminho.pt/pub/ctan/' => 1,
More information about the tex-live-commits
mailing list