From b41749959c73e2c85e711c0d8f98829cb74af6dd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Jan 2019 22:04:13 +0000 Subject: glossaries (6jan19) git-svn-id: svn://tug.org/texlive/trunk@49619 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tools/afterpage.pdf | Bin 189844 -> 189844 bytes Master/texmf-dist/doc/latex/tools/array.pdf | Bin 480468 -> 481007 bytes Master/texmf-dist/doc/latex/tools/bm.pdf | Bin 306362 -> 306362 bytes Master/texmf-dist/doc/latex/tools/calc.pdf | Bin 340594 -> 340594 bytes Master/texmf-dist/doc/latex/tools/changes.txt | 23 ++++++++++++++++++++- Master/texmf-dist/doc/latex/tools/dcolumn.pdf | Bin 199042 -> 199042 bytes Master/texmf-dist/doc/latex/tools/delarray.pdf | Bin 183425 -> 183428 bytes Master/texmf-dist/doc/latex/tools/enumerate.pdf | Bin 199050 -> 199050 bytes Master/texmf-dist/doc/latex/tools/fileerr.pdf | Bin 179926 -> 180256 bytes Master/texmf-dist/doc/latex/tools/fontsmpl.pdf | Bin 144816 -> 144816 bytes Master/texmf-dist/doc/latex/tools/ftnright.pdf | Bin 346752 -> 347086 bytes Master/texmf-dist/doc/latex/tools/hhline.pdf | Bin 175718 -> 175718 bytes Master/texmf-dist/doc/latex/tools/indentfirst.pdf | Bin 144776 -> 144776 bytes Master/texmf-dist/doc/latex/tools/layout.pdf | Bin 246929 -> 246929 bytes Master/texmf-dist/doc/latex/tools/longtable.pdf | Bin 349801 -> 349851 bytes Master/texmf-dist/doc/latex/tools/multicol.pdf | Bin 488048 -> 488764 bytes Master/texmf-dist/doc/latex/tools/rawfonts.pdf | Bin 135685 -> 135685 bytes Master/texmf-dist/doc/latex/tools/shellesc.pdf | Bin 167011 -> 167011 bytes Master/texmf-dist/doc/latex/tools/showkeys.pdf | Bin 242781 -> 242781 bytes Master/texmf-dist/doc/latex/tools/somedefs.pdf | Bin 156458 -> 156458 bytes Master/texmf-dist/doc/latex/tools/tabularx.pdf | Bin 254080 -> 254080 bytes Master/texmf-dist/doc/latex/tools/theorem.pdf | Bin 322867 -> 323171 bytes .../texmf-dist/doc/latex/tools/tools-overview.pdf | Bin 68286 -> 68286 bytes Master/texmf-dist/doc/latex/tools/trace.pdf | Bin 212728 -> 212728 bytes Master/texmf-dist/doc/latex/tools/varioref.pdf | Bin 335104 -> 335104 bytes Master/texmf-dist/doc/latex/tools/verbatim.pdf | Bin 309038 -> 309038 bytes Master/texmf-dist/doc/latex/tools/xr-e1.pdf | Bin 22579 -> 0 bytes Master/texmf-dist/doc/latex/tools/xr-he1.pdf | Bin 23105 -> 0 bytes Master/texmf-dist/doc/latex/tools/xr-main.pdf | 0 Master/texmf-dist/doc/latex/tools/xr.pdf | Bin 163059 -> 163122 bytes Master/texmf-dist/doc/latex/tools/xspace.pdf | Bin 238006 -> 238006 bytes Master/texmf-dist/source/latex/tools/array.dtx | 9 +++++++- Master/texmf-dist/source/latex/tools/longtable.dtx | 6 +++++- Master/texmf-dist/source/latex/tools/multicol.dtx | 22 ++++++++++---------- Master/texmf-dist/source/latex/tools/xr.dtx | 14 ++++++------- Master/texmf-dist/source/latex/tools/xr.ins | 9 -------- Master/texmf-dist/tex/latex/tools/array.sty | 3 ++- Master/texmf-dist/tex/latex/tools/longtable.sty | 4 +++- Master/texmf-dist/tex/latex/tools/multicol.sty | 5 ++--- Master/texmf-dist/tex/latex/tools/xr.sty | 12 +++++------ 40 files changed, 66 insertions(+), 41 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/tools/xr-e1.pdf delete mode 100644 Master/texmf-dist/doc/latex/tools/xr-he1.pdf delete mode 100644 Master/texmf-dist/doc/latex/tools/xr-main.pdf delete mode 100644 Master/texmf-dist/source/latex/tools/xr.ins (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf index 59235e416c1..9cec0bfad48 100644 Binary files a/Master/texmf-dist/doc/latex/tools/afterpage.pdf and b/Master/texmf-dist/doc/latex/tools/afterpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf index fcb26e9edad..e2320dfc79e 100644 Binary files a/Master/texmf-dist/doc/latex/tools/array.pdf and b/Master/texmf-dist/doc/latex/tools/array.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf index 09ba1159648..d2ab8ca3d5e 100644 Binary files a/Master/texmf-dist/doc/latex/tools/bm.pdf and b/Master/texmf-dist/doc/latex/tools/bm.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf index 1a927dbdad4..d34692b29cb 100644 Binary files a/Master/texmf-dist/doc/latex/tools/calc.pdf and b/Master/texmf-dist/doc/latex/tools/calc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt index 532d64892f7..977b7aa4fba 100644 --- a/Master/texmf-dist/doc/latex/tools/changes.txt +++ b/Master/texmf-dist/doc/latex/tools/changes.txt @@ -5,6 +5,27 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +######################### +# 2019-01-05 Release +######################### + +2019-01-05 David Carlisle + + * xr.dtx: Fix to last update to avoid breaking \include handling. + (gh/106) + +2018-12-30 Frank Mittelbach + + * array.dtx (section{The macros \texttt{\textbackslash @classz}): + Add extra \hskip1sp to guard against an \unskip at the start of + a c-column cell (gh/102) + +2018-12-27 Frank Mittelbach + + * 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 ######################### @@ -46,7 +67,7 @@ are not part of the distribution. 2018-04-30 Frank Mittelbach - * array.dtx Explicity place the row strut inside \\ before + * array.dtx Explicitly place the row strut inside \\ before hitting \cr in case the last cell is a multicolumn cell (issue 42) diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf index 49f3239e50a..62899edd4dd 100644 Binary files a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf and b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf index 27118e76c6f..0d0f227b7e0 100644 Binary files a/Master/texmf-dist/doc/latex/tools/delarray.pdf and b/Master/texmf-dist/doc/latex/tools/delarray.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf index 7708f6a7c65..06f82793267 100644 Binary files a/Master/texmf-dist/doc/latex/tools/enumerate.pdf and b/Master/texmf-dist/doc/latex/tools/enumerate.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf index 1bf450a5d41..95ee1d706ac 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fileerr.pdf and b/Master/texmf-dist/doc/latex/tools/fileerr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf index 7b5439307cd..28c71aec26c 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf and b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf index 138ad0565f6..41fbf65b7d6 100644 Binary files a/Master/texmf-dist/doc/latex/tools/ftnright.pdf and b/Master/texmf-dist/doc/latex/tools/ftnright.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf index b6edb666414..de167c7b3c7 100644 Binary files a/Master/texmf-dist/doc/latex/tools/hhline.pdf and b/Master/texmf-dist/doc/latex/tools/hhline.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf index e663e8b9cad..83722444562 100644 Binary files a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf and b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf index 47bc0deefd7..b6bfa427bb7 100644 Binary files a/Master/texmf-dist/doc/latex/tools/layout.pdf and b/Master/texmf-dist/doc/latex/tools/layout.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf index c204c623877..63339d3f329 100644 Binary files a/Master/texmf-dist/doc/latex/tools/longtable.pdf and b/Master/texmf-dist/doc/latex/tools/longtable.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf index 131d7a5582f..af52be07b85 100644 Binary files a/Master/texmf-dist/doc/latex/tools/multicol.pdf and b/Master/texmf-dist/doc/latex/tools/multicol.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf index 39caf638e48..151b7c5d817 100644 Binary files a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf and b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/shellesc.pdf b/Master/texmf-dist/doc/latex/tools/shellesc.pdf index bb6725ad8b0..80d86351891 100644 Binary files a/Master/texmf-dist/doc/latex/tools/shellesc.pdf and b/Master/texmf-dist/doc/latex/tools/shellesc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf index 41d133a674a..d772c3e656d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/showkeys.pdf and b/Master/texmf-dist/doc/latex/tools/showkeys.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf index 5611c1105d2..eecebfb273f 100644 Binary files a/Master/texmf-dist/doc/latex/tools/somedefs.pdf and b/Master/texmf-dist/doc/latex/tools/somedefs.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf index 325c0f7475b..cc78234679a 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tabularx.pdf and b/Master/texmf-dist/doc/latex/tools/tabularx.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf index 42b1ae8118d..c3305bbfc3c 100644 Binary files a/Master/texmf-dist/doc/latex/tools/theorem.pdf and b/Master/texmf-dist/doc/latex/tools/theorem.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf index 94e11fc0109..b8ccf9ed60d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf and b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf index 86e735f262b..2986128e0b6 100644 Binary files a/Master/texmf-dist/doc/latex/tools/trace.pdf and b/Master/texmf-dist/doc/latex/tools/trace.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf index cc4813a079b..f94de532356 100644 Binary files a/Master/texmf-dist/doc/latex/tools/varioref.pdf and b/Master/texmf-dist/doc/latex/tools/varioref.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf index e964d8265ce..766dabebb84 100644 Binary files a/Master/texmf-dist/doc/latex/tools/verbatim.pdf and b/Master/texmf-dist/doc/latex/tools/verbatim.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xr-e1.pdf b/Master/texmf-dist/doc/latex/tools/xr-e1.pdf deleted file mode 100644 index 30051a90526..00000000000 Binary files a/Master/texmf-dist/doc/latex/tools/xr-e1.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/tools/xr-he1.pdf b/Master/texmf-dist/doc/latex/tools/xr-he1.pdf deleted file mode 100644 index ee3e25bdd6f..00000000000 Binary files a/Master/texmf-dist/doc/latex/tools/xr-he1.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/tools/xr-main.pdf b/Master/texmf-dist/doc/latex/tools/xr-main.pdf deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf index d7510e78cf5..98bea94d32b 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xr.pdf and b/Master/texmf-dist/doc/latex/tools/xr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf index 10573e7efbc..99c6ca61a84 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xspace.pdf and b/Master/texmf-dist/doc/latex/tools/xspace.pdf differ 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 @@ % \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 @@ % \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 % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{xr} -% [2018/10/01 v5.03 eXternal References (DPC)] +% [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 diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index 01af6d80549..07a1e36c546 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -45,7 +45,7 @@ \DeclareCurrentRelease{}{2018-04-30} \ProvidesPackage{array} - [2018/11/13 v2.4j Tabular extension package (FMi)] + [2018/12/30 v2.4k Tabular extension package (FMi)] %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} @@ -109,6 +109,7 @@ \prepnext@tok \@addtopreamble{\ifcase \@chnum \hfil + \hskip1sp% \d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty index ea71faf5d91..7544f01a885 100644 --- a/Master/texmf-dist/tex/latex/tools/longtable.sty +++ b/Master/texmf-dist/tex/latex/tools/longtable.sty @@ -37,7 +37,7 @@ %% File: longtable.dtx Copyright (C) 1990-2001 David Carlisle \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{longtable} - [2014/10/28 v4.11 Multi-page Table package (DPC)] + [2014/10/28 v4.11 Multi-page Table package (DPC)+ FMi change] \def\LT@err{\PackageError{longtable}} \def\LT@warn{\PackageWarning{longtable}} \def\LT@final@warn{% @@ -428,12 +428,14 @@ \def\endlastfoot{\LT@end@hd@ft\LT@lastfoot} \def\LT@startpbox#1{% \bgroup + \color@begingroup \let\@footnotetext\LT@p@ftntext \setlength\hsize{#1}% \@arrayparboxrestore \vrule \@height \ht\@arstrutbox \@width \z@} \def\LT@endpbox{% \@finalstrut\@arstrutbox + \color@endgroup \egroup \the\LT@p@ftn \global\LT@p@ftn{}% diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index a8548dc89ea..e60f4e9c3a0 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/11/09 v1.8u multicolumn formatting (FMi)] + [2018/12/27 v1.8v multicolumn formatting (FMi)] %% \DeclareOption{twocolumn} {\PackageWarning{multicol}{May not work @@ -441,7 +441,7 @@ \ifvoid\footins \else \leave@mult@footins \fi - \let\ifshr@kingsaved\ifshr@king + \ifvbox \@kludgeins \advance \dimen@ -\ht\@kludgeins \ifdim \wd\@kludgeins>\z@ @@ -463,7 +463,6 @@ \setbox\mult@rightbox\vbox to\dimen@ {\unvbox\mult@rightbox \ifshr@nking\vfilmaxdepth\fi}% - \let\ifshr@king\ifshr@kingsaved \ifvoid\@cclv \else \unvbox\@cclv \ifnum\outputpenalty=\@M diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty index 6fad3d0c7db..4f50e782bc8 100644 --- a/Master/texmf-dist/tex/latex/tools/xr.sty +++ b/Master/texmf-dist/tex/latex/tools/xr.sty @@ -35,10 +35,10 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% File: xr.dtx Copyright (C) 1994-1994 2018 David Carlisle +%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xr} - [2018/10/01 v5.03 eXternal References (DPC)] + [2019/01/05 v5.04 eXternal References (DPC)] \def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} \def\XR@[#1]#2{{% \makeatletter @@ -62,13 +62,13 @@ \read\@inputcheck to\XR@line \expandafter\XR@test\XR@line...\XR@} \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} -- cgit v1.2.3