summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-06 22:04:13 +0000
committerKarl Berry <karl@freefriends.org>2019-01-06 22:04:13 +0000
commitb41749959c73e2c85e711c0d8f98829cb74af6dd (patch)
treea75ca9c5fa230f0797288b0ae5966d0723f90490 /Master/texmf-dist/tex/latex/tools
parent5ed74e52078fd4969d9d48a906b911b9e34aad27 (diff)
glossaries (6jan19)
git-svn-id: svn://tug.org/texlive/trunk@49619 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools')
-rw-r--r--Master/texmf-dist/tex/latex/tools/array.sty3
-rw-r--r--Master/texmf-dist/tex/latex/tools/longtable.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty5
-rw-r--r--Master/texmf-dist/tex/latex/tools/xr.sty12
4 files changed, 13 insertions, 11 deletions
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}