xltabular (25oct17)

git-svn-id: svn://tug.org/texlive/trunk@45600 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 49 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/xltabular/Changes b/Master/texmf-dist/doc/latex/xltabular/Changes
index f408426d824..3f2208759a4 100644
--- a/Master/texmf-dist/doc/latex/xltabular/Changes
+++ b/Master/texmf-dist/doc/latex/xltabular/Changes
@@ -1,3 +1,4 @@
+0.04  2017-10-23  - wrong references (RN)
 0.03  2017-10-01  - fix for \caption* in longtable
 0.02  2017-09-28  - added optional argument for horizontal alignment
                   - extended documentation
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
index 0b014a642a2..ef6b03edf7d 100644
--- a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
index 6c1fe14bf85..248c916f372 100644
--- a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
@@ -1,6 +1,6 @@
-%% $Id: xltabular-doc.tex 598 2017-09-30 19:52:25Z herbert $
+%% $Id: xltabular-doc.tex 635 2017-10-24 18:22:59Z herbert $
 %
-\listfiles
+\listfiles\setcounter{errorcontextlines}{100}
 \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
                captions=tableabove,twoside=on]{scrartcl}
 \usepackage{fontspec}
@@ -35,10 +35,6 @@
 %\nolig{oe}{o|e}
 
 \usepackage{xltabular}
-\makeatletter
-\let\XLVersion\xltabular@version
-\makeatother
-
 \usepackage{fancyvrb}
 \usepackage{blindtext}
 \usepackage{dtk-logos} % for Wikipedia W
@@ -48,10 +44,23 @@
 \addbibresource{\jobname.bib}
 
 \raggedbottom
-
 \usepackage[colorlinks,linktocpage]{hyperref}
 \newcommand*\cs[1]{\texttt{\textbackslash#1}}
-\title{Package \texttt{xltabular} \\--\\ v.~\XLVersion}
+
+\makeatletter% from: doc.sty
+\newcommand*\GetFileInfo[1]{%
+  \def\filename{#1}%
+  \def\@tempb##1 ##2 ##3\relax##4\relax{%
+    \def\filedate{##1}%
+    \def\fileversion{##2}%
+    \def\fileinfo{##3}}%
+  \edef\@tempa{\csname ver@#1\endcsname}%
+  \expandafter\@tempb\@tempa\relax? ? \relax\relax}
+\makeatother
+
+\GetFileInfo{xltabular.sty}
+
+\title{Package \texttt{xltabular} \\--\\ \normalsize \fileversion\ (\filedate)}
 \author{Rolf Niepraschk\thanks{Rolf.Niepraschk@gmx.de} \and Herbert Voß\thanks{hvoss@tug.org}}
 \begin{document}
 \maketitle
@@ -115,6 +124,7 @@ l           & \blindtext\\
 \end{tabularx}
 \end{Verbatim}
 
+\bigskip
 \captionaboveof{table}{Using the original \texttt{tabularx} environment: 
 	a pagebreak not possible! This is the reason why the tabular moves 
 	to the next page.}
@@ -136,7 +146,8 @@ l           & \blindtext\\
 
 \subsection{The new environment \texttt{xltabular}}
 For the demonstration we use a tabular with only one X column. There is no difference
-to an example with more or other column specifiers.
+to an example with more or other column specifiers. However, there should be at least
+one \texttt{X} column specifier; it makes no real sense otherwise.
 
 \begin{Verbatim}[frame=lines]
 \begin{xltabular}{\linewidth}{@{} X @{}}
@@ -213,7 +224,7 @@ in the last section should have the correct number!
  blg & (bibliography log) enthält die Ausgaben eines Bib\TeX-Laufs\\ 
  cfg & (config) Konfigurationsdatei\\ 
  clo & (class options) Definitionen für die Dokumentenklasse und die entsprechenden
-         Klassen-Optionen\\ 
+         Klassen-Optionen\\\hline 
 \end{tabularx}
 
 
@@ -232,7 +243,7 @@ in the next section should have the correct number!
  blg & (bibliography log) enthält die Ausgaben eines Bib\TeX-Laufs\\ 
  cfg & (config) Konfigurationsdatei\\ 
  clo & (class options) Definitionen für die Dokumentenklasse und die entsprechenden
-         Klassen-Optionen\\ 
+         Klassen-Optionen\\\hline 
 \end{xltabular}
 
 
diff --git a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
index 2667a2c7a6a..e374f695440 100644
--- a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
+++ b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
@@ -1,4 +1,4 @@
-%% $Id: xltabular.sty 602 2017-10-01 13:47:08Z herbert $
+%% $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.
@@ -7,10 +7,7 @@
 % Copyright 2017 Herbert Voss <hvoss@tug.org>
 %                Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%
-\def\xltabular@version{0.03 }
-\ProvidesPackage{xltabular}
-          [2017/10/01 v\xltabular@version `xltabular' package (hv,rn)]
-
+\ProvidesPackage{xltabular}[2017/10/24 v0.04 `xltabular' package (hv,RN)]
 \RequirePackage{tabularx}
 \let\ORIGi@tabularx=\tabularx
 \let\ORIGi@endtabularx=\endtabularx
@@ -21,7 +18,6 @@
 \let\ORIGii@TX@endtabularx=\TX@endtabularx
 %
 \let\ORIG@longtable=\longtable
-\let\ORIG@LT@c@ption=\LT@c@ption
 %
 % restore original tabularx
 \let\tabularx=\ORIGi@tabularx
@@ -31,30 +27,36 @@
 % define a new tabularx like the one from "ltablex" 
 %
 \newenvironment{xltabular}[1][x]
-  {\if l#1%
-     \LTleft\z@ \LTright\fill
-   \else\if r#1%
+{\if l#1%
+    \LTleft\z@ \LTright\fill
+ \else\if r#1%
     \LTleft\fill \LTright\z@
-   \else\if c#1%
+ \else\if c#1%
     \LTleft\fill \LTright\fill
-   \fi\fi\fi
-   \let\TX@endtabularx=\ORIGii@TX@endtabularx
-   \let\endtabularx\endxltabular
-   \ORIGii@tabularx}
-  {\def\@currenvir{tabularx}}
-%
-% In "longtable" increase the counter "table" only if "\caption" is used 
+ \fi\fi\fi
+ \let\TX@endtabularx=\ORIGii@TX@endtabularx
+ \let\endtabularx\endxltabular
+ \ORIGii@tabularx}
+{\def\@currenvir{tabularx}}
 
-\def\LT@c@ption#1{%
-  \noalign{%
-    \ifx#1\@firstofone
-      \refstepcounter{table}%
-    \fi}%
-  \ORIG@LT@c@ption{#1}%
+% In "longtable" increase the counter "table" only if "\caption" is used 
+\AtBeginDocument{%
+  \let\ORIG@LT@capti@n=\LT@capti@n
+  \def\LT@capti@n{%
+    \@ifstar{\ORIG@LT@capti@n*}{%
+      % We use the following instead of "\refstepcounter"
+      \stepcounter{\LTcaptype}%
+      % We are inside a group: edef -> xdef
+      \protected@xdef\@currentlabel
+        {\csname p@\LTcaptype\endcsname\csname the\LTcaptype\endcsname}%    
+      \ORIG@LT@capti@n
+    }%
+  }%
 } 
 %
+\providecommand*\LTcaptype{table}% support of package "caption"
 \def\longtable{%
-  \addtocounter{table}\m@ne
+  \addtocounter{\LTcaptype}\m@ne
   \ORIG@longtable
 }  
 %