summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-20 21:28:00 +0000
committerKarl Berry <karl@freefriends.org>2020-03-20 21:28:00 +0000
commit243c3a9525255f9dff1c01c23e08397c40743da5 (patch)
tree16c32d31b678e4357dc9241a7e612f8ef7066144
parentfe69d26208d4c6d160b2c279e1ed27b6805e2a39 (diff)
xltabular (20mar20)
git-svn-id: svn://tug.org/texlive/trunk@54437 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdfbin70975 -> 71369 bytes
-rw-r--r--Master/texmf-dist/tex/latex/xltabular/xltabular.sty25
3 files changed, 16 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/xltabular/Changes b/Master/texmf-dist/doc/latex/xltabular/Changes
index 05b615fc279..d29caef556a 100644
--- a/Master/texmf-dist/doc/latex/xltabular/Changes
+++ b/Master/texmf-dist/doc/latex/xltabular/Changes
@@ -1,3 +1,4 @@
+2.0c 2020/03/20 - restore of original longtable more robust
2.0a 2018/12/16 - better hyperref support; example files
1.0a 2018/05/23 - restore original tabularx must not be statically
0.05 2017-10-26 - set \keepXColumns
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
index 882a93aa45f..d8b3ba30ef0 100644
--- a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
index 4684191127b..fc785782faa 100644
--- a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
+++ b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
@@ -3,21 +3,18 @@
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
%% Either version 1.3 or, at your option, any later version.
%%
-% Copyright 2018 Herbert Voss <hvoss@tug.org>
-% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+% Copyright 2018,... Herbert Voss <hvoss@tug.org>
+% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
-\ProvidesPackage{xltabular}[2019/01/30 v0.2b `xltabular' package (hv,RN)]
+\ProvidesPackage{xltabular}[2020/03/20 v0.2c `xltabular' package (hv,RN)]
\RequirePackage{tabularx}
\let\XLT@i@tabularx=\tabularx
\let\XLT@i@endtabularx=\endtabularx
\let\XLT@i@TX@endtabularx=\TX@endtabularx
%
-\RequirePackage{ltablex}
-\keepXColumns% xltabular behaves like tabularx
-%
-\let\XLT@ii@tabularx=\tabularx
-\let\XLT@ii@TX@endtabularx=\TX@endtabularx
+\RequirePackage{longtable}
\let\XLT@longtable=\longtable
+\let\XLT@LT@caption=\LT@caption
\let\XLT@LT@start=\LT@start
\let\XLT@LT@array=\LT@array
\@ifundefined{scr@LT@array}{%
@@ -25,7 +22,12 @@
\@ifundefined{adl@LT@array}{}{\let\XLT@adl@LT@array=\adl@LT@array}
}
}{\let\XLT@scr@LT@array=\scr@LT@array}%
-
+%
+\RequirePackage{ltablex}
+\keepXColumns% xltabular behaves like tabularx
+%
+\let\XLT@ii@tabularx=\tabularx
+\let\XLT@ii@TX@endtabularx=\TX@endtabularx
%
% restore original tabularx
\renewenvironment{tabularx}%
@@ -64,11 +66,14 @@
}%
%
\providecommand*\LTcaptype{table}% support of package "caption"
+% restore original longtable
\def\longtable{%
\ifXLT@HypRef
% revert to the unpatched version when \caption is not used
- \global\let\LT@start=\XLT@LT@start
+ \global\let\LT@start=\XLT@LT@start%
\fi
+ \let\LT@array=\XLT@LT@array
+ \let\LT@caption=\XLT@LT@caption
\XLT@longtable
}