5 files changed, 31 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index ec597464c04..ba929289418 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -32,7 +32,7 @@
 %<+package>\DeclareCurrentRelease{}{2018-04-30}
 %<+package>
 %<+package>\ProvidesPackage{array}
-%<+package>         [2018/11/13 v2.4j Tabular extension package (FMi)]
+%<+package>         [2018/12/30 v2.4k Tabular extension package (FMi)]
 %
 % \fi
 %
@@ -1550,6 +1550,13 @@
 %    \begin{macrocode}
       \hfil
 %    \end{macrocode}
+%    We also add a space of 1sp just in case the first thing in the
+%    cell is a command doing an =\unskip=.      
+% \changes{v2.4k}{2018/12/30}{Add extra \cs{hskip} to guard against an
+%   \cs{unskip} at the start of a c-column cell (gh/102)}
+%    \begin{macrocode}
+      \hskip1sp%
+%    \end{macrocode}
 %    The command =\d@llarbegin= follows expanding into =\begingroup=
 %    (in the \textsf{tabular}--environment) or into =$=.  Doing this
 %    (provided an appropriate setting of =\d@llarbegin=) we achieve
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index cf7babe8f9c..07823b9574e 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -31,7 +31,7 @@
 %<driver> \ProvidesFile{longtable.drv}
 % \fi
 %         \ProvidesFile{longtable.dtx}
-          [2014/10/28 v4.11 Multi-page Table package (DPC)]
+          [2014/10/28 v4.11 Multi-page Table package (DPC)+ FMi change]
 %
 % \iffalse
 %<*driver>
@@ -2100,6 +2100,8 @@
 %    \begin{macrocode}
 \def\LT@startpbox#1{%
   \bgroup
+%FMi
+  \color@begingroup
     \let\@footnotetext\LT@p@ftntext
     \setlength\hsize{#1}%
     \@arrayparboxrestore
@@ -2120,6 +2122,8 @@
 %    \begin{macrocode}
 \def\LT@endpbox{%
   \@finalstrut\@arstrutbox
+%FMi
+  \color@endgroup 
   \egroup
   \the\LT@p@ftn
   \global\LT@p@ftn{}%
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 1962ec24e59..fd77d6247dc 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/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@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@kingsaved\ifshr@king
    \ifvbox \@kludgeins
      \advance \dimen@ -\ht\@kludgeins
 %    \end{macrocode}
@@ -2332,11 +2337,6 @@
           {\unvbox\mult@rightbox
            \ifshr@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@king\ifshr@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
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index c4bd41e9164..7889f713e91 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009 2018
+% 2006 2008 2009 2018 2019
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -21,11 +21,11 @@
 %
 % \fi
 % \iffalse
-%% File: xr.dtx Copyright (C) 1994-1994 2018 David Carlisle
+%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{xr}
-%<package>         [2018/10/01 v5.03 eXternal References (DPC)]
+%<package>         [2019/01/05 v5.04 eXternal References (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -157,13 +157,13 @@
 % 2018 update: make sure the arguments are handled outside the |\ifx| test,
 %    \begin{macrocode}
 \long\def\XR@test#1#2#3#4\XR@{%
-  \let\XR@next\@gobbletwo
+  \let\XR@tempa\@gobbletwo
   \ifx#1\newlabel
-    \let\XR@next\@firstoftwo%
+    \let\XR@tempa\@firstoftwo%
   \else\ifx#1\@input
-     \let\XR@next\@secondoftwo
+     \let\XR@tempa\@secondoftwo
   \fi\fi
-   \XR@next{\newlabel{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}%
+   \XR@tempa{\newlabel{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}%
   \ifeof\@inputcheck\expandafter\XR@aux
   \else\expandafter\XR@read\fi}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/xr.ins b/Master/texmf-dist/source/latex/tools/xr.ins
deleted file mode 100644
index b34a2ac87ae..00000000000
--- a/Master/texmf-dist/source/latex/tools/xr.ins
+++ /dev/null
@@ -1,9 +0,0 @@
-\input docstrip
-
-\def\SimplePackage#1{%
-  \generate{\file{#1.sty}{\from{#1.dtx}{package}}}}
-
-\keepsilent
-\SimplePackage{xr}
-
-\endbatchfile
-\ No newline at end of file