texlive[45433] Master/texmf-dist: xltabular (29sep17)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 29 22:39:03 CEST 2017
Revision: 45433
http://tug.org/svn/texlive?view=revision&revision=45433
Author: karl
Date: 2017-09-29 22:39:03 +0200 (Fri, 29 Sep 2017)
Log Message:
-----------
xltabular (29sep17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/xltabular/Changes
trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
trunk/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/xltabular/doc/
trunk/Master/texmf-dist/doc/latex/xltabular/latex/
Modified: trunk/Master/texmf-dist/doc/latex/xltabular/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xltabular/Changes 2017-09-29 20:38:39 UTC (rev 45432)
+++ trunk/Master/texmf-dist/doc/latex/xltabular/Changes 2017-09-29 20:39:03 UTC (rev 45433)
@@ -1 +1,3 @@
+0.02 2017-09-28 - added optional argument for horizontal alignment
+ - extended documentation
0.01 2017-09-27 - first CTAN version
Modified: trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex 2017-09-29 20:38:39 UTC (rev 45432)
+++ trunk/Master/texmf-dist/doc/latex/xltabular/xltabular-doc.tex 2017-09-29 20:39:03 UTC (rev 45433)
@@ -1,30 +1,56 @@
-%% $Id: xltabular-doc.tex 586 2017-09-27 17:00:55Z herbert $
+%% $Id: xltabular-doc.tex 592 2017-09-29 06:52:56Z herbert $
%
\listfiles
-\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
+\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
+ captions=tableabove,twoside=on]{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[%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
+\setmainfont{AccanthisADFStdNo3}[
+ UprightFont =*-Regular,
+ BoldFont =*-Bold,
+ ItalicFont =*-Italic,
+ BoldItalicFont=*-BoldItalic,
+]
+\setsansfont{GilliusADF}[
+ UprightFont =*-Regular,
+ BoldFont =*-Bold,
+ ItalicFont =*-Italic,
+ BoldItalicFont=*-BoldItalic,
+]
+\setmonofont{Anonymous Pro}[Scale=MatchLowercase,FakeStretch=0.9]
+
+\usepackage[english]{babel}
+\usepackage{scrlayer-scrpage}
+\automark[section]{section}
+\automark*[subsection]{}
+\pagestyle{scrheadings}
+
+\usepackage{selnolig}
+\nolig{oe}{o|e}
+
\usepackage{xltabular}
\makeatletter
\let\XLVersion\xltabular at version
\makeatother
+\usepackage{fancyvrb}
+\usepackage{blindtext}
\usepackage{dtk-logos} % for Wikipedia W
\usepackage{ragged2e}
-\usepackage{biblatex}
+\usepackage[bibstyle=dtk]{biblatex}
\addbibresource{\jobname.bib}
-\pagestyle{headings}
+\raggedbottom
+\usepackage[colorlinks,linktocpage]{hyperref}
+\newcommand*\cs[1]{\texttt{\textbackslash#1}}
\title{Package \texttt{xltabular} \\--\\ v.~\XLVersion}
-\author{Rolf Niepraschk \and Herbert Voß}
+\author{Rolf Niepraschk\thanks{Rolf.Niepraschk at gmx.de} \and Herbert Voß\thanks{hvoss at tug.org}}
\begin{document}
\maketitle
\tableofcontents
@@ -41,32 +67,158 @@
it is a \texttt{longtable} with the column specifier \texttt{X}. But it leaves the
\texttt{tabularx} environment with its original behaviour.
+The syntax of the environment is similiar to the one of \texttt{tabularx}:
+\begin{verbatim}
+\begin{xltabular}[hPos]{width}{ l X ...}
+\caption{...\label{...}}\\
+tabular body
+\end{xltabular}
+\end{verbatim}
+
+For the optional argument \texttt{hPos} (horizontal position) the values \texttt{l},
+\texttt{r} and \texttt{c} (default)
+are possible. The environment \texttt{xltabular} uses \texttt{longtable} for
+typesetting the tabular. The original \texttt{longtable} increases the counter
+\texttt{table} in any case, with or without a caption. This is not the case
+with \texttt{xltabular}: no \cs{caption}, no counter change.
+
+
+
+
\section{Examples}
-\newcommand\B{XXXXXXXXXXXXXXXXXXXXXXXXXXXX\\}
+\newcommand\B{Some nonsense text which fills at least one line
+ of a tabular called nonsense tabular with text.\\}
\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
+
+\markboth{Examples}{}
+\vspace{1cm}
+
+
+\subsection{The standard \texttt{tabularx} environment}
+
+\begin{Verbatim}[frame=lines]
+\captionaboveof{table}{Using the original \texttt{tabularx} environment:
+ a pagebreak not possible! This is the reason why the tabular moves
+ to the next page.}
+\begin{tabularx}{0.75\linewidth}{@{} lX @{}}
+left column & \blindtext\\
+l & \blindtext\\
+left column & \blindtext\\
+l & \blindtext\\
\end{tabularx}
+\end{Verbatim}
+\captionaboveof{table}{Using the original \texttt{tabularx} environment:
+ a pagebreak not possible! This is the reason why the tabular moves
+ to the next page.}
+\begin{tabularx}{0.75\linewidth}{@{} lX @{}}
+ left column & \blindtext\\
+ l & \blindtext\\
+ left column & \blindtext\\
+ l & \blindtext\\
+\end{tabularx}
-\begin{xltabular}{\linewidth}{@{}X@{}}
-\caption{the \texttt{xltabular} environment with \texttt{longtable} property}\\[\belowcaptionskip]
+
+%\begin{tabularx}{\linewidth}{@{}X@{}}
+%\captionaboveof{table}{Another example for the original \texttt{tabularx} environment:
+%%%pagebreak not possible!}\\
+%\BBB
+%\end{tabularx}
+
+\clearpage
+
+\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.
+
+\begin{Verbatim}[frame=lines]
+\begin{xltabular}{\linewidth}{@{} X @{}}
+\caption{the \texttt{xltabular} environment with \texttt{longtable}
+ property}\\[\belowcaptionskip]
\BB\\
-Now a manuel \texttt{\textbackslash pagebreak} is used\\
+Now a manuel \cs{pagebreak} is used and on the
+following page an automatic pagebreak is done by \texttt{longtable}.\\
+
\pagebreak
+
\BBB
\end{xltabular}
+\end{Verbatim}
+\begin{xltabular}{\linewidth}{@{} X @{}}
+\caption{the \texttt{xltabular} environment with \texttt{longtable}
+ property}\\[\belowcaptionskip]
+\BB\\
+Now a manuel \cs{pagebreak} is used and on the
+following page an automatik pagebreak is done by \texttt{longtable}.\\
+\pagebreak
-\begin{xltabular}{\linewidth}{@{}>{\ttfamily}l>{\RaggedRight}X@{}}
+\BBB
+\end{xltabular}
+
+The command \cs{BBB} does nothing else then printing a lot of lines
+with nonsense.
+
+
+\setcapwidth{0.75\linewidth}
+
+\begin{Verbatim}[frame=lines]
+\begin{xltabular}[l]{0.75\linewidth}{@{} lX @{}}
+\caption{The \texttt{xltabular} environment with \texttt{longtable} property
+ and left aligned by setting the optional argument.}\\[\belowcaptionskip]\hline
+Left column & At first a line with some nonsense text to show how long this line is.
+ The caption has the same width as the text.\\
+left column & \blindtext\\
+left column & \blindtext\\
+left column & \blindtext\\
+left column & \blindtext\\\hline
+\end{xltabular}
+\end{Verbatim}
+
+
+
+\begin{xltabular}[l]{0.75\linewidth}{@{} lX @{}}
+ \caption{The \texttt{xltabular} environment with \texttt{longtable} property
+ and left aligned by setting the optional argument.}\\[\belowcaptionskip]\hline
+ Left column & At first a line with some nonsense text to show how long this line is.
+ The caption has the same width as the text.\\
+ left column & \blindtext\\
+ left column & \blindtext\\
+ left column & \blindtext\\
+ left column & \blindtext\\\hline
+\end{xltabular}
+
+
+
+
+\subsection{\texttt{tabularx} without a caption}
+
+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!
+
+\begin{tabularx}{\linewidth}{@{} >{\ttfamily}l>{\RaggedRight}X @{}}\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{tabularx}
+
+
+\subsection{\texttt{xltabular} with header/footer definitions}
+
+\begin{Verbatim}[frame=lines]
+\begin{xltabular}{\linewidth}{@{} >{\ttfamily}l >{\RaggedRight}X @{}}
\caption{File endings (only for a demonstration \ldots)}\\\hline
.ext & Beschreibung\\\hline
\endfirsthead
@@ -83,12 +235,56 @@
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\\
+clo & (class options) Definitionen für die Dokumentenklasse und die entsprechenden
+[...]
+Klassen-Optionen\\
\end{xltabular}
+\end{Verbatim}
+\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\\
+ 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\\
+ 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\\
+ 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
Modified: trunk/Master/texmf-dist/tex/latex/xltabular/xltabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xltabular/xltabular.sty 2017-09-29 20:38:39 UTC (rev 45432)
+++ trunk/Master/texmf-dist/tex/latex/xltabular/xltabular.sty 2017-09-29 20:39:03 UTC (rev 45433)
@@ -1,15 +1,15 @@
-%% $Id: xltabular.sty 586 2017-09-27 17:00:55Z herbert $
+%% $Id: xltabular.sty 592 2017-09-29 06:52:56Z 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 at tug.org
-% Rolf Niepraschk Rolf.Nieprasch at gmx.de
+% Copyright 2017 Herbert Voss <hvoss at tug.org>
+% Rolf Niepraschk <Rolf.Niepraschk at gmx.de>
%%
-\def\xltabular at version{0.01 }
+\def\xltabular at version{0.02 }
\ProvidesPackage{xltabular}
- [2017/09/27 v\xltabular at version `xltabular' package (hv,rn)]
+ [2017/09/28 v\xltabular at version `xltabular' package (hv,rn)]
\RequirePackage{tabularx}
\let\ORIGi at tabularx=\tabularx
@@ -30,13 +30,20 @@
%
% define a new tabularx like the one from "ltablex"
%
-\newenvironment{xltabular}
- {\let\TX at endtabularx=\ORIGii at TX@endtabularx
+\newenvironment{xltabular}[1][x]
+ {\if l#1%
+ \LTleft\z@ \LTright\fill
+ \else\if r#1%
+ \LTleft\fill \LTright\z@
+ \else\if c#1%
+ \LTleft\fill \LTright\fill
+ \fi\fi\fi
+ \let\TX at endtabularx=\ORIGii at TX@endtabularx
\let\endtabularx\endxltabular
\ORIGii at tabularx}
{\def\@currenvir{tabularx}}
%
-% In "longtable" Erhöhung des Zählers "table" nur durch "\caption"
+% In "longtable" increase the counter "table" only if "\caption" is used
\def\LT at capti@n{%
\refstepcounter{table}%
\ORIG at LT@capti at n
More information about the tex-live-commits
mailing list