summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/base/changes.txt19
-rw-r--r--Master/texmf-dist/doc/latex/base/docstrip.pdfbin471287 -> 471561 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/inputenc.pdfbin295320 -> 295313 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexchanges.pdfbin380138 -> 380648 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexchanges.tex7
-rw-r--r--Master/texmf-dist/doc/latex/base/lppl.tex (renamed from Master/texmf-dist/tex/latex/base/lppl.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/base/source2e.pdfbin2801648 -> 2802120 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/source2e.tex (renamed from Master/texmf-dist/tex/latex/base/source2e.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/tools/changes.txt6
-rw-r--r--Master/texmf-dist/doc/latex/tools/multicol.pdfbin488998 -> 489090 bytes
-rw-r--r--Master/texmf-dist/source/latex/base/docstrip.dtx20
-rw-r--r--Master/texmf-dist/source/latex/base/inputenc.dtx2
-rw-r--r--Master/texmf-dist/source/latex/base/ltclass.dtx8
-rw-r--r--Master/texmf-dist/source/latex/base/ltcounts.dtx4
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx12
-rw-r--r--Master/texmf-dist/tex/latex/base/docstrip.tex12
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx3
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty1
-rw-r--r--Master/texmf-dist/tex/latex/base/utf8-test.tex78
-rw-r--r--Master/texmf-dist/tex/latex/base/utf8test.tex78
-rw-r--r--Master/texmf-dist/tex/latex/tools/.tex41
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty6
23 files changed, 82 insertions, 217 deletions
diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index e476e3e1cf9..9e399e28b5d 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -5,6 +5,23 @@ are not part of the distribution.
=======================================================================
#########################
+# 2018-04-01 PL 3 Release
+#########################
+
+2018-04-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * ltcounts.dtx: added missing '.' in default for \the<counter>
+ when using \counterwithin (issue/38)
+
+2018-04-10 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * docstrip.dtx (subsection{Batchfile commands}): Read 8bit input
+ raw to leave high bits in the code to unchanged without utf8
+ handling (issue 34)
+ Without this change a dtx file with 8bit chars in the code need to
+ have \UseRawInputEncoding in the .ins file to work.
+
+#########################
# 2018-04-01 PL 2 Release
#########################
@@ -192,7 +209,7 @@ are not part of the distribution.
* ltoutenc.dtx: Guard against empty base in
\DeclareTextCompositeCommand, and \add@unicode@accent.
- Declare \^{} and \~{} in tuenc.def.
+ Declare \^{} and \~{} in tuenc.def.
Declare \textquotesingle, \textasciigrave and
\textquotedbl for TU encoding (\remove@tlig version)
diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf
index 504636200a5..b1e85f80c6c 100644
--- a/Master/texmf-dist/doc/latex/base/docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf
index fee02756fcf..220f88954f1 100644
--- a/Master/texmf-dist/doc/latex/base/inputenc.pdf
+++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.pdf b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
index 01c1d7b9e00..c9488d7d0ac 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.tex b/Master/texmf-dist/doc/latex/base/latexchanges.tex
index 9f2ed646c28..909df8a974f 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.tex
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.tex
@@ -72,6 +72,13 @@ policy. Improvements and bug fixes will be made to the format sources,
with the \Lpack{latexrelease} package being available to revert
changes to use definitions from an earlier format.
+\section{Changes introduced in 2018-04-01 patch~3}
+Additional adjustments for GitHub issues 34 and 38, adjustment to the
+location of some documentation files, such as \texttt{source2e.tex} to
+be installed in the documentation sources not the default \TeX\ input
+tree.
+
+
\section{Changes introduced in 2018-04-01 patch~2}
Additional adjustments for GitHub issues 32 and 33.
diff --git a/Master/texmf-dist/tex/latex/base/lppl.tex b/Master/texmf-dist/doc/latex/base/lppl.tex
index bf0da5c7bb6..bf0da5c7bb6 100644
--- a/Master/texmf-dist/tex/latex/base/lppl.tex
+++ b/Master/texmf-dist/doc/latex/base/lppl.tex
diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf
index 7c7e5b8abc7..31626655195 100644
--- a/Master/texmf-dist/doc/latex/base/source2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/source2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/base/source2e.tex b/Master/texmf-dist/doc/latex/base/source2e.tex
index 79b9a7f5db9..79b9a7f5db9 100644
--- a/Master/texmf-dist/tex/latex/base/source2e.tex
+++ b/Master/texmf-dist/doc/latex/base/source2e.tex
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index 58324da2608..a18fa532a38 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2018-04-20 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * multicol.dtx: restoring column status when leaving a boxed
+ multicols so that any further \docolaction will know the
+ currect column (issue/39)
+
2018-04-07 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
* array.dtx: Renamed internal \mcell@box to
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index 926bf2d2107..ce12881674e 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx
index cedf3c4a381..29afc6f6267 100644
--- a/Master/texmf-dist/source/latex/base/docstrip.dtx
+++ b/Master/texmf-dist/source/latex/base/docstrip.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2017
+% Copyright 1993-2018
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -29,9 +29,9 @@
\catcode`\{=1
\catcode`\}=2
\def\filename{docstrip.dtx}
-\def\fileversion{2.5e}
-\def\filedate{2014/09/29}
-\def\docdate {2017/03/13}
+\def\fileversion{2.5f}
+\def\filedate{2018/04/10}
+\def\docdate {2018/04/10}
%%
%
%\iffalse
@@ -3034,6 +3034,18 @@ Z
\makeOther\~\makeOther\{\makeOther\}\makeOther\&%
\endlinechar-1\relax
% \end{macrocode}
+% To avoid any UTF-8 handling of characters we set code points
+% 128--255 to other.
+% \changes{2.5f}{2018/04/10}{Read 8bit raw to leave high bits in the
+% code to unchanged without utf8 handling (issue 34)}
+% \begin{macrocode}
+ \@tempcnta=128\relax
+ \loop
+ \catcode\@tempcnta 12\relax
+ \ifnum\@tempcnta <255\relax
+ \advance\@tempcnta\@ne
+ \repeat
+% \end{macrocode}
% Then we start a loop to process the lines in the file one by one.
% \begin{macrocode}
\loop
diff --git a/Master/texmf-dist/source/latex/base/inputenc.dtx b/Master/texmf-dist/source/latex/base/inputenc.dtx
index c88d488b482..32a20cc600b 100644
--- a/Master/texmf-dist/source/latex/base/inputenc.dtx
+++ b/Master/texmf-dist/source/latex/base/inputenc.dtx
@@ -647,7 +647,7 @@
\else
% \end{macrocode}
% Unicode based TeX engines do not require this package at all, and always use UTF-8
-% input. Allow the package to be used if |[uf8]| or |[ascii]| options are used to simplify
+% input. Allow the package to be used if |[utf8]| or |[ascii]| options are used to simplify
% switching between TeX engines.
% \begin{macrocode}
\def\inputencoding#1{%
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 4c383a6e6df..63c66a16b32 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2018/04/08 v1.2h LaTeX Kernel (Class & Package Interface)]
+ [2018/04/10 v1.2h LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -1951,7 +1951,6 @@
%
% \begin{macro}{\load@onefilewithoptions}
% \begin{macro}{\@onefilewithoptions}
-% \changes{v1.2h}{2018-04-08}{Pass expanded date}
% the best place to add the rollback code is at the point where
% |\@onefilewithoptions| is called to load a single class or
% package.
@@ -2000,7 +1999,10 @@
% \end{macrocode}
% If we had a rollback request then |#3| may contain data but not
% necessarily a ``minimal date'' so instead of passing it on we
-% pass on |\pkgcls@mindate|.
+% pass on the content of |\pkgcls@mindate|. We need to pass the
+% value not the command, otherwise nested packages may pick up the
+% wrong information.
+% \changes{v1.2h}{2018-04-08}{Pass expanded date}
% \begin{macrocode}
\begingroup
\edef\reserved@a{%
diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx
index 02f411c2af5..8158ef7c611 100644
--- a/Master/texmf-dist/source/latex/base/ltcounts.dtx
+++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltcounts.dtx}
- [2018/03/08 v1.1k LaTeX Kernel (Counters)]
+ [2018/04/22 v1.1l LaTeX Kernel (Counters)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltcounts.dtx}
@@ -410,6 +410,7 @@
\@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}}
% \end{macrocode}
%
+% \changes{v1.1l}{2018/04/11}{Correct default (issue/38)}
% \begin{macrocode}
\def\counterwithin@x#1#2{%
\@ifbothcounters{#1}{#2}%
@@ -417,6 +418,7 @@
\expandafter
\gdef\csname the#1\expandafter\endcsname\expandafter
{\csname the#2\expandafter\endcsname\expandafter
+ .\expandafter
\@arabic\csname c@#1\endcsname}}}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 5784715048e..bc8c1866451 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
{2018-04-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{2}
+\def\patch@level{3}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 4da6dbd38d8..b347d3e80b5 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -98,7 +98,7 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2018/04/01 v1.8r multicolumn formatting (FMi)]
+ [2018/04/20 v1.8s multicolumn formatting (FMi)]
%
%
%%
@@ -1845,9 +1845,15 @@
\global\c@unbalance\z@
% \end{macrocode}
% Now it's time to return any footnotes if we are in unrestricted
-% mode:
+% mode. In boxed mode footnotes are kept inside, but in that case
+% we have to write another column status into the \texttt{.aux}
+% file to support \cs{docolaction} in case we have nested
+% environments.
+% \changes{v1.8s}{2018/04/20}{Support for \cs{docolaction} (issue/39)}
% \begin{macrocode}
- \if@boxedmulticols\else
+ \if@boxedmulticols
+ \mc@col@status@write
+ \else
\reinsert@footnotes
% \end{macrocode}
% We also take a look at the amount of free space on the current
diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex
index aca9eb6a41c..e2031f3d189 100644
--- a/Master/texmf-dist/tex/latex/base/docstrip.tex
+++ b/Master/texmf-dist/tex/latex/base/docstrip.tex
@@ -44,9 +44,9 @@
\catcode`\{=1
\catcode`\}=2
\def\filename{docstrip.dtx}
-\def\fileversion{2.5e}
-\def\filedate{2014/09/29}
-\def\docdate {2017/03/13}
+\def\fileversion{2.5f}
+\def\filedate{2018/04/10}
+\def\docdate {2018/04/10}
%%
%% The docstrip program for use with TeX.
%% Copyright (C) 1989-1991 Frank Mittelbach
@@ -622,6 +622,12 @@ Z
\makeOther\_\makeOther\^^A\makeOther\%%
\makeOther\~\makeOther\{\makeOther\}\makeOther\&%
\endlinechar-1\relax
+ \@tempcnta=128\relax
+ \loop
+ \catcode\@tempcnta 12\relax
+ \ifnum\@tempcnta <255\relax
+ \advance\@tempcnta\@ne
+ \repeat
\loop
\read\inFile to\inLine
\ifx\inLine\Endinput
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 35c895b0686..55eebb2bd46 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -701,7 +701,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2018-04-01}
-\def\patch@level{2}
+\def\patch@level{3}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
@@ -2218,6 +2218,7 @@ Type H <return> for immediate help.}%
\expandafter
\gdef\csname the#1\expandafter\endcsname\expandafter
{\csname the#2\expandafter\endcsname\expandafter
+ .\expandafter
\@arabic\csname c@#1\endcsname}}}
\def\arabic#1{\expandafter\@arabic\csname c@#1\endcsname}
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index acfc988e290..27e82353a26 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -1038,6 +1038,7 @@ of this package available from CTAN}
\expandafter
\gdef\csname the#1\expandafter\endcsname\expandafter
{\csname the#2\expandafter\endcsname\expandafter
+ .\expandafter
\@arabic\csname c@#1\endcsname}}}
\EndIncludeInRelease
diff --git a/Master/texmf-dist/tex/latex/base/utf8-test.tex b/Master/texmf-dist/tex/latex/base/utf8-test.tex
deleted file mode 100644
index 5b2fd1e0613..00000000000
--- a/Master/texmf-dist/tex/latex/base/utf8-test.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-%%
-%% This is file `utf8-test.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% utf8ienc.dtx (with options: `test')
-%%
-%% This is a generated file.
-%%
-%% The source is maintained by the LaTeX Project team and bug
-%% reports for it can be opened at https://latex-project.org/bugs.html
-%% (but please observe conditions on bug reports sent to that address!)
-%%
-%%
-%% Copyright 1993-2017
-%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
-%% This file was generated from file(s) of the LaTeX base system.
-%% --------------------------------------------------------------
-%%
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This file has the LPPL maintenance status "maintained".
-%%
-%% This file may only be distributed together with a copy of the LaTeX
-%% base system. You may however distribute the LaTeX base system without
-%% such generated files.
-%%
-%% The list of all files belonging to the LaTeX base distribution is
-%% given in the file `manifest.txt'. See also `legal.txt' for additional
-%% information.
-%%
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-\ProvidesFile{utf8-test.tex}
- [2018/04/05 v1.2c UTF-8 support for inputenc]
-\documentclass{article}
-
-\usepackage[latin1,utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{trace}
-
-\scrollmode % to run past the error below
-
-\begin{document}
-
- German umlauts in UTF-8: ^^c3^^a4^^c3^^b6^^c3^^bc %%% ^^c3^^a4^^c3^^b6^^c3^^bc
-
-\inputencoding{latin1} % switch to latin1
-
- German umlauts in UTF-8 but read by latin1 (and will produce one
- error since \verb=\textcurrency= is not provided):
- ^^c3^^a4^^c3^^b6^^c3^^bc
-
-\inputencoding{utf8} % switch back to utf8
-
- German umlauts in UTF-8: ^^c3^^a4^^c3^^b6^^c3^^bc
-
-Some codes that should produce errors as nothing is set up
-for them: ^^c3F ^^e1^^a4^^b6
-
-And some that are not legal utf8 sequences: ^^c3X ^^e1XY
-
-\showoutput
-\tracingstats=2
-\stop
-\endinput
-%%
-%% End of file `utf8-test.tex'.
diff --git a/Master/texmf-dist/tex/latex/base/utf8test.tex b/Master/texmf-dist/tex/latex/base/utf8test.tex
deleted file mode 100644
index 8545cc060ee..00000000000
--- a/Master/texmf-dist/tex/latex/base/utf8test.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-%%
-%% This is file `utf8test.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% utf8ienc.dtx (with options: `test')
-%%
-%% This is a generated file.
-%%
-%% The source is maintained by the LaTeX Project team and bug
-%% reports for it can be opened at https://latex-project.org/bugs.html
-%% (but please observe conditions on bug reports sent to that address!)
-%%
-%%
-%% Copyright 1993-2017
-%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
-%% This file was generated from file(s) of the LaTeX base system.
-%% --------------------------------------------------------------
-%%
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This file has the LPPL maintenance status "maintained".
-%%
-%% This file may only be distributed together with a copy of the LaTeX
-%% base system. You may however distribute the LaTeX base system without
-%% such generated files.
-%%
-%% The list of all files belonging to the LaTeX base distribution is
-%% given in the file `manifest.txt'. See also `legal.txt' for additional
-%% information.
-%%
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-\ProvidesFile{utf8-test.tex}
- [2018/04/05 v1.2c UTF-8 support for inputenc]
-\documentclass{article}
-
-\usepackage[latin1,utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{trace}
-
-\scrollmode % to run past the error below
-
-\begin{document}
-
- German umlauts in UTF-8: ^^c3^^a4^^c3^^b6^^c3^^bc %%% ^^c3^^a4^^c3^^b6^^c3^^bc
-
-\inputencoding{latin1} % switch to latin1
-
- German umlauts in UTF-8 but read by latin1 (and will produce one
- error since \verb=\textcurrency= is not provided):
- ^^c3^^a4^^c3^^b6^^c3^^bc
-
-\inputencoding{utf8} % switch back to utf8
-
- German umlauts in UTF-8: ^^c3^^a4^^c3^^b6^^c3^^bc
-
-Some codes that should produce errors as nothing is set up
-for them: ^^c3F ^^e1^^a4^^b6
-
-And some that are not legal utf8 sequences: ^^c3X ^^e1XY
-
-\showoutput
-\tracingstats=2
-\stop
-\endinput
-%%
-%% End of file `utf8test.tex'.
diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex
deleted file mode 100644
index 0e5218a077d..00000000000
--- a/Master/texmf-dist/tex/latex/tools/.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-%%
-%% This is file `.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fileerr.dtx (with options: `return')
-%%
-%% This is a generated file.
-%%
-%% The source is maintained by the LaTeX Project team and bug
-%% reports for it can be opened at https://latex-project.org/bugs/
-%% (but please observe conditions on bug reports sent to that address!)
-%%
-%%
-%% Copyright 1993-2017
-%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
-%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
-%% --------------------------------------------------------------------------
-%%
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This file may only be distributed together with a copy of the LaTeX
-%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
-%% without such generated files.
-%%
-%% The list of all files belonging to the LaTeX `Tools Bundle' is
-%% given in the file `manifest.txt'.
-%%
- \message{File ignored}
-\endinput
-%%
-%% End of file `.tex'.
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index ace287301af..af85baa4a4a 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -107,7 +107,7 @@
\DeclareCurrentRelease{}{2018-04-01}
\ProvidesPackage{multicol}
- [2018/04/01 v1.8r multicolumn formatting (FMi)]
+ [2018/04/20 v1.8s multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -340,7 +340,9 @@
\@checkend{multicols}%
\endgroup
\global\c@unbalance\z@
- \if@boxedmulticols\else
+ \if@boxedmulticols
+ \mc@col@status@write
+ \else
\reinsert@footnotes
\ifdim \pagegoal=\maxdimen
\global\vsize\@colroom