From 6377163c8f6f9dddca891dd63969f687b2e6f929 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 May 2018 21:37:21 +0000 Subject: xltabular (24may18) git-svn-id: svn://tug.org/texlive/trunk@47829 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xltabular/Changes | 1 + Master/texmf-dist/doc/latex/xltabular/README.md | 5 +++-- .../doc/latex/xltabular/xltabular-doc.pdf | Bin 71029 -> 70996 bytes .../doc/latex/xltabular/xltabular-doc.tex | 2 +- Master/texmf-dist/tex/latex/xltabular/xltabular.sty | 11 +++++------ Master/tlpkg/libexec/ctan2tds | 1 + 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xltabular/Changes b/Master/texmf-dist/doc/latex/xltabular/Changes index 44811b4f1b0..8fd7a67551d 100644 --- a/Master/texmf-dist/doc/latex/xltabular/Changes +++ b/Master/texmf-dist/doc/latex/xltabular/Changes @@ -1,3 +1,4 @@ +1.0a 2018/05/23 - restore original tabularx must not be statically 0.05 2017-10-26 - set \keepXColumns 0.04 2017-10-23 - wrong references (RN) 0.03 2017-10-01 - fix for \caption* in longtable diff --git a/Master/texmf-dist/doc/latex/xltabular/README.md b/Master/texmf-dist/doc/latex/xltabular/README.md index 0ab2db0c794..88ea7aa3f85 100644 --- a/Master/texmf-dist/doc/latex/xltabular/README.md +++ b/Master/texmf-dist/doc/latex/xltabular/README.md @@ -3,8 +3,9 @@ Package xltabular loads package ltablex but keeps the current tabularx environment. The environment xltabular is a combination between longtable and tabularx. - - This file is distributed under the terms of the LaTeX Project Public License from CTAN archives in directory macros/latex/base/lppl.txt. Either version 1.3 or, at your option, any later version. + +H.V./R.N. + diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf index 28a8471faab..2315513133b 100644 Binary files a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf and b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex index 248c916f372..2ad96957975 100644 --- a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex +++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex @@ -1,4 +1,4 @@ -%% $Id: xltabular-doc.tex 635 2017-10-24 18:22:59Z herbert $ +%% $Id: xltabular-doc.tex 598 2017-09-30 19:52:25Z herbert $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-, diff --git a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty index 1e6f6da606f..ff18911fe40 100644 --- a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty +++ b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty @@ -1,13 +1,12 @@ -%% $Id: xltabular.sty 635 2017-10-24 18:22:59Z herbert $ %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.3 or, at your option, any later version. %% -% Copyright 2017 Herbert Voss +% Copyright 2018 Herbert Voss % Rolf Niepraschk %% -\ProvidesPackage{xltabular}[2017/10/26 v0.05 `xltabular' package (hv,RN)] +\ProvidesPackage{xltabular}[2018/05/23 v0.1a `xltabular' package (hv,RN)] \RequirePackage{tabularx} \let\ORIGi@tabularx=\tabularx \let\ORIGi@endtabularx=\endtabularx @@ -22,9 +21,9 @@ \let\ORIG@longtable=\longtable % % restore original tabularx -\let\tabularx=\ORIGi@tabularx -\let\endtabularx=\ORIGi@endtabularx -\let\TX@endtabularx=\ORIGi@TX@endtabularx +\renewenvironment{tabularx}% +{\let\TX@endtabularx=\ORIGi@TX@endtabularx\ORIGi@tabularx} +{\ORIGi@endtabularx} % % define a new tabularx like the one from "ltablex" % diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index ed8551015cb..e5bff2840d5 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -822,6 +822,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'oldstandardt1',"die 'skipping, use oldstandard'", 'omegajapanese',"&MAKEflatten", 'onepagem', "die 'skipping, use piff'", + 'opacity-pro', "die 'skipping, adobe required (dps)'", 'optima', "die 'skipping, nonfree font'", 'osa', "die 'skipping, relies on endfloat.cfg and non-unique filenames'", 'osmanian', "die 'skipping, no good license info'", -- cgit v1.2.3