xltabular (1oct17)

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

5 files changed, 47 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/xltabular/Changes b/Master/texmf-dist/doc/latex/xltabular/Changes
index 1fcac8c7233..f408426d824 100644
--- a/Master/texmf-dist/doc/latex/xltabular/Changes
+++ b/Master/texmf-dist/doc/latex/xltabular/Changes
@@ -1,3 +1,4 @@
+0.03  2017-10-01  - fix for \caption* in longtable
 0.02  2017-09-28  - added optional argument for horizontal alignment
                   - extended documentation
 0.01  2017-09-27  - first CTAN version
diff --git a/Master/texmf-dist/doc/latex/xltabular/README.md b/Master/texmf-dist/doc/latex/xltabular/README.md
index b48f6552a42..0ab2db0c794 100644
--- a/Master/texmf-dist/doc/latex/xltabular/README.md
+++ b/Master/texmf-dist/doc/latex/xltabular/README.md
@@ -5,6 +5,6 @@ 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.
+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.
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
index bf2f53846b2..0b014a642a2 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 6e37847f7dc..6c1fe14bf85 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 592 2017-09-29 06:52:56Z herbert $
+%% $Id: xltabular-doc.tex 598 2017-09-30 19:52:25Z herbert $
 %
 \listfiles
 \documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
@@ -14,12 +14,14 @@
   BoldFont      =*-Bold,
   ItalicFont    =*-Italic,
   BoldItalicFont=*-BoldItalic,
+  RawFeature    = -rlig,
 ]
 \setsansfont{GilliusADF}[
   UprightFont   =*-Regular,
   BoldFont      =*-Bold,
   ItalicFont    =*-Italic,
   BoldItalicFont=*-BoldItalic,
+  RawFeature    = -rlig,
 ]
 \setmonofont{Anonymous Pro}[Scale=MatchLowercase,FakeStretch=0.9]
 
@@ -29,8 +31,8 @@
 \automark*[subsection]{}
 \pagestyle{scrheadings}
 
-\usepackage{selnolig}
-\nolig{oe}{o|e}
+%\usepackage{selnolig}
+%\nolig{oe}{o|e}
 
 \usepackage{xltabular}
 \makeatletter
@@ -201,7 +203,7 @@ left column & \blindtext\\\hline
 
 Here comes another \texttt{tabularx} but without a caption. It should
 \emph{not} increase the \texttt{table} counter. The following tabular
-in the next section should have the correct number!
+in the last section should have the correct number!
 
 \begin{tabularx}{\linewidth}{@{} >{\ttfamily}l>{\RaggedRight}X @{}}\hline
 .ext & Beschreibung\\\hline
@@ -215,6 +217,26 @@ in the next section should have the correct number!
 \end{tabularx}
 
 
+\subsection{\texttt{xltabular} with the star version of caption}
+
+Here comes another \texttt{xltabular} with \cs{caption*}. It should
+\emph{not} increase the \texttt{table} counter. The following tabular
+in the next section should have the correct number!
+
+\begin{xltabular}{\linewidth}{@{} >{\ttfamily}l>{\RaggedRight}X @{}}
+\caption*{A caption as star version: no number no entry in the List of Tables}\\\hline
+.ext & Beschreibung\\\hline
+ aux & (auxiliary) Hilfsdatei, enthält Querverweise usw. \\ 
+ bbl & (bibliography) Hilfsdatei, enthält die Einträge für die Literatur\\ 
+ bib & (bibtex) enthält die Literaturdaten\\ 
+ 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\\ 
+\end{xltabular}
+
+
+
 \subsection{\texttt{xltabular} with header/footer definitions}
 
 \begin{Verbatim}[frame=lines]
diff --git a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
index 43fd233f94f..2667a2c7a6a 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 592 2017-09-29 06:52:56Z herbert $
+%% $Id: xltabular.sty 602 2017-10-01 13:47:08Z 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,9 +7,9 @@
 % Copyright 2017 Herbert Voss <hvoss@tug.org>
 %                Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%
-\def\xltabular@version{0.02 }
+\def\xltabular@version{0.03 }
 \ProvidesPackage{xltabular}
-          [2017/09/28 v\xltabular@version `xltabular' package (hv,rn)]
+          [2017/10/01 v\xltabular@version `xltabular' package (hv,rn)]
 
 \RequirePackage{tabularx}
 \let\ORIGi@tabularx=\tabularx
@@ -21,7 +21,7 @@
 \let\ORIGii@TX@endtabularx=\TX@endtabularx
 %
 \let\ORIG@longtable=\longtable
-\let\ORIG@LT@capti@n=\LT@capti@n
+\let\ORIG@LT@c@ption=\LT@c@ption
 %
 % restore original tabularx
 \let\tabularx=\ORIGi@tabularx
@@ -44,15 +44,21 @@
   {\def\@currenvir{tabularx}}
 %
 % In "longtable" increase the counter "table" only if "\caption" is used 
-\def\LT@capti@n{%
-	\refstepcounter{table}%
-	\ORIG@LT@capti@n
-}
+
+\def\LT@c@ption#1{%
+  \noalign{%
+    \ifx#1\@firstofone
+      \refstepcounter{table}%
+    \fi}%
+  \ORIG@LT@c@ption{#1}%
+} 
+%
 \def\longtable{%
-	\addtocounter{table}\m@ne
-	\ORIG@longtable
+  \addtocounter{table}\m@ne
+  \ORIG@longtable
 }  
-
+%
 \endinput
 %%
 %% End of file `xltabular.sty'.
+