diff options
40 files changed, 66 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf Binary files differindex 59235e416c1..9cec0bfad48 100644 --- a/Master/texmf-dist/doc/latex/tools/afterpage.pdf +++ b/Master/texmf-dist/doc/latex/tools/afterpage.pdf diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf Binary files differindex fcb26e9edad..e2320dfc79e 100644 --- a/Master/texmf-dist/doc/latex/tools/array.pdf +++ b/Master/texmf-dist/doc/latex/tools/array.pdf diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf Binary files differindex 09ba1159648..d2ab8ca3d5e 100644 --- a/Master/texmf-dist/doc/latex/tools/bm.pdf +++ b/Master/texmf-dist/doc/latex/tools/bm.pdf diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf Binary files differindex 1a927dbdad4..d34692b29cb 100644 --- a/Master/texmf-dist/doc/latex/tools/calc.pdf +++ b/Master/texmf-dist/doc/latex/tools/calc.pdf 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 @@ -6,6 +6,27 @@ are not part of the distribution. ======================================================================= ######################### +# 2019-01-05 Release +######################### + +2019-01-05 David Carlisle <David.Carlisle@latex-project.org> + + * xr.dtx: Fix to last update to avoid breaking \include handling. + (gh/106) + +2018-12-30 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * 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 <Frank.Mittelbach@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 ######################### @@ -46,7 +67,7 @@ are not part of the distribution. 2018-04-30 Frank Mittelbach <Frank.Mittelbach@latex-project.org> - * 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 Binary files differindex 49f3239e50a..62899edd4dd 100644 --- a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf +++ b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf Binary files differindex 27118e76c6f..0d0f227b7e0 100644 --- a/Master/texmf-dist/doc/latex/tools/delarray.pdf +++ b/Master/texmf-dist/doc/latex/tools/delarray.pdf diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf Binary files differindex 7708f6a7c65..06f82793267 100644 --- a/Master/texmf-dist/doc/latex/tools/enumerate.pdf +++ b/Master/texmf-dist/doc/latex/tools/enumerate.pdf diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf Binary files differindex 1bf450a5d41..95ee1d706ac 100644 --- a/Master/texmf-dist/doc/latex/tools/fileerr.pdf +++ b/Master/texmf-dist/doc/latex/tools/fileerr.pdf diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf Binary files differindex 7b5439307cd..28c71aec26c 100644 --- a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf +++ b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf Binary files differindex 138ad0565f6..41fbf65b7d6 100644 --- a/Master/texmf-dist/doc/latex/tools/ftnright.pdf +++ b/Master/texmf-dist/doc/latex/tools/ftnright.pdf diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf Binary files differindex b6edb666414..de167c7b3c7 100644 --- a/Master/texmf-dist/doc/latex/tools/hhline.pdf +++ b/Master/texmf-dist/doc/latex/tools/hhline.pdf diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf Binary files differindex e663e8b9cad..83722444562 100644 --- a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf +++ b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf Binary files differindex 47bc0deefd7..b6bfa427bb7 100644 --- a/Master/texmf-dist/doc/latex/tools/layout.pdf +++ b/Master/texmf-dist/doc/latex/tools/layout.pdf diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf Binary files differindex c204c623877..63339d3f329 100644 --- a/Master/texmf-dist/doc/latex/tools/longtable.pdf +++ b/Master/texmf-dist/doc/latex/tools/longtable.pdf diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf Binary files differindex 131d7a5582f..af52be07b85 100644 --- a/Master/texmf-dist/doc/latex/tools/multicol.pdf +++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf Binary files differindex 39caf638e48..151b7c5d817 100644 --- a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf +++ b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf diff --git a/Master/texmf-dist/doc/latex/tools/shellesc.pdf b/Master/texmf-dist/doc/latex/tools/shellesc.pdf Binary files differindex bb6725ad8b0..80d86351891 100644 --- a/Master/texmf-dist/doc/latex/tools/shellesc.pdf +++ b/Master/texmf-dist/doc/latex/tools/shellesc.pdf diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf Binary files differindex 41d133a674a..d772c3e656d 100644 --- a/Master/texmf-dist/doc/latex/tools/showkeys.pdf +++ b/Master/texmf-dist/doc/latex/tools/showkeys.pdf diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf Binary files differindex 5611c1105d2..eecebfb273f 100644 --- a/Master/texmf-dist/doc/latex/tools/somedefs.pdf +++ b/Master/texmf-dist/doc/latex/tools/somedefs.pdf diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf Binary files differindex 325c0f7475b..cc78234679a 100644 --- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf +++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf Binary files differindex 42b1ae8118d..c3305bbfc3c 100644 --- a/Master/texmf-dist/doc/latex/tools/theorem.pdf +++ b/Master/texmf-dist/doc/latex/tools/theorem.pdf diff --git a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf Binary files differindex 94e11fc0109..b8ccf9ed60d 100644 --- a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf +++ b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf Binary files differindex 86e735f262b..2986128e0b6 100644 --- a/Master/texmf-dist/doc/latex/tools/trace.pdf +++ b/Master/texmf-dist/doc/latex/tools/trace.pdf diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf Binary files differindex cc4813a079b..f94de532356 100644 --- a/Master/texmf-dist/doc/latex/tools/varioref.pdf +++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf Binary files differindex e964d8265ce..766dabebb84 100644 --- a/Master/texmf-dist/doc/latex/tools/verbatim.pdf +++ b/Master/texmf-dist/doc/latex/tools/verbatim.pdf diff --git a/Master/texmf-dist/doc/latex/tools/xr-e1.pdf b/Master/texmf-dist/doc/latex/tools/xr-e1.pdf Binary files differdeleted file mode 100644 index 30051a90526..00000000000 --- a/Master/texmf-dist/doc/latex/tools/xr-e1.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/tools/xr-he1.pdf b/Master/texmf-dist/doc/latex/tools/xr-he1.pdf Binary files differdeleted file mode 100644 index ee3e25bdd6f..00000000000 --- a/Master/texmf-dist/doc/latex/tools/xr-he1.pdf +++ /dev/null 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 --- a/Master/texmf-dist/doc/latex/tools/xr-main.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf Binary files differindex d7510e78cf5..98bea94d32b 100644 --- a/Master/texmf-dist/doc/latex/tools/xr.pdf +++ b/Master/texmf-dist/doc/latex/tools/xr.pdf diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf Binary files differindex 10573e7efbc..99c6ca61a84 100644 --- a/Master/texmf-dist/doc/latex/tools/xspace.pdf +++ b/Master/texmf-dist/doc/latex/tools/xspace.pdf 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 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} |