summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-29 23:33:08 +0000
committerKarl Berry <karl@freefriends.org>2018-04-29 23:33:08 +0000
commiteca3f5fdf6c224e5d2294694df10e49b281dd9c4 (patch)
treea2f78741d7434a8d9396d07f2b360523c42d524c /Master/texmf-dist/tex/latex/tools
parent46a67949b248f35d9e46a1f6236cf5bb014fb5b3 (diff)
latex2e (24apr18)
git-svn-id: svn://tug.org/texlive/trunk@47500 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools')
-rw-r--r--Master/texmf-dist/tex/latex/tools/.tex41
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty6
2 files changed, 4 insertions, 43 deletions
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