[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: ext at table for issue #561 (#562) (7fe2b014)
GitHub
noreply at github.com
Sat May 8 10:26:10 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/7fe2b014582d9a5a6cef8f00ad01a947aa012b4f
>---------------------------------------------------------------
commit 7fe2b014582d9a5a6cef8f00ad01a947aa012b4f
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Sat May 8 09:26:10 2021 +0100
ext at table for issue #561 (#562)
* ext at table for issue #561
* files intended for issue #561
>---------------------------------------------------------------
7fe2b014582d9a5a6cef8f00ad01a947aa012b4f
base/doc/ltnews33.tex | 2 +-
required/tools/changes.txt | 5 +
required/tools/longtable.dtx | 6 +-
required/tools/testfiles/github-0561.lvt | 39 ++++++++
required/tools/testfiles/github-0561.tlg | 154 +++++++++++++++++++++++++++++++
5 files changed, 203 insertions(+), 3 deletions(-)
diff --git a/base/doc/ltnews33.tex b/base/doc/ltnews33.tex
index 7f23e9d8..820623ff 100644
--- a/base/doc/ltnews33.tex
+++ b/base/doc/ltnews33.tex
@@ -673,7 +673,7 @@ existing documents, a rollback to \pkg{longtable 4.13}
(\file{longtable-2020-01-07.sty}) is supported.
%
\gnatsissue{tools}{2914 3396 3512}
-\githubissue{133 183 464}
+\githubissue{133 183 464 561}
\subsection[\pkg{trace}: Add \cs{tracingstacklevels}
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 005a3ed4..3b160e68 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2021-05-07 David Carlisle <David.Carlisle at latex-project.org>
+
+ * longtable.dtx: write lits of tables entry to the file with
+ extension \ext at table, not force .lot github/561
+
2021-04-25 David Carlisle <David.Carlisle at latex-project.org>
* bm.dtx: guard \kernel at ifnextchar (gh/554)
diff --git a/required/tools/longtable.dtx b/required/tools/longtable.dtx
index 5569ae3d..457891da 100644
--- a/required/tools/longtable.dtx
+++ b/required/tools/longtable.dtx
@@ -37,7 +37,7 @@
%<driver> \ProvidesFile{longtable.drv}
% \fi
% \ProvidesFile{longtable.dtx}
- [2021-04-21 v4.15 Multi-page Table package (DPC)]
+ [2021-05-07 v4.16 Multi-page Table package (DPC)]
%
% \iffalse
%<*driver>
@@ -1970,13 +1970,15 @@
% {Call \cs{LT at makecaption} not \cs{LT at mkcaption}}
% \changes{v3.14}{1995/05/24}
% {Add new control argument}
+% \changes{v4.16}{2021/05/07}
+% {use \cs{ext at table} gh/561}
% \begin{macrocode}
\def\LT at c@ption#1[#2]#3{%
\LT at makecaption#1\fnum at table{#3}%
\def\@tempa{#2}%
\ifx\@tempa\@empty\else
{\let\\\space
- \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}%
+ \addcontentsline{\ext at table}{table}{\protect\numberline{\thetable}{#2}}}%
\fi}
% \end{macrocode}
% \end{macro}
diff --git a/required/tools/testfiles/github-0561.lvt b/required/tools/testfiles/github-0561.lvt
new file mode 100644
index 00000000..a7127d8a
--- /dev/null
+++ b/required/tools/testfiles/github-0561.lvt
@@ -0,0 +1,39 @@
+\documentclass{article}
+\input{test2e}
+
+\usepackage{longtable}
+
+\begin{document}
+
+\setbox0\vbox{\listoftables}
+
+\START
+% this should not have the longtable from the appendix
+\showbox0
+
+\OMIT
+\begin{table}
+ \caption{Float table in the main part}
+\end{table}
+
+\begin{longtable}{l}
+ \caption{Long table in the main part}\\
+\end{longtable}
+
+\appendix
+\makeatletter
+\def\ext at table{alot}
+\section*{Tables in the Appendix}
+\@starttoc{alot}
+\makeatother
+
+\begin{table}
+ \caption{Float table in the appendix}
+\end{table}
+
+\begin{longtable}{l}
+ \caption{Long table in the appendix}\\
+\end{longtable}
+\TIMO
+
+\end{document}
\ No newline at end of file
diff --git a/required/tools/testfiles/github-0561.tlg b/required/tools/testfiles/github-0561.tlg
new file mode 100644
index 00000000..f6e228b5
--- /dev/null
+++ b/required/tools/testfiles/github-0561.tlg
@@ -0,0 +1,154 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \box...=
+\vbox(58.97214+1.94444)x345.0
+.\penalty -300
+.\glue 15.0694 plus 4.30554 minus 0.86108
+.\glue(\parskip) 0.0 plus 1.0
+.\glue(\parskip) 0.0
+.\hbox(9.99998+0.0)x345.0, glue set 249.15344fil
+..\hbox(0.0+0.0)x0.0
+...\glue 0.0
+..\OT1/cmr/bx/n/14.4 L
+..\OT1/cmr/bx/n/14.4 i
+..\OT1/cmr/bx/n/14.4 s
+..\OT1/cmr/bx/n/14.4 t
+..\glue 5.4 plus 2.7 minus 1.79999
+..\OT1/cmr/bx/n/14.4 o
+..\OT1/cmr/bx/n/14.4 f
+..\glue 5.4 plus 2.7 minus 1.79999
+..\OT1/cmr/bx/n/14.4 T
+..\kern-1.35
+..\OT1/cmr/bx/n/14.4 a
+..\OT1/cmr/bx/n/14.4 b
+..\OT1/cmr/bx/n/14.4 l
+..\OT1/cmr/bx/n/14.4 e
+..\OT1/cmr/bx/n/14.4 s
+..\penalty 10000
+..\glue(\parfillskip) 0.0 plus 1.0fil
+..\glue(\rightskip) 0.0
+.\penalty 10000
+.\glue 9.90276 plus 0.86108
+.\glue 0.0 plus 0.2
+.\glue(\parskip) 0.0 plus 1.0
+.\glue(\parskip) 0.0
+.\glue(\baselineskip) 5.05556
+.\hbox(6.94444+1.94444)x345.0, glue set 167.72183fill
+..\glue(\leftskip) 38.00008
+..\hbox(0.0+0.0)x15.00002
+..\hbox(0.0+0.0)x0.0
+..\penalty 10000
+..\glue -38.00008
+..\hbox(6.44444+0.0)x23.00006, glue set 18.00005fil
+...\OT1/cmr/m/n/10 1
+...\glue 0.0 plus 1.0fil
+..\OT1/cmr/m/n/10 F
+..\OT1/cmr/m/n/10 l
+..\OT1/cmr/m/n/10 o
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 t
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 t
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 b
+..\OT1/cmr/m/n/10 l
+..\OT1/cmr/m/n/10 e
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 n
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 t
+..\OT1/cmr/m/n/10 h
+..\OT1/cmr/m/n/10 e
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 m
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 n
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 p
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 r
+..\OT1/cmr/m/n/10 t
+..\penalty 10000
+..\leaders 0.0 plus 1.0fill
+...\hbox(1.05554+0.0)x7.77766
+....\mathon
+....\kern 2.49994
+....\hbox(1.05554+0.0)x2.77779
+.....\OT1/cmr/m/n/10 .
+....\kern 2.49994
+....\mathoff
+..\penalty 10000
+..\hbox(6.44444+0.0)x15.50005, glue set 10.50003fil
+...\glue 0.0 plus 1.0fil
+...\OT1/cmr/m/n/10 1
+...\kern -1.0
+...\kern 1.0
+..\kern 0.0
+..\penalty 10000
+..\glue(\parfillskip) -25.50006
+..\glue(\rightskip) 25.50006
+.\glue 0.0 plus 0.2
+.\glue(\parskip) 0.0 plus 1.0
+.\glue(\parskip) 0.0
+.\glue(\baselineskip) 3.11111
+.\hbox(6.94444+1.94444)x345.0, glue set 169.11073fill
+..\glue(\leftskip) 38.00008
+..\hbox(0.0+0.0)x15.00002
+..\hbox(0.0+0.0)x0.0
+..\penalty 10000
+..\glue -38.00008
+..\hbox(6.44444+0.0)x23.00006, glue set 18.00005fil
+...\OT1/cmr/m/n/10 2
+...\glue 0.0 plus 1.0fil
+..\OT1/cmr/m/n/10 L
+..\OT1/cmr/m/n/10 o
+..\OT1/cmr/m/n/10 n
+..\OT1/cmr/m/n/10 g
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 t
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 b
+..\OT1/cmr/m/n/10 l
+..\OT1/cmr/m/n/10 e
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 n
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 t
+..\OT1/cmr/m/n/10 h
+..\OT1/cmr/m/n/10 e
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 m
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 n
+..\glue 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 p
+..\OT1/cmr/m/n/10 a
+..\OT1/cmr/m/n/10 r
+..\OT1/cmr/m/n/10 t
+..\penalty 10000
+..\leaders 0.0 plus 1.0fill
+...\hbox(1.05554+0.0)x7.77766
+....\mathon
+....\kern 2.49994
+....\hbox(1.05554+0.0)x2.77779
+.....\OT1/cmr/m/n/10 .
+....\kern 2.49994
+....\mathoff
+..\penalty 10000
+..\hbox(6.44444+0.0)x15.50005, glue set 10.50003fil
+...\glue 0.0 plus 1.0fil
+...\OT1/cmr/m/n/10 1
+...\kern -1.0
+...\kern 1.0
+..\kern 0.0
+..\penalty 10000
+..\glue(\parfillskip) -25.50006
+..\glue(\rightskip) 25.50006
+! OK.
+l. ...\showbox0
+[1
+] (github-0561.aux)
More information about the latex3-commits
mailing list.