summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-27 23:03:17 +0000
committerKarl Berry <karl@freefriends.org>2017-09-27 23:03:17 +0000
commit84648b2a3848ee4ddf34f67f927d4437a1bf4c9c (patch)
treeacb93c26b1bcc2aea86cc982852bcd079263d7df /Master
parent49c73d01116f5b4c5f2d55a3661b8fa28bc5f831 (diff)
xltabular (27sep17)
git-svn-id: svn://tug.org/texlive/trunk@45412 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.bib24
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.pdfbin0 -> 24481 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.tex97
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/latex/xltabular.sty51
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/xltabular-doc.bib24
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdfbin0 -> 24481 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex97
-rw-r--r--Master/texmf-dist/tex/latex/xltabular/xltabular.sty51
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/xltabular.tlpsrc0
14 files changed, 358 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/xltabular/Changes b/Master/texmf-dist/doc/latex/xltabular/Changes
new file mode 100644
index 00000000000..18d0a004dd8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/Changes
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..b48f6552a42
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/README.md
@@ -0,0 +1,10 @@
+# README #
+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.
diff --git a/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.bib b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.bib
new file mode 100644
index 00000000000..61a0505f8fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.bib
@@ -0,0 +1,24 @@
+@ctan{ltablex,
+ Title = {The \texttt{ltablex} package},
+ Author = {Anil Goel},
+ url = {/macros/latex/contrib/ltablex/},
+ version = {1.1},
+ date = {2014-08-13},
+}
+
+@ctan{tabularx,
+ Title = {The \texttt{tabularx} package},
+ Author = {David Carlisle},
+ url = {/macros/latex/contrib/carlisle/},
+ version = {2.11},
+ date = {2016-02-03},
+}
+
+@ctan{Pak-longtable,
+ Title = {The \texttt{longtable} package},
+ Author = {David Carlisle},
+ url = {/macros/latex/required/tools/longtable.pdf},
+ date = {2014-10-28},
+ version = {4.11},
+}
+
diff --git a/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.pdf
new file mode 100644
index 00000000000..3eeb578e52a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.tex b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.tex
new file mode 100644
index 00000000000..ccf08acce59
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/doc/xltabular-doc.tex
@@ -0,0 +1,97 @@
+%% $Id: xltabular-doc.tex 586 2017-09-27 17:00:55Z herbert $
+%
+\listfiles
+\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
+\usepackage{fontspec}
+\usepackage{graphicx}
+\usepackage{multido}
+\usepackage[%usefilenames,
+ TT={Scale=0.88,FakeStretch=0.9},
+ SS={Scale=0.9},
+ RM={Scale=0.9},
+ DefaultFeatures={Ligatures=TeX}]{lucida-otf} % support opentype math fonts
+\usepackage{xltabular}
+\makeatletter
+\let\XLVersion\xltabular@version
+\makeatother
+
+\usepackage{dtk-logos} % for Wikipedia W
+\usepackage{ragged2e}
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
+\pagestyle{headings}
+
+\title{Package \texttt{xltabular} \\--\\ v.~\XLVersion}
+\author{Rolf Niepraschk \and Herbert Voß}
+\begin{document}
+\maketitle
+\tableofcontents
+
+\section{Introduction}
+
+The package \texttt{ltablex} supports an environment \texttt{tabularx} with
+the possiblity of pagebreaks and the same header/footer definitions as in
+the package \texttt{longtable}. But the old bevaviour of the \texttt{tabularx}
+environment is no more possible.
+
+The package \texttt{xltabular} defines an environment of the same name
+which behaves like a \texttt{tabularx} as a \texttt{longtable}. In short:
+it is a \texttt{longtable} with the column specifier \texttt{X}. But it leaves the
+\texttt{tabularx} environment with its original behaviour.
+
+
+\section{Examples}
+
+\newcommand\B{XXXXXXXXXXXXXXXXXXXXXXXXXXXX\\}
+\newcommand\BB{\B\B\B\B\B\B\B\B\B\B\B\B\B\B\B}
+\newcommand\BBB{\BB\BB\BB\BB}
+
+\listoftables
+
+\begin{tabularx}{\linewidth}{@{}X@{}}
+\captionaboveof{table}{The original \texttt{tabularx} environment: pagebreak not possible!}\\
+\BBB
+\end{tabularx}
+
+
+\begin{xltabular}{\linewidth}{@{}X@{}}
+\caption{the \texttt{xltabular} environment with \texttt{longtable} property}\\[\belowcaptionskip]
+\BB\\
+Now a manuel \texttt{\textbackslash pagebreak} is used\\
+\pagebreak
+\BBB
+\end{xltabular}
+
+
+
+\begin{xltabular}{\linewidth}{@{}>{\ttfamily}l>{\RaggedRight}X@{}}
+\caption{File endings (only for a demonstration \ldots)}\\\hline
+.ext & Beschreibung\\\hline
+\endfirsthead
+\multicolumn{2}{@{}l}{\ldots\ \small Fortsetzung}\\\hline
+.ext & Beschreibung\\\hline
+\endhead
+\hline
+\multicolumn{2}{r@{}}{\small Fortsetzung\ldots}\\
+\endfoot
+\hline
+\endlastfoot
+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}
+
+
+
+\nocite{*}
+\printbibliography
+
+
+\end{document}
+
diff --git a/Master/texmf-dist/doc/latex/xltabular/latex/xltabular.sty b/Master/texmf-dist/doc/latex/xltabular/latex/xltabular.sty
new file mode 100644
index 00000000000..5a356850a43
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/latex/xltabular.sty
@@ -0,0 +1,51 @@
+%% $Id: xltabular.sty 586 2017-09-27 17:00:55Z 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 hvoss@tug.org
+% Rolf Niepraschk Rolf.Nieprasch@gmx.de
+%%
+\def\xltabular@version{0.01 }
+\ProvidesPackage{xltabular}
+ [2017/09/27 v\xltabular@version `xltabular' package (hv,rn)]
+
+\RequirePackage{tabularx}
+\let\ORIGi@tabularx=\tabularx
+\let\ORIGi@endtabularx=\endtabularx
+\let\ORIGi@TX@endtabularx=\TX@endtabularx
+%
+\RequirePackage{ltablex}
+\let\ORIGii@tabularx=\tabularx
+\let\ORIGii@TX@endtabularx=\TX@endtabularx
+%
+\let\ORIG@longtable=\longtable
+\let\ORIG@LT@capti@n=\LT@capti@n
+%
+% restore original tabularx
+\let\tabularx=\ORIGi@tabularx
+\let\endtabularx=\ORIGi@endtabularx
+\let\TX@endtabularx=\ORIGi@TX@endtabularx
+%
+% define a new tabularx like the one from "ltablex"
+%
+\newenvironment{xltabular}
+ {\let\TX@endtabularx=\ORIGii@TX@endtabularx
+ \let\endtabularx\endxltabular
+ \ORIGii@tabularx}
+ {\def\@currenvir{tabularx}}
+%
+% In "longtable" Erhöhung des Zählers "table" nur durch "\caption"
+\def\LT@capti@n{%
+ \refstepcounter{table}%
+ \ORIG@LT@capti@n
+}
+\def\longtable{%
+ \addtocounter{table}\m@ne
+ \ORIG@longtable
+}
+
+\endinput
+%%
+%% End of file `xltabular.sty'.
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.bib b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.bib
new file mode 100644
index 00000000000..61a0505f8fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.bib
@@ -0,0 +1,24 @@
+@ctan{ltablex,
+ Title = {The \texttt{ltablex} package},
+ Author = {Anil Goel},
+ url = {/macros/latex/contrib/ltablex/},
+ version = {1.1},
+ date = {2014-08-13},
+}
+
+@ctan{tabularx,
+ Title = {The \texttt{tabularx} package},
+ Author = {David Carlisle},
+ url = {/macros/latex/contrib/carlisle/},
+ version = {2.11},
+ date = {2016-02-03},
+}
+
+@ctan{Pak-longtable,
+ Title = {The \texttt{longtable} package},
+ Author = {David Carlisle},
+ url = {/macros/latex/required/tools/longtable.pdf},
+ date = {2014-10-28},
+ version = {4.11},
+}
+
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
new file mode 100644
index 00000000000..3eeb578e52a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
new file mode 100644
index 00000000000..ccf08acce59
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
@@ -0,0 +1,97 @@
+%% $Id: xltabular-doc.tex 586 2017-09-27 17:00:55Z herbert $
+%
+\listfiles
+\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
+\usepackage{fontspec}
+\usepackage{graphicx}
+\usepackage{multido}
+\usepackage[%usefilenames,
+ TT={Scale=0.88,FakeStretch=0.9},
+ SS={Scale=0.9},
+ RM={Scale=0.9},
+ DefaultFeatures={Ligatures=TeX}]{lucida-otf} % support opentype math fonts
+\usepackage{xltabular}
+\makeatletter
+\let\XLVersion\xltabular@version
+\makeatother
+
+\usepackage{dtk-logos} % for Wikipedia W
+\usepackage{ragged2e}
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
+\pagestyle{headings}
+
+\title{Package \texttt{xltabular} \\--\\ v.~\XLVersion}
+\author{Rolf Niepraschk \and Herbert Voß}
+\begin{document}
+\maketitle
+\tableofcontents
+
+\section{Introduction}
+
+The package \texttt{ltablex} supports an environment \texttt{tabularx} with
+the possiblity of pagebreaks and the same header/footer definitions as in
+the package \texttt{longtable}. But the old bevaviour of the \texttt{tabularx}
+environment is no more possible.
+
+The package \texttt{xltabular} defines an environment of the same name
+which behaves like a \texttt{tabularx} as a \texttt{longtable}. In short:
+it is a \texttt{longtable} with the column specifier \texttt{X}. But it leaves the
+\texttt{tabularx} environment with its original behaviour.
+
+
+\section{Examples}
+
+\newcommand\B{XXXXXXXXXXXXXXXXXXXXXXXXXXXX\\}
+\newcommand\BB{\B\B\B\B\B\B\B\B\B\B\B\B\B\B\B}
+\newcommand\BBB{\BB\BB\BB\BB}
+
+\listoftables
+
+\begin{tabularx}{\linewidth}{@{}X@{}}
+\captionaboveof{table}{The original \texttt{tabularx} environment: pagebreak not possible!}\\
+\BBB
+\end{tabularx}
+
+
+\begin{xltabular}{\linewidth}{@{}X@{}}
+\caption{the \texttt{xltabular} environment with \texttt{longtable} property}\\[\belowcaptionskip]
+\BB\\
+Now a manuel \texttt{\textbackslash pagebreak} is used\\
+\pagebreak
+\BBB
+\end{xltabular}
+
+
+
+\begin{xltabular}{\linewidth}{@{}>{\ttfamily}l>{\RaggedRight}X@{}}
+\caption{File endings (only for a demonstration \ldots)}\\\hline
+.ext & Beschreibung\\\hline
+\endfirsthead
+\multicolumn{2}{@{}l}{\ldots\ \small Fortsetzung}\\\hline
+.ext & Beschreibung\\\hline
+\endhead
+\hline
+\multicolumn{2}{r@{}}{\small Fortsetzung\ldots}\\
+\endfoot
+\hline
+\endlastfoot
+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}
+
+
+
+\nocite{*}
+\printbibliography
+
+
+\end{document}
+
diff --git a/Master/texmf-dist/tex/latex/xltabular/xltabular.sty b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
new file mode 100644
index 00000000000..5a356850a43
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
@@ -0,0 +1,51 @@
+%% $Id: xltabular.sty 586 2017-09-27 17:00:55Z 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 hvoss@tug.org
+% Rolf Niepraschk Rolf.Nieprasch@gmx.de
+%%
+\def\xltabular@version{0.01 }
+\ProvidesPackage{xltabular}
+ [2017/09/27 v\xltabular@version `xltabular' package (hv,rn)]
+
+\RequirePackage{tabularx}
+\let\ORIGi@tabularx=\tabularx
+\let\ORIGi@endtabularx=\endtabularx
+\let\ORIGi@TX@endtabularx=\TX@endtabularx
+%
+\RequirePackage{ltablex}
+\let\ORIGii@tabularx=\tabularx
+\let\ORIGii@TX@endtabularx=\TX@endtabularx
+%
+\let\ORIG@longtable=\longtable
+\let\ORIG@LT@capti@n=\LT@capti@n
+%
+% restore original tabularx
+\let\tabularx=\ORIGi@tabularx
+\let\endtabularx=\ORIGi@endtabularx
+\let\TX@endtabularx=\ORIGi@TX@endtabularx
+%
+% define a new tabularx like the one from "ltablex"
+%
+\newenvironment{xltabular}
+ {\let\TX@endtabularx=\ORIGii@TX@endtabularx
+ \let\endtabularx\endxltabular
+ \ORIGii@tabularx}
+ {\def\@currenvir{tabularx}}
+%
+% In "longtable" Erhöhung des Zählers "table" nur durch "\caption"
+\def\LT@capti@n{%
+ \refstepcounter{table}%
+ \ORIG@LT@capti@n
+}
+\def\longtable{%
+ \addtocounter{table}\m@ne
+ \ORIG@longtable
+}
+
+\endinput
+%%
+%% End of file `xltabular.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index f3ae9b72168..bc7252d631f 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -675,7 +675,7 @@ my @TLP_working = qw(
xetexfontinfo xetexko
xetexref xevlna xfor xgreek xhfill
xii xifthen xint xits
- xkeyval xlop xltxtra xmltex xmpincl xnewcommand
+ xkeyval xlop xltabular xltxtra xmltex xmpincl xnewcommand
xoptarg xpatch xpeek xpiano xpicture xpinyin xprintlen xpunctuate
xq xsavebox xsim xskak xstring xtab xunicode
xwatermark xyling xymtex xypic xypic-tut-pt xytree
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e765bb46208..1985917fc59 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1215,6 +1215,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'xits', "&MAKEflatten",
'xkeyval', "&MAKExkeyval",
'xlop', "&MAKEflatten",
+ 'xltabular', "&MAKEflatten",
'xmltex', "&MAKExmltex",
'xor', "die 'skipping, will be in xpackages when ready (Morten says)'",
'xpackages', "die 'skipping, now l3packages, etc.'",
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 8b93a89c835..3c05e12e19e 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -1139,6 +1139,7 @@ depend xfor
depend xhfill
depend xifthen
depend xint
+depend xltabular
depend xmpincl
depend xnewcommand
depend xoptarg
diff --git a/Master/tlpkg/tlpsrc/xltabular.tlpsrc b/Master/tlpkg/tlpsrc/xltabular.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/xltabular.tlpsrc