texlive[53658] Master/texmf-dist: supertabular (3feb20)
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 3 23:32:06 CET 2020
Revision: 53658
http://tug.org/svn/texlive?view=revision&revision=53658
Author: karl
Date: 2020-02-03 23:32:05 +0100 (Mon, 03 Feb 2020)
Log Message:
-----------
supertabular (3feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/supertabular/CATALOG
trunk/Master/texmf-dist/doc/latex/supertabular/ChangeLog
trunk/Master/texmf-dist/doc/latex/supertabular/MANIFEST
trunk/Master/texmf-dist/doc/latex/supertabular/README
trunk/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf
trunk/Master/texmf-dist/source/latex/supertabular/supertabular.dtx
trunk/Master/texmf-dist/source/latex/supertabular/supertabular.ins
trunk/Master/texmf-dist/tex/latex/supertabular/supertabular.sty
Modified: trunk/Master/texmf-dist/doc/latex/supertabular/CATALOG
===================================================================
--- trunk/Master/texmf-dist/doc/latex/supertabular/CATALOG 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/doc/latex/supertabular/CATALOG 2020-02-03 22:32:05 UTC (rev 53658)
@@ -1,7 +1,7 @@
Name: supertabular (also called supertab)
-Problems-To: texniek at braams.cistron.nl
+Problems-To: texniek at braams.xs4all.nl
Author: J.L. Braams and T. Jurriens
-Version: 4.1d
+Version: 4.1g
Description:
Modified: trunk/Master/texmf-dist/doc/latex/supertabular/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/supertabular/ChangeLog 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/doc/latex/supertabular/ChangeLog 2020-02-03 22:32:05 UTC (rev 53658)
@@ -1,12 +1,58 @@
-2001-08-21 Johannes Braams (texniek at braams.cistron.nl)
+2020-02-02 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx: Replaced the way the height of normal tabular
+ lines is calculated by basing it on the height and depth of
+ \strutbox. This also ment being able to take the \extrarowheight
+ from the array package into account.
+ Also the height of the first and subsequent heads was not taken
+ into account in the calculation of the available pageheigt. This
+ meant that especially the first part of the table could become too
+ high and hence be forced onto the next page (which is, by
+ consequence) not entirely filled).
+ Finally, if a caption preceeds the table, the entire height of the
+ caption and the white space around it may not yet be accounted in
+ \pagesofar. Therefore we substract a little extra from
+ \ST at pageleft.
+
+2020-01-26 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx: Updated the copyright year and rearranged the
+ text around the examples in order to get the first table to split
+ accross a page boundary again.
+
+2019-01-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The linenumber in the tracing information, that
+ is reported from within \\, is off by one when the optional
+ argument is missing. Therefore the input linenumber is now saved
+ before TeX starts scanning. Problem reported by Frank Mittelbach.
+
+2019-01-16 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The option "pageshow" didn't work as it set a
+ too low value in \c at tracingst. Problem reported by Frank
+ Mittelbach.
+
+2019-01-12 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx : The definition for the first table head was
+ different from the definition of the regular table heads.
+ This problem was reported by FMi as it produced an extra table in
+ an example.
+ The same was true for the table tail and the last table tail,
+ applied the same fix.
+ FMi also reported that a first table head, once set would appear on
+ all subsequent supertabulars. The internal macro's now `undefine'
+ themselves although this couteracts the change that was introduced
+ on 08-08-1999.
+
+2001-08-21 Johannes Braams <texniek at braams.xs4all.nl>
+
* supertabular.dtx : The macro \ST at next needs to be defined when
\ST at skippage was called. Therefore I moved the default definition
to earlier in the code; just before the \if clause after which it
is called; possibly defined by \ST at newpage. This problem was
- reported by Andrew Dorrell (dorrell at research.canon.com.au).
+ reported by Andrew Dorrell <dorrell at research.canon.com.au>.
-1999-08-08 Johannes Braams (texniek at braams.cistron.nl)
+1999-08-08 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : No longer re-initialize the internal variable
\@table at first@head and \@table at last@tail. This made it impossible
@@ -13,25 +59,25 @@
to have more than one supertabular in the same document with the
exact same appearance of the heads and tail without repeatedly
redeclaring the firsthead and/or lasttail. Reported by Christian
- Matuszewski (matuszew at informatik.uni-halle.de).
+ Matuszewski <matuszew at informatik.uni-halle.de>.
-Fri Nov 7 20:27:27 1997 Johannes Braams (texniek at braams.cistron.nl)
+Fri Nov 7 20:27:27 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : For standard LaTeX we need to change
\@@startpbox not \@startpbox. Found by Peter R Wilson
- (Peter.Wilson at PSS.Boeing.com)
+ <Peter.Wilson at PSS.Boeing.com>
-Wed Oct 8 22:35:40 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Oct 8 22:35:40 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Running the documentation revealed a loop;
inside the table tail and head \\ was reset to \@tabularcr instead
of to \@@tabularcr (now: \org at tabularcr). First found by Thomas
- Esser (te at informatik.uni-hannover.de)
+ Esser <te at informatik.uni-hannover.de>
-Sat Sep 27 21:35:29 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Added the mpsupertabular and mpsupertabular*
- environments provided by Axel Kielhorn (A.Kielhorn at tu-bs.de);
+ environments provided by Axel Kielhorn <A.Kielhorn at tu-bs.de>;
added \noindent in front of all the starts of tabulars and
minipages as it seems senseles to have a paragraph indent in front
of a large tabularl; fixed a few documentation bugs.
@@ -38,22 +84,22 @@
The calculation of the available height still missed the case
where TeX has already begun the second column.
-Thu Sep 18 00:31:55 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Sep 18 00:31:55 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : The \tablehead and \tabletail commands reset
the command \\; they used \cr for it. That should have been
\@tabularcr to properly deal with it's optional argument.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn <A.Kielhorn at tu-bs.de>
-Wed Sep 17 23:59:13 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : In two column mode the parameters that
determine how much space is left on the page were not correctly
initialised when TeX hasn't yet filled up the first column
completely.
- Found by Jeffrey Spielberg (jspielberg at infinet-software.com)
+ Found by Jeffrey Spielberg <jspielberg at infinet-software.com>
-Tue May 20 23:46:08 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue May 20 23:46:08 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : \shrinkheight didn't shrink the available
height for a part of the tabular (as documented); it just *set* it
@@ -61,9 +107,9 @@
\setSTheight for the former functionality
At the end of a supertabular \@table at first@head and
\@table at last@tail are undefined; this shoud be done globally.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn <A.Kielhorn at tu-bs.de>
-Sat Apr 12 23:37:33 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Apr 12 23:37:33 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Added \ST at stretchht and \ST at prevht to improve
decision process. \estimate at lineht now also computes the
@@ -70,12 +116,12 @@
difference between a normal line height and when \arraystretch is
in effect.
-Thu Apr 10 23:33:07 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Apr 10 23:33:07 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Had to repaire some documentation errors.
- (found by Thomas Esser (te at informatik.uni-hannover.de))
+ (found by Thomas Esser <te at informatik.uni-hannover.de>)
-Wed Apr 9 00:29:36 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Apr 9 00:29:36 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Only the first part of a supertabular can be
moved to the next page. Therefore we need to change the definition
@@ -82,22 +128,22 @@
of \ST at skippage in the middle of processing the supertabular data.
-Thu Mar 6 21:56:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Using a tabular environment in the cells of a
supertabular gives `interesting' results when the algorithm
decides to split the supertabular down the middle of an inner
tabular. A number of changes were necessary to make this work.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn <i0080108 at ws.rz.tu-bs.de>
-Thu Feb 20 23:29:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Feb 20 23:29:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Renamed \tableformat into \ST at tableformat
because the KOPMA-packages also use \tableformat and therefore
clashed with babel.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn <i0080108 at ws.rz.tu-bs.de>
-Tue Feb 4 23:50:50 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx (section{The Implementation}): Removed the use
of the page height correction for p-columns; the current algorithm
@@ -109,7 +155,7 @@
page on a calculated minimum height of the table. The minimum is
the head, the tail and 1 line of tabular data.
-Thu Nov 28 20:38:53 1996 Johannes Braams (texniek at braams.cistron.nl)
+Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Started a cleanup of the code, made source
file a full fledged .dtx file
@@ -122,12 +168,12 @@
% jurriens at fwn.rug.nl P.O Box 800, 9700 AV Groningen
%
% revised by: Johannes Braams
-% texniek at braams.cistron.nl TeXniek (NL)
+% texniek at braams.xs4all.nl TeXniek (NL)
% \def\fileversion{3.7c}
% \def\filename{supertabular sty}
% \def\filedate{1995/10/16}
%
-% \changes{v3.7c}{1995/10/16}{No space after the argument of
+% \changes{v3.7c}{1995/10/16}{No space after the argument of
% supertabular led to a `mysterious' error because of the space
% delemiting the argument}
% \changes{v3.7b}{1994/05/16}{Rewrote the page break deciding
@@ -195,7 +241,7 @@
% Reintroduced the version numbering
%
% revised by: Gabriele Kruljac
-% kruljac at ds0mpi11 Max-Planck-Institute Stuttgart
+% kruljac at ds0mpi11 Max-Planck-Institute Stuttgart
%
%
% 06.06.89 Correction: now care is taken of probably existing onecolumn
Modified: trunk/Master/texmf-dist/doc/latex/supertabular/MANIFEST
===================================================================
--- trunk/Master/texmf-dist/doc/latex/supertabular/MANIFEST 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/doc/latex/supertabular/MANIFEST 2020-02-03 22:32:05 UTC (rev 53658)
@@ -1,8 +1,9 @@
-README - A short introduction
-MANIFEST - A list of files
-CATALOG - An entry for the macro catalog
+README - A short introduction
+MANIFEST - A list of files
+CATALOG - An entry for the macro catalog
+Changelog - An overview of the changes to the package
supertabular.dtx - The documented version of the code, including a couple
of examples of how to use it. Needs supertabular.sty
to be available (run latex supertabular.ins first).
-supertabular.dtx - The `printed version\xB4 of supertabular.dtx
+supertabular.pdf - The `printed version' of supertabular.dtx
supertabular.ins - A docstrip file to produce the stripped code
Modified: trunk/Master/texmf-dist/doc/latex/supertabular/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/supertabular/README 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/doc/latex/supertabular/README 2020-02-03 22:32:05 UTC (rev 53658)
@@ -13,7 +13,7 @@
Supertabular can be used with LaTeX2e as a package.
-Copyright (C) 2004 Johannes L. Braams texniek at braams.cistron.nl
+Copyright (C) 1989 - 2020 Johannes L. Braams texniek at braams.xs4all.nl
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
Modified: trunk/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/supertabular/supertabular.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/supertabular/supertabular.dtx 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/source/latex/supertabular/supertabular.dtx 2020-02-03 22:32:05 UTC (rev 53658)
@@ -1,17 +1,17 @@
% \iffalse meta-comment
%
-% Copyright 1989-2004 Johannes L. Braams. All rights reserved.
+% Copyright 1989-2020 Johannes L. Braams. All rights reserved.
%
% This file is part of the supertabular package.
% ---------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this 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/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status "maintained".
%
@@ -25,12 +25,12 @@
% extension .ins) which are part of the distribution.
% \fi
%
-% \CheckSum{1025}
+% \CheckSum{1132}
% \iffalse
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2004 by Johannes Braams texniek at braams.cistron.nl
+%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
%% Kersengaarde 33
%% 2723 BP Zoetermeer NL
%% all rights reserved.
@@ -43,11 +43,11 @@
%<package>\ProvidesPackage{supertabular}
%<driver>\ProvidesFile{supertabular.drv}
%\ProvidesFile{supertabular.dtx}
- [2004/02/20 v4.1e the supertabular environment]
+ [2020/02/02 v4.1g the supertabular environment]
%
%<*driver>
\documentclass{ltxdoc}
-\usepackage{supertabular}
+\usepackage[debugshow]{supertabular}
\newcommand{\tbsp}{\rule{0pt}{18pt}}
\begin{document}
\providecommand{\Lenv}[1]{\textsf{#1}}
@@ -187,7 +187,7 @@
% of the table with the command |\shrinkheight{...pt}| after the
% first |\\| of the supertabular.
% \item The \Lenv{mpsupertabular} environment sometimes has problems
-% with pagesbreaks when footnotes appear in the lower part of the
+% with pagebreaks when footnotes appear in the lower part of the
% tabular.
% \end{itemize}
%
@@ -194,9 +194,9 @@
% \section{Examples}
%
% \DeleteShortVerb{\|}
-% Here is an example of a \Lenv{supertabular}. You will find the
-% definitions after the table.
-%
+% Here is an example of a \Lenv{supertabular}.
+% First, here is (part of) the user input for the table below:
+%\begin{verbatim}
% \begin{center}
% \tablefirsthead{%
% \hline
@@ -222,32 +222,18 @@
% \bottomcaption{This table is split across pages}
%
% \begin{supertabular}{|r@{\hspace{6.5mm}}|r@{\hspace{5.5mm}}|r|r|}
-% 1\tbsp & 1 & 1 & 1 \\
+% 1 & 1 & 1 & 1 \\
% 2 & 4 & 16 & 2 \\
% 3 & 9 & 81 & 6 \\
% 4 & 16 & 256 & 24 \\[5mm]
-% 5 & 25 & 625 & 120 \\
-% 6 & 36 & 1296 & 720 \\
-% 7 & 49 & 2401 & 5040 \\
-% 8 & 64 & 4096 & 40320 \\
-% 9 & 81 & 6561 & 362880 \\
-% 10 & 100 & 10000 & 3628800 \\
-% 11 & 121 & 14641 & 39916800 \\
-% 12 & 144 & 20736 & 479001600 \\[.5cm]
-% \hline & & & \\
-% 13 & 169 & 28561 & 6.22702080E+9 \\[1cm]
-% 14 & 196 & 38416 & 8.71782912E+10\\
-% 15 & 225 & 50625 & 1.30767437E+12\\
-% 16 & 256 & 65536 & 2.09227899E+13\\
-% 17 & 289 & 83521 & 3.55687428E+14\\[5mm]
-% 18 & 324 & 104976 & 6.40237370E+15\\
+% ...
% 19 & 361 & 130321 & 1.21645100E+17\\
% 20 & 400 & 160000 & 2.43290200E+18\\
% \end{supertabular}
% \end{center}
+%\end{verbatim}
%
-% And here is (part of) the user input for the table above:
-%\begin{verbatim}
+% Then the table should be split across the page boundary:
% \begin{center}
% \tablefirsthead{%
% \hline
@@ -273,16 +259,29 @@
% \bottomcaption{This table is split across pages}
%
% \begin{supertabular}{|r@{\hspace{6.5mm}}|r@{\hspace{5.5mm}}|r|r|}
-% 1 & 1 & 1 & 1 \\
+% 1\tbsp & 1 & 1 & 1 \\
% 2 & 4 & 16 & 2 \\
% 3 & 9 & 81 & 6 \\
% 4 & 16 & 256 & 24 \\[5mm]
-% ...
+% 5 & 25 & 625 & 120 \\
+% 6 & 36 & 1296 & 720 \\
+% 7 & 49 & 2401 & 5040 \\
+% 8 & 64 & 4096 & 40320 \\
+% 9 & 81 & 6561 & 362880 \\
+% 10 & 100 & 10000 & 3628800 \\
+% 11 & 121 & 14641 & 39916800 \\
+% 12 & 144 & 20736 & 479001600 \\[.5cm]
+% \hline & & & \\
+% 13 & 169 & 28561 & 6.22702080E+9 \\[1cm]
+% 14 & 196 & 38416 & 8.71782912E+10\\
+% 15 & 225 & 50625 & 1.30767437E+12\\
+% 16 & 256 & 65536 & 2.09227899E+13\\
+% 17 & 289 & 83521 & 3.55687428E+14\\[5mm]
+% 18 & 324 & 104976 & 6.40237370E+15\\
% 19 & 361 & 130321 & 1.21645100E+17\\
% 20 & 400 & 160000 & 2.43290200E+18\\
% \end{supertabular}
% \end{center}
-%\end{verbatim}
%
% Here is another example whith a \texttt{p} column-definition. The
% tablehead is the same as above. The tabletail is a double
@@ -290,6 +289,13 @@
% the font size is \verb|\small|.
%
% \begin{center}
+% \tablefirsthead{%
+% \hline
+% \multicolumn{1}{|c}{\tbsp Number} &
+% \multicolumn{1}{c}{Number$^2$} &
+% Number$^4$ &
+% \multicolumn{1}{c|}{Number!} \\
+% \hline}
% \tablelasttail{\hline\hline}
% \topcaption{This table should also be split accross pages.}
% \renewcommand{\arraystretch}{1.5}
@@ -337,6 +343,13 @@
% full width of the text.
%
% \begin{center}
+% \tablefirsthead{%
+% \hline
+% \multicolumn{1}{|c}{\tbsp Number} &
+% \multicolumn{1}{c}{Number$^2$} &
+% Number$^4$ &
+% \multicolumn{1}{c|}{Number!} \\
+% \hline}
% \tablelasttail{\hline\hline}
% \topcaption{This table should also be split accross pages.}
% \renewcommand{\arraystretch}{1.5}
@@ -407,12 +420,16 @@
% \StopEventually{}
%
% \section{The Implementation}
-%
+% First we define a few options that control the level of tracing
+% output this package delivers. the option \textsf{errorshow} is the
+% default situation.
+% \changes{v4.1f}{2019/01/16}{The value for \cs{C at tracingst} needs to
+% be 3 instead of 2}
% \begin{macrocode}
%<*package>
\newcount\c at tracingst
\DeclareOption{errorshow}{\c at tracingst\z@}
-\DeclareOption{pageshow}{\c at tracingst\tw@}
+\DeclareOption{pageshow}{\c at tracingst\thr@@}
\DeclareOption{debugshow}{\c at tracingst5\relax}
\ProcessOptions
% \end{macrocode}
@@ -487,6 +504,22 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\ST at captionroom}
+% \changes{v4.1g}{2020/02/02}{New macro}
+% When a supertabular is preceded by a caption that fact might not
+% yet be visible in the amount of space occupoed on the page
+% sofar. Therefore we include the possibility to reduce the height
+% of the first part of the supertabular. In order to this we need a
+% macro that indicates a aption has been put in front of the
+% table. We do this to reduce the risk that the first part of the
+% table is too high after all and is pushed onto the next page due
+% to an overfull |\vbox| condition.
+% \begin{macrocode}
+\def\ST at captionroom{\z@}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\ST at caption}
% This is a redefinition of LaTeX's |\@caption|, |\@makecaption| is
% called within a group so as not to return to |\normalsize|
@@ -496,6 +529,8 @@
% and \textbf{none} at the bottom. If a user wants to precede his
% table with a caption this results in a collision.
%
+% \changes{v4.1g}{2020/02/02}{Record the fact that a caption has
+% preceeded the table by setting \cs{ST at captionroom}}
% \begin{macrocode}
\long\def\ST at caption#1[#2]#3{\par%
\addcontentsline{\csname ext@#1\endcsname}{#1}%
@@ -506,7 +541,7 @@
\normalsize
\if at topcaption \vskip -10\p@ \fi
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \if at topcaption \vskip 10\p@ \fi
+ \if at topcaption \vskip 10\p@ \gdef\ST at captionroom{20\p@}\fi
\endgroup}
% \end{macrocode}
% \end{macro}
@@ -528,8 +563,26 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tablehead{}
-\newcommand\tablefirsthead[1]{\gdef\@table at first@head{#1}}
% \end{macrocode}
+% It's possible to specify a different tablehead for the first
+% `part' of the table. That only needs to be used once so it
+% `undefines' itself at the end. That way we make sure that it
+% doesn't accidentally get used for a second supertabular in the
+% document.
+% \changes{v4.1f}{2019/01/12}{\cs{\@table at first@head} needs the same
+% definition as \cs{\@tablehead} (found by FMi)}
+% \begin{macrocode}
+\newcommand\tablefirsthead[1]{%
+ \gdef\@table at first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org at tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table at first@head\undefined
+ }}}
+% \end{macrocode}
% \end{macro}
% \end{macro}
%
@@ -539,7 +592,7 @@
% |\multicolumn|) in |\tabletail| \TeX\ starts looping because of
% the definition of |\ST at cr|. So make |\\| act just like a
% |\@tabularcr| inside this tail to prevent the loop. Save and
-% restore the value of |\\|
+% restore the value of |\\|.
%
% \changes{v4.0i}{1997/09/18}{Don't reset \cs{}\cs{} to \cs{cr}, but
% to \cs{@tabularcr}}
@@ -554,8 +607,26 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tabletail{}
-\newcommand\tablelasttail[1]{\gdef\@table at last@tail{#1}}
% \end{macrocode}
+% It's possible to specify a different tabletail for the last
+% `part' of the table. That only needs to be used once so it
+% `undefines' itself at the end. That way we make sure that it
+% doesn't accidentally get used for a second supertabular in the
+% document.
+% \changes{v4.1f}{2019/01/12}{\cs{\@table at last@tail} needs the same
+% definition as \cs{\@tabletail}}
+% \begin{macrocode}
+\newcommand\tablelasttail[1]{%
+ \gdef\@table at last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org at tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table at last@tail\undefined
+ }}}
+% \end{macrocode}
% \end{macro}
% \end{macro}
%
@@ -587,6 +658,39 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ST at trace@cr}
+% A variant of |\ST at trace| that can be called from within |\\| as
+% that command is looking for an optional argument will end up
+% scanning the next line.
+% \begin{macro}{\ST at save@lineno}
+% \changes{v4.1f}{2019/01/18}{Added a macro to save the current input
+% linenumber}
+% But because this variant is called from within |\\| we need to
+% save the current input linenumber before \TeX\ starts scanning
+% for the optional argument. If we don't, the reported linenumber
+% depends on whether or not the optional argument is present...
+% \begin{macrocode}
+\newcommand\ST at save@lineno{%
+ \expandafter\gdef\expandafter\ST at LineNo\expandafter{%
+ \the\inputlineno}}
+% \end{macrocode}
+% Within |\ST at trace@cr| we can than locally modify |\on at line| to
+% use this saved line number.
+% \begin{macrocode}
+\newcommand\ST at trace@cr[2]{%
+ \ifnum\c at tracingst>#1\relax
+ \begingroup
+ \edef\on at line{ on input line \ST at LineNo}%
+ \GenericWarning
+ {(supertabular)\@spaces\@spaces}
+ {Package supertabular: #2}%
+ \endgroup
+ \fi
+ }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\ST at pageleft}
% \changes{v3.7b}{1994/05/16}{Renamed from \cs{maxsize}}
% \changes{v4.0a}{1996/11/28}{Renamed from \cs{page at left}}
@@ -662,9 +766,11 @@
% height of the previous line to use it as an estimate for the
% height of the next line. This is needed for a better estimate of
% when to break the tabular.
+% \changes{v4.1g}{2020/02/02}{\cs{ST at stretchht} is no longer needed,
+% will be removed in a future release}
% \begin{macrocode}
\newdimen\ST at lineht
-\newdimen\ST at stretchht
+%\newdimen\ST at stretchht
\newdimen\ST at prevht
% \end{macrocode}
% \end{macro}
@@ -701,10 +807,13 @@
% |\@xtabularcr|.
%
% All redefined macros have names that are similar to the original
-% names, except with a leading 'ST'
+% names, except with a leading 'ST'.
% \begin{macrocode}
+% \changes{v4.1f}{2019/01/18}{Save the input linenumber before \TeX\
+% scans for an optional argument}
\def\ST at tabularcr{%
{\ifnum0=`}\fi
+ \ST at save@lineno
\@ifstar{\ST at xtabularcr}{\ST at xtabularcr}}
\def\ST at xtabularcr{%
\@ifnextchar[%]
@@ -797,7 +906,31 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
+% \begin{macro}{\ST at compute@lineht}
+% \changes{v4.1g}{2020/02/02}{New macro \cs{ST at compute@lineht} to
+% replacte \cs{estimate at lineht}}
+% The height of a line in an array environemnt can be computed as:
+% \begin{itemize}
+% \item the height of the strutbox |\ht\strutbox| (plus
+% |\extrarowheight| when the \pkg{array} package is loaded),
+% \item multiplied by arraystretch,
+% \item plus the depth of the strutbox (|\dp\strutbox|) mulitplied
+% by |\arraystretch|.
+% \end{itemize}
+% \begin{macrocode}
+\def\ST at compute@lineht{%
+ \ST at lineht=\ht\strutbox
+ \ifx\extrarowheight\undefined\else
+ \advance \ST at lineht by \extrarowheight
+ \fi
+ \ST at lineht = \arraystretch\ST at lineht
+ \advance\ST at lineht \arraystretch\dp\strutbox
+ \ST at trace\tw@{Normal Line height: \the\ST at lineht}%
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\estimate at lineht}
% Estimates the height of normal line taking |\arraystretch| into
% account. Also computes the difference between a normal line and a
@@ -804,8 +937,9 @@
% `stretched' one.
% \changes{v4.0b}{1997/02/04}{Removed use of \cs{ST at pboxcorr}}
% \changes{v4.0g}{1997/04/12}{Added the computation of
-% \cs{ST at stretchht}}
-% \begin{macrocode}
+% \cs{ST at stretchht}}
+% This macro will be removed in a future release.
+% \begin{macrocode}
\def\estimate at lineht{%
\ST at lineht=\arraystretch \baslineskp
\global\advance\ST at lineht by 1\p@
@@ -813,7 +947,7 @@
\ifdim\ST at stretchht<\z@\ST at stretchht\z@\fi
\ST at trace\tw@{Average line height: \the\ST at lineht}%
\ST at trace\tw@{Stretched line height: \the\ST at stretchht}%
- }
+}
% \end{macrocode}
% \end{macro}
%
@@ -900,6 +1034,13 @@
\global\ST at pagesofar\z@
\fi
\fi
+% \end{macrocode}
+% When a caption preceeds the first part of the tabular we need to
+% reduce the available height on the page by |\ST at captionroom|.
+% \changes{v4.1g}{2020/02/02}{Reduce the available height left on the
+% page when a caption preceeded the table}
+% \begin{macrocode}
+ \if at topcaption\advance\ST at pageleft-\ST at captionroom\fi
\ST at trace\tw@{Available height: \the\ST at pageleft}%
% \end{macrocode}
% Now we need to know the height of the head of the table. In order
@@ -953,6 +1094,15 @@
\ST at trace\tw@{starting new page}%
\newpage\@calnextpageht
\fi
+% \end{macrocode}
+% Take the height of the table into account,sosubstract it from the
+% available height. We need to do it like this because the |\\|
+% inside the definition of |\@@tablehead| have their normal
+% definition.
+% \changes{v4.1g}{2020/02/02}{Subtract the height of the tablehead
+% from the available space}
+% \begin{macrocode}
+ \advance\ST at pageleft-\ST at headht
}
% \end{macrocode}
% \end{macro}
@@ -968,6 +1118,13 @@
\global\ST at pageleft\@colroom
\global\ST at pagesofar=\z@
\ST at trace\tw@{Maximum height of tabular: \the\ST at pageleft}%
+% \end{macrocode}
+% Take the height of the head into account by subtracting it from
+% the avalable space.
+% \changes{v4.1g}{2020/02/02}{Subtract \cs{ST at headht} from
+% \cs{ST at pageleft}}
+% \begin{macrocode}
+ \advance\ST at pageleft-\ST at headht
}
% \end{macrocode}
% \end{macro}
@@ -1019,7 +1176,7 @@
% Save old |\@tabularcr| and insert the definition of
% \changes{v4.1c}{1997/11/07}{For standard \LaTeX\ we need to change
% \cs{@@startpbox}, \emph{not} \cs{@startpbox}}
-% |\@stabularcr|.
+% |\ST at tabularcr|.
% \begin{macrocode}
\let\org at tabularcr\@tabularcr
\let\@tabularcr\ST at tabularcr
@@ -1054,7 +1211,7 @@
% \end{macrocode}
% The first part of a supertabular may be moved on to the next page
% if it doesn't fit on the current page afterall. Subsequent parts
-% can not be moved; therefore we will have to switch the definition
+% can not be moved; therefor we will have to switch the definition
% of |\ST at skippart| around.
% \changes{v4.0e}{1997/04/09}{Make sure that only the first part of a
% supertabular can be moved to the next page.}
@@ -1064,8 +1221,9 @@
% Now we can estimate the average line height and the height of the
% first page of the \Lenv{supertabular}.
% \changes{v4.0i}{1997/09/18}{Added \cs{noindent}}
+% \changes{v4.1g}{2020/02/02}{Now call \cs{ST at compute@lineht}}
% \begin{macrocode}
- \estimate at lineht
+ \ST at compute@lineht
\@calfirstpageht
\noindent
}
@@ -1361,7 +1519,7 @@
% In order to facilitate complete \Lenv{tabular} environments to be
% in a cell of a \Lenv{supertabular} environment we need to adapt
% the definition of the orginal environments somewhat. For the
-% inner \Lenv{tabular} a number of definitions needs to be
+% inner \Lenv{tabular} a number of definitions need to be
% restored.
% \changes{v4.0i}{1997/09/18}{Added \cs{noindent}}
% \begin{macrocode}
@@ -1390,7 +1548,7 @@
% \end{macrocode}
% If there is a non-empty line, but an empty parbox, then
% |\ST at pboxht| might be non-zero, but too small thereby breaking
-% the algorithm. Therefore we estimate the height of the line to be
+% the algorithm. Therefor we estimate the height of the line to be
% |\ST at lineht| in this case.
% \begin{macrocode}
\global\advance\ST at pageleft -\ST at lineht
@@ -1406,11 +1564,13 @@
% (plus a bit extra).
% \changes{v4.0g}{1997/04/12}{Also take \cs{ST at stretchht} into
% account and store the height of the parbox in \cs{ST at prevht}}
+% \changes{v4.1f}{2019/03/01}{Use \cs{ST at trace@cr} instead of
+% \cs{ST at trace}}
+% \changes{v4.1g}{2020/02/02}{\cs{ST at stretchht} is no longer needed}
% \begin{macrocode}
- \ST at trace\thr@@{Added par box with height \the\ST at pboxht}%
+ \ST at trace@cr\thr@@{Added par box with height \the\ST at pboxht}%
\global\advance\ST at pageleft -\ST at pboxht
\global\advance\ST at pageleft -0.1\ST at pboxht
- \global\advance\ST at pageleft -\ST at stretchht
\global\ST at prevht\ST at pboxht
\global\ST at pboxht\z@
\fi
@@ -1419,7 +1579,7 @@
% \begin{macrocode}
\global\advance\ST at pageleft -\ST at toadd
\global\ST at toadd=\z@
- \ST at trace\thr@@{Space left for tabular: \the\ST at pageleft}%
+ \ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}%
}
% \end{macrocode}
% This line is necessary because the tablehead has to be inserted
@@ -1445,8 +1605,8 @@
\else
% \end{macrocode}
% When there is not enough space left on the current page, we start
-% a new page. To compute the amount of space needed we use the
-% height of the previous line (|\ST at prevht|) as an estimation of
+% a new page. To compute the amount of space need we use the
+% height of the previous line (|\ST at prevht|) as an estimation of
% the height of the next line. If we are processing a
% \Lenv{mpsupertabular} we need to take the height of the footnotes
% into account.
@@ -1494,7 +1654,7 @@
% \global\advance\ST at pageleft-\ST at dimen
%\end{verbatim}
% When you examine the code you will note that |\@colroom| is added
-% \emph{and} subtracted. Therefore the code above can be simplified
+% \emph{and} subtracted. Therefor the code above can be simplified
% to:
% \begin{macrocode}
\global\advance\ST at pageleft\pagetotal
Modified: trunk/Master/texmf-dist/source/latex/supertabular/supertabular.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/supertabular/supertabular.ins 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/source/latex/supertabular/supertabular.ins 2020-02-03 22:32:05 UTC (rev 53658)
@@ -3,18 +3,18 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2004 Johannes L. Braams. All rights reserved.
+%% Copyright 1989-2020 Johannes L. Braams. All rights reserved.
%%
%% This file is part of the supertabular package.
%% ----------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this 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/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
@@ -29,24 +29,24 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2004/02/20}
+\def\filedate{2020/02/02}
\def\batchfile{supertabular.ins}
\input docstrip.tex
\keepsilent
\preamble
-Copyright (C) 1989-2004 Johannes Braams. All rights reserved.
+Copyright (C) 1989-2020 Johannes Braams. All rights reserved.
This file was generated from file(s) of the supertabular package.
-----------------------------------------------------------------
It may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
+conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this 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/12/01 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
This work has the LPPL maintenance status "maintained".
Modified: trunk/Master/texmf-dist/tex/latex/supertabular/supertabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/supertabular/supertabular.sty 2020-02-03 22:31:53 UTC (rev 53657)
+++ trunk/Master/texmf-dist/tex/latex/supertabular/supertabular.sty 2020-02-03 22:32:05 UTC (rev 53658)
@@ -5,18 +5,18 @@
%% The original source files were:
%%
%% supertabular.dtx (with options: `package')
-%% Copyright (C) 1989-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1989-2020 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the supertabular package.
%% -----------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this 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/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
@@ -35,7 +35,7 @@
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2004 by Johannes Braams texniek at braams.cistron.nl
+%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
%% Kersengaarde 33
%% 2723 BP Zoetermeer NL
%% all rights reserved.
@@ -43,10 +43,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{supertabular}
- [2004/02/20 v4.1e the supertabular environment]
+ [2020/02/02 v4.1g the supertabular environment]
\newcount\c at tracingst
\DeclareOption{errorshow}{\c at tracingst\z@}
-\DeclareOption{pageshow}{\c at tracingst\tw@}
+\DeclareOption{pageshow}{\c at tracingst\thr@@}
\DeclareOption{debugshow}{\c at tracingst5\relax}
\ProcessOptions
\newif\if at topcaption \@topcaptiontrue
@@ -63,6 +63,7 @@
\newskip\ST at rightskip
\newskip\ST at leftskip
\newskip\ST at parfillskip
+\def\ST at captionroom{\z@}
\long\def\ST at caption#1[#2]#3{\par%
\addcontentsline{\csname ext@#1\endcsname}{#1}%
{\protect\numberline{%
@@ -72,7 +73,7 @@
\normalsize
\if at topcaption \vskip -10\p@ \fi
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \if at topcaption \vskip 10\p@ \fi
+ \if at topcaption \vskip 10\p@ \gdef\ST at captionroom{20\p@}\fi
\endgroup}
\newcommand\tablehead[1]{%
\gdef\@tablehead{%
@@ -82,7 +83,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tablehead{}
-\newcommand\tablefirsthead[1]{\gdef\@table at first@head{#1}}
+\newcommand\tablefirsthead[1]{%
+ \gdef\@table at first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org at tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table at first@head\undefined
+ }}}
\newcommand\tabletail[1]{%
\gdef\@tabletail{%
\noalign{%
@@ -91,7 +101,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tabletail{}
-\newcommand\tablelasttail[1]{\gdef\@table at last@tail{#1}}
+\newcommand\tablelasttail[1]{%
+ \gdef\@table at last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org at tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table at last@tail\undefined
+ }}}
\newcommand\sttraceon{\c at tracingst5\relax}
\newcommand\sttraceoff{\c at tracingst\z@}
\newcommand\ST at trace[2]{%
@@ -101,6 +120,19 @@
{Package supertabular: #2}%
\fi
}
+\newcommand\ST at save@lineno{%
+ \expandafter\gdef\expandafter\ST at LineNo\expandafter{%
+ \the\inputlineno}}
+\newcommand\ST at trace@cr[2]{%
+ \ifnum\c at tracingst>#1\relax
+ \begingroup
+ \edef\on at line{ on input line \ST at LineNo}%
+ \GenericWarning
+ {(supertabular)\@spaces\@spaces}
+ {Package supertabular: #2}%
+ \endgroup
+ \fi
+ }
\newdimen\ST at pageleft
\newcommand*\shrinkheight[1]{%
\noalign{\global\advance\ST at pageleft-#1\relax}}
@@ -111,7 +143,6 @@
\newdimen\ST at pagesofar
\newdimen\ST at pboxht
\newdimen\ST at lineht
-\newdimen\ST at stretchht
\newdimen\ST at prevht
\newdimen\ST at toadd
\newdimen\ST at dimen
@@ -118,6 +149,7 @@
\newbox\ST at pbox
\def\ST at tabularcr{%
{\ifnum0=`}\fi
+ \ST at save@lineno
\@ifstar{\ST at xtabularcr}{\ST at xtabularcr}}
\def\ST at xtabularcr{%
\@ifnextchar[%]
@@ -159,6 +191,15 @@
\fi
\ST at dimen=\z@
\unvbox\ST at pbox\egroup\hfil}
+\def\ST at compute@lineht{%
+ \ST at lineht=\ht\strutbox
+ \ifx\extrarowheight\undefined\else
+ \advance \ST at lineht by \extrarowheight
+ \fi
+ \ST at lineht = \arraystretch\ST at lineht
+ \advance\ST at lineht \arraystretch\dp\strutbox
+ \ST at trace\tw@{Normal Line height: \the\ST at lineht}%
+ }
\def\estimate at lineht{%
\ST at lineht=\arraystretch \baslineskp
\global\advance\ST at lineht by 1\p@
@@ -166,7 +207,7 @@
\ifdim\ST at stretchht<\z@\ST at stretchht\z@\fi
\ST at trace\tw@{Average line height: \the\ST at lineht}%
\ST at trace\tw@{Stretched line height: \the\ST at stretchht}%
- }
+}
\def\@calfirstpageht{%
\ST at trace\tw@{Calculating height of tabular on first page}%
\global\ST at pagesofar\pagetotal
@@ -211,6 +252,7 @@
\global\ST at pagesofar\z@
\fi
\fi
+ \if at topcaption\advance\ST at pageleft-\ST at captionroom\fi
\ST at trace\tw@{Available height: \the\ST at pageleft}%
\ifx\@@tablehead\@empty
\ST at headht=\z@
@@ -242,6 +284,7 @@
\ST at trace\tw@{starting new page}%
\newpage\@calnextpageht
\fi
+ \advance\ST at pageleft-\ST at headht
}
\def\@calnextpageht{%
\ST at trace\tw@{Calculating height of tabular on next page}%
@@ -248,6 +291,7 @@
\global\ST at pageleft\@colroom
\global\ST at pagesofar=\z@
\ST at trace\tw@{Maximum height of tabular: \the\ST at pageleft}%
+ \advance\ST at pageleft-\ST at headht
}
\def\x at supertabular{%
\let\org at tabular\tabular
@@ -281,7 +325,7 @@
\let\@@tablehead=\@table at first@head
\fi
\let\ST at skippage\ST at skipfirstpart
- \estimate at lineht
+ \ST at compute@lineht
\@calfirstpageht
\noindent
}
@@ -413,16 +457,15 @@
\global\advance\ST at pageleft -\ST at lineht
\global\ST at prevht\ST at lineht
\else
- \ST at trace\thr@@{Added par box with height \the\ST at pboxht}%
+ \ST at trace@cr\thr@@{Added par box with height \the\ST at pboxht}%
\global\advance\ST at pageleft -\ST at pboxht
\global\advance\ST at pageleft -0.1\ST at pboxht
- \global\advance\ST at pageleft -\ST at stretchht
\global\ST at prevht\ST at pboxht
\global\ST at pboxht\z@
\fi
\global\advance\ST at pageleft -\ST at toadd
\global\ST at toadd=\z@
- \ST at trace\thr@@{Space left for tabular: \the\ST at pageleft}%
+ \ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}%
}
\noalign{\global\let\ST at next\@empty}%
\ifnum\ST at pageleft<\z@
More information about the tex-live-commits
mailing list.