summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-14 00:12:12 +0000
committerKarl Berry <karl@freefriends.org>2010-02-14 00:12:12 +0000
commitcaf27f98dd109e15fcda5323dce0c3a9f3e6eed0 (patch)
treef0d7ac2cfe016ab076682b60f0f31427f646bcef
parent06a770f9fb7cc731254863ff9de5e19807c652a3 (diff)
xtab 2.3e (13feb10)
git-svn-id: svn://tug.org/texlive/trunk@16998 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/xtab/README49
-rw-r--r--Master/texmf-dist/doc/latex/xtab/xtab.pdfbin237781 -> 392419 bytes
-rw-r--r--Master/texmf-dist/source/latex/xtab/xtab.dtx60
-rw-r--r--Master/texmf-dist/source/latex/xtab/xtab.ins36
-rw-r--r--Master/texmf-dist/tex/latex/xtab/xtab.sty38
5 files changed, 98 insertions, 85 deletions
diff --git a/Master/texmf-dist/doc/latex/xtab/README b/Master/texmf-dist/doc/latex/xtab/README
index a97a77d3c77..b636c67b2d9 100644
--- a/Master/texmf-dist/doc/latex/xtab/README
+++ b/Master/texmf-dist/doc/latex/xtab/README
@@ -1,29 +1,34 @@
+________________
+The XTAB package
+
The xtab package automatically breaks long tables so that they can
span multiple pages. It is an extension of the supertabular package,
providing additional functionality and reducing some of the weaknesses.
Alternatively, you may find the longtable package fits your needs better.
-NOTE: If you have any questions please ask them on the comp.text.tex
- newsgroup where you are likely to get better and faster responses
- than trying to contact me directly as I am away more than I am here.
+______________
+Change History
-Changes (2008/07/26)
-o v2.3c released, hopefully with all extraneous spaces eliminated
+v2.3e (2010/02/06)
+ - Allow "calc" input in columns widths and row separations (with \\[...]);
+ thanks to Martin Reinders for the error report and diagnosis.
+
+v2.3d (2009/09/04) - New maintainer (Will Robertson)
+v2.3c (2008/07/26) - hopefully all extraneous spaces eliminated
-----------------------------------------------------------------
- Author: Peter Wilson (herries dot press (at) earthlink dot net)
+ Author: Peter Wilson, Herries Press
+ Maintainer: Will Robertson (will dot robertson at latex-project dot org)
Copyright 1998 -- 2008 Peter R. Wilson
+ Copyright 2010 Will Robertson
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
- version 1.3 of this license or (at your option) any
- later version.
- The latest version of the license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of
- LaTeX version 2003/06/01 or later.
-
- This work has the LPPL maintenance status "author-maintained".
+ version 1.3c of this license or (at your option) any
+ later version: <http://www.latex-project.org/lppl.txt>
+
+ This work has the LPPL maintenance status "maintained".
+ The Current Maintainer of this work is Will Robertson.
This work consists of the files:
README (this file)
@@ -41,18 +46,14 @@ xtab.pdf (user manual)
-----------------------------------------------------------------
To install the package:
-o run: latex xtab.ins (which will generate xtab.sty)
-o Move xtab.sty to a location where LaTeX will find it.
+- run: latex xtab.ins (which will generate xtab.sty)
+- Move xtab.sty to a location where LaTeX will find it.
(typically in a local texmf tree at tex/latex/xtab) and refresh the
file database. See the FAQ on CTAN at help/uk-tex-faq or
http://www.tug.ac.uk/faq for more information on this.
To regenerate the user manual:
-o run: (pdf)latex xtab.dtx
-o run: makeindex -s gind.ist xtab
-o run: latex xtab.dtx
-o Print xtab.(pdf|dvi) for a hardcopy of the package manual
-
-2008/07/26
-Peter Wilson
-herries dot press (at) earthlink dot net
+- run: (pdf)latex xtab.dtx
+- run: makeindex -s gind.ist xtab
+- run: latex xtab.dtx
+- Print xtab.(pdf|dvi) for a hardcopy of the package manual
diff --git a/Master/texmf-dist/doc/latex/xtab/xtab.pdf b/Master/texmf-dist/doc/latex/xtab/xtab.pdf
index 6d091fe52fb..446db56173d 100644
--- a/Master/texmf-dist/doc/latex/xtab/xtab.pdf
+++ b/Master/texmf-dist/doc/latex/xtab/xtab.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/xtab/xtab.dtx b/Master/texmf-dist/source/latex/xtab/xtab.dtx
index 420bd6f8bd9..9266be6fe3d 100644
--- a/Master/texmf-dist/source/latex/xtab/xtab.dtx
+++ b/Master/texmf-dist/source/latex/xtab/xtab.dtx
@@ -2,21 +2,27 @@
%
% xtab.dtx
% Author: Peter Wilson (herries dot press (at) earthlink dor net)
+% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
% Copyright 1998 -- 2008 Peter R. Wilson
+% Copyright 2010 Will Robertson
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any
-% later version.
-% The latest version of the license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2003/06/01 or later.
+% version 1.3c of this license or (at your option) any
+% later version: <http://www.latex-project.org/lppl.txt>
%
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
+% The Current Maintainer of this work is Will Robertson.
%
% This work consists of the files listed in the README file.
%
+%<*driver>
+\ProvidesFile{xtab.dtx}
+%</driver>
+%<xtab>\ProvidesPackage{xtab}
+%<*xtab>
+ [2010/02/06 v2.3e Extended supertabular package]
+%</xtab>
%
%<*driver>
\documentclass{ltxdoc}
@@ -32,7 +38,7 @@
%</driver>
%
% \fi
-% \CheckSum{1521}
+% \CheckSum{1527}
%
% \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
% \DoNotIndex{\@centercr,\@cite}
@@ -76,11 +82,7 @@
% \DoNotIndex{\wd,\xiipt,\year,\z@}
%
% \def\dtxfile{xtab.dtx}
-% \def\fileversion{v2.3}
-% \def\filedate{2000/04/09}
-% \def\fileversion{v2.3a} \def\filedate{2004/05/24}
-% \def\fileversion{v2.3b} \def\filedate{2007/03/24}
-% \def\fileversion{v2.3c} \def\filedate{2008/07/26}
+% \GetFileInfo{\dtxfile}
% \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package
% \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option
% \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file
@@ -92,9 +94,10 @@
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
% \filedate.}}
%
-% \author{%
-% Peter Wilson \\
-% \texttt{herries dot press (at) earthlink dot net}
+% \author{
+% Author: Peter Wilson, Herries Press \\
+% Maintainer: Will Robertson \\
+% \texttt{will dot robertson at latex-project dot org}
% }
% \date{\filedate}
% \maketitle
@@ -520,11 +523,9 @@
% \changes{v2.3}{2000/04/09}{Improved pagebreak control via \cs{xentrystretch} }
% \changes{v2.3b}{2007/03/24}{Allow calc package calculations}
% \changes{v2.3c}{2008/07/26}{Tried to eliminate all extraneous spaces}
+% \changes{v2.3d}{2009/09/04}{New maintainer (Will Robertson)}
% \begin{macrocode}
%<*xtab>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xtab}[2008/07/26 v2.3c Extended supertabular package]
-
% \end{macrocode}
%
% \begin{macro}{\c@tracingst}
@@ -990,6 +991,7 @@
%
% All redefined macros have names that are similar to the original
% names, except with a leading `ST'.
+% \changes{v2.3e}{2010/02/06}{Allow calc use.}
% \begin{macrocode}
\def\ST@tabularcr{%
{\ifnum0=`}\fi
@@ -1000,7 +1002,8 @@
{\ifnum0=`{\fi}\cr\ST@cr}}
\def\ST@argtabularcr[#1]{%
\ifnum0=`{\fi}%
- \ifdim #1>\z@
+ \setlength\@tempdima{#1}%
+ \ifdim \@tempdima>\z@
\unskip\ST@xargarraycr{#1}%
\else
\ST@yargarraycr{#1}%
@@ -1013,20 +1016,26 @@
%
% \begin{macro}{\ST@xargarraycr}
% \begin{macro}{\ST@yargarraycr}
+% \changes{v2.3e}{2010/02/06}{Allow calc use.}
% In this case we need to copy the value of the optional argument
% of |\\| in our private register |\ST@toadd|.
% \begin{macrocode}
\def\ST@xargarraycr#1{%
- \@tempdima #1\advance\@tempdima \dp \@arstrutbox
+ \setlength\@tempdima{#1}%
+ \advance\@tempdima \dp \@arstrutbox
\vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr
- \noalign{\global\ST@toadd=#1}\ST@cr}
+ \noalign{\setlength{\global\ST@toadd}{#1}}\ST@cr
+}
% \end{macrocode}
%
% Here we need to insert |\ST@cr|
% \begin{macrocode}
\def\ST@yargarraycr#1{%
- \cr\noalign{\vskip #1\global\ST@toadd=#1}\ST@cr}
-
+ \cr\noalign{%
+ \setlength{\global\ST@toadd}{#1}%
+ \vskip\ST@toadd
+ }\ST@cr
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1048,10 +1057,11 @@
% \end{macro}
%
% \begin{macro}{\ST@astartpbox}
+% \changes{v2.3e}{2010/02/06}{Allow calc use.}
% supertabular version of |\@astartpbox|.
% \begin{macrocode}
\def\ST@astartpbox#1{%
- \bgroup\hsize#1%
+ \bgroup\setlength\hsize{#1}%
%%%% \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore}
\setbox\ST@pbox\vtop\bgroup\setlength\hsize{#1}\@arrayparboxrestore}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/xtab/xtab.ins b/Master/texmf-dist/source/latex/xtab/xtab.ins
index f19d8fa16fd..7f5d90e1257 100644
--- a/Master/texmf-dist/source/latex/xtab/xtab.ins
+++ b/Master/texmf-dist/source/latex/xtab/xtab.ins
@@ -1,17 +1,15 @@
%% xtab.ins
-%% Author: Peter Wilson (herries dot press (at) earthlink dot net)
+%% Author: Peter Wilson
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
%% Copyright 1998 -- 2008 Peter R. Wilson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% version 1.3c of this license or (at your option) any
+%% later version: <http://www.latex-project.org/lppl.txt>
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "maintained".
+%% The Current Maintainer of this work is Will Robertson.
%%
%% This work consists of the files listed in the README file.
%%
@@ -29,33 +27,33 @@
\preamble
-----------------------------------------------------------------
- Author: Peter Wilson (herries dot press (at) earthlink dot net)
+ Author: Peter Wilson
+ Maintainer: Will Robertson (will dot robertson at latex-project dot org)
Copyright 1998 -- 2008 Peter R. Wilson
+ Copyright 2010 Will Robertson
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
- version 1.3 of this license or (at your option) any
- later version.
- The latest version of the license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of
- LaTeX version 2003/06/01 or later.
-
- This work has the LPPL maintenance status "author-maintained".
+ version 1.3c of this license or (at your option) any
+ later version: <http://www.latex-project.org/lppl.txt>
+
+ This work has the LPPL maintenance status "maintained".
+ The Current Maintainer of this work is Will Robertson.
This work consists of the files listed in the README file.
-----------------------------------------------------------------
\endpreamble
+\askforoverwritefalse
\keepsilent
%%% \Msg{*** Generating the driver file ***}
-%%% \generateFile{xtab.drv}{t}{\from{xtab.dtx}{driver}}
+%%% \generate{\file{xtab.drv}{\from{xtab.dtx}{driver}}}
\Msg{*** Generating the LaTeX2e package files ***}
-\generateFile{xtab.sty}{t}{\from{xtab.dtx}{xtab}}
+\generate{\file{xtab.sty}{\from{xtab.dtx}{xtab}}}
\Msg{***********************************************************}
\Msg{*}
diff --git a/Master/texmf-dist/tex/latex/xtab/xtab.sty b/Master/texmf-dist/tex/latex/xtab/xtab.sty
index 09b882d7b25..0bd745d276f 100644
--- a/Master/texmf-dist/tex/latex/xtab/xtab.sty
+++ b/Master/texmf-dist/tex/latex/xtab/xtab.sty
@@ -7,26 +7,24 @@
%% xtab.dtx (with options: `xtab')
%%
%% -----------------------------------------------------------------
-%% Author: Peter Wilson (herries dot press (at) earthlink dot net)
+%% Author: Peter Wilson
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
%% Copyright 1998 -- 2008 Peter R. Wilson
+%% Copyright 2010 Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% version 1.3c of this license or (at your option) any
+%% later version: <http://www.latex-project.org/lppl.txt>
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "maintained".
+%% The Current Maintainer of this work is Will Robertson.
%%
%% This work consists of the files listed in the README file.
%% -----------------------------------------------------------------
%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xtab}[2008/07/26 v2.3c Extended supertabular package]
-
+\ProvidesPackage{xtab}
+ [2010/02/06 v2.3e Extended supertabular package]
\newcount\c@tracingst
\DeclareOption{errorshow}{\c@tracingst\z@}
%%%%\DeclareOption{pageshow}{\c@tracingst\tw@}
@@ -146,23 +144,29 @@
{\ifnum0=`{\fi}\cr\ST@cr}}
\def\ST@argtabularcr[#1]{%
\ifnum0=`{\fi}%
- \ifdim #1>\z@
+ \setlength\@tempdima{#1}%
+ \ifdim \@tempdima>\z@
\unskip\ST@xargarraycr{#1}%
\else
\ST@yargarraycr{#1}%
\fi}
\def\ST@xargarraycr#1{%
- \@tempdima #1\advance\@tempdima \dp \@arstrutbox
+ \setlength\@tempdima{#1}%
+ \advance\@tempdima \dp \@arstrutbox
\vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr
- \noalign{\global\ST@toadd=#1}\ST@cr}
+ \noalign{\setlength{\global\ST@toadd}{#1}}\ST@cr
+}
\def\ST@yargarraycr#1{%
- \cr\noalign{\vskip #1\global\ST@toadd=#1}\ST@cr}
-
+ \cr\noalign{%
+ \setlength{\global\ST@toadd}{#1}%
+ \vskip\ST@toadd
+ }\ST@cr
+}
\def\ST@startpbox#1{%
%%%% \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore}
\setbox\ST@pbox\vtop\bgroup\setlength\hsize{#1}\@arrayparboxrestore}
\def\ST@astartpbox#1{%
- \bgroup\hsize#1%
+ \bgroup\setlength\hsize{#1}%
%%%% \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore}
\setbox\ST@pbox\vtop\bgroup\setlength\hsize{#1}\@arrayparboxrestore}
\def\ST@endpbox{%