[latex3-commits] [git/LaTeX3-latex3-latex2e] master: correction for #101 (371f186)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/371f186e6bd68b0cc2a225df3122a47e5f22f791

>---------------------------------------------------------------

commit 371f186e6bd68b0cc2a225df3122a47e5f22f791
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Dec 27 19:45:27 2018 +0100

    correction for #101


>---------------------------------------------------------------

371f186e6bd68b0cc2a225df3122a47e5f22f791
 required/tools/changes.txt  |    6 ++++++
 required/tools/multicol.dtx |   22 +++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 7362854..8c0cefa 100644
--- a/required/tools/changes.txt
+++ b/required/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-12-27  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* multicol.dtx (subsection{The output routines}]):
+	Removed dead code, the case where this can go wrong is too
+	obscure to worry about it (gh/101)
+
 #########################
 # 2018-12-01 Release
 #########################
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 1962ec2..fd77d62 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -98,7 +98,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2018/11/09 v1.8u  multicolumn formatting (FMi)]
+          [2018/12/27 v1.8v  multicolumn formatting (FMi)]
 %
 %
 %%
@@ -2265,13 +2265,18 @@
 %    user has issue a |\enlargethispage| command then the height the
 %    |\@kludgeins| box will be the negation of the size by which the
 %    page should be enlarged. If the star form of this command has
-%    been used then we also need to shrink the resulting column. As we
-%    don't know whether or not shrinking is already generally
-%    requested with save the current value of |\ifshr at king| and
-%    restore it afterwards.
+%    been used then we also need to shrink the resulting column.
+
+%    That local change will be reverted at the end of the output
+%   routine So for the next page the original state will be
+%   reestablished. However, in theorey there is a possibility to sneak
+%   in a whoe multicols environment into the running header
+%   definition. If that happens then it will also be affected by this
+%   change---too bad I think.   
 % \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
+% \changes{v1.8v}{2018/12/27}{Removed dead code, the case where this
+%   can go wrong is too obscure to worry about it (gh/101)}
 %    \begin{macrocode}
-   \let\ifshr at kingsaved\ifshr at king
    \ifvbox \@kludgeins
      \advance \dimen@ -\ht\@kludgeins
 %    \end{macrocode}
@@ -2332,11 +2337,6 @@
           {\unvbox\mult at rightbox
            \ifshr at nking\vfilmaxdepth\fi}%
 %    \end{macrocode}
-%    Now that we are done with the boxes, we restored the current
-%    setting for shrinking in case it got changed:
-%    \begin{macrocode}
-   \let\ifshr at king\ifshr at kingsaved
-%    \end{macrocode}
 %    Having done this we hope that box 255 is emptied. If not, we
 %    reinsert its contents.
 % \changes{v1.8a}{2011/12/20}{Only re-add output penalty if it was