[latex3-commits] [git/LaTeX3-latex3-latex2e] master: fix for #192 (385296a1)

Frank Mittelbach frank.mittelbach at latex-project.org
Tue Oct 8 00:20:08 CEST 2019


Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/385296a14c8c50ee2d7964411038e87d43bab5fa

>---------------------------------------------------------------

commit 385296a14c8c50ee2d7964411038e87d43bab5fa
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Oct 8 00:16:36 2019 +0200

    fix for #192


>---------------------------------------------------------------

385296a14c8c50ee2d7964411038e87d43bab5fa
 base/changes.txt                                   |  5 ++
 base/lttab.dtx                                     |  8 ++-
 base/testfiles/github-0192.lvt                     | 21 ++++++
 .../testfiles/github-0192.tlg                      | 79 +++++++++++-----------
 base/testfiles/github-robust-0123.luatex.tlg       |  2 +-
 base/testfiles/github-robust-0123.tlg              |  2 +-
 base/testfiles/github-robust-0123.xetex.tlg        |  2 +-
 7 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 5415b5b0..edeba129 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2019-10-07  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* lttab.dtx (subsection{array and tabular environments}):
+	\extracolsep needs to expand during preamble generation (gh/192)
+
 #########################
 # 2019-10-01 Release
 #########################
diff --git a/base/lttab.dtx b/base/lttab.dtx
index 646015da..aa2a0039 100644
--- a/base/lttab.dtx
+++ b/base/lttab.dtx
@@ -31,7 +31,7 @@
 %%% From File: lttab.dtx
 %<*driver>
 % \fi
-\ProvidesFile{lttab.dtx}[2019/08/27 v1.1p LaTeX Kernel (Columns)]
+\ProvidesFile{lttab.dtx}[2019/10/07 v1.1q LaTeX Kernel (Columns)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{lttab.dtx}
@@ -806,8 +806,12 @@
 %
 %
 % \begin{macro}{\extracolsep}
+%    This command needs to expand during the tabular preamble construction
+%    so can't be robust.
+%
+% \changes{v1.1q}{2019/10/07}{This needs to expand}
 %    \begin{macrocode}
-\DeclareRobustCommand\extracolsep[1]{\tabskip #1\relax}
+\def\extracolsep#1{\tabskip #1\relax}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/base/testfiles/github-0192.lvt b/base/testfiles/github-0192.lvt
new file mode 100644
index 00000000..580a0971
--- /dev/null
+++ b/base/testfiles/github-0192.lvt
@@ -0,0 +1,21 @@
+\documentclass{article}
+
+\input{test2e}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\begin{tabular}{lr}
+AA & BB \\
+x  & y \\
+\end{tabular}
+
+\begin{tabular*}{10cm}{l@{\extracolsep{\fill}}r}
+AA & BB \\
+x  & y  \\
+\end{tabular*}
+
+\end{document}
diff --git a/required/tools/testfiles/github-0102-tools.tlg b/base/testfiles/github-0192.tlg
similarity index 66%
copy from required/tools/testfiles/github-0102-tools.tlg
copy to base/testfiles/github-0192.tlg
index b3196360..139fea2a 100644
--- a/required/tools/testfiles/github-0102-tools.tlg
+++ b/base/testfiles/github-0192.tlg
@@ -13,20 +13,19 @@ Completed box being shipped out [1]
 ...\hbox(0.0+0.0)x345.0
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 518.94456fil
+..\vbox(550.0+0.0)x345.0, glue set 505.94595fil
 ...\write-{}
 ...\glue(\topskip) 0.0
-...\hbox(20.5+15.5)x345.0, glue set 250.38875fil
+...\hbox(14.5+9.5)x345.0, glue set 276.83322fil
 ....\hbox(0.0+0.0)x15.0
-....\hbox(20.5+15.5)x79.61125
+....\hbox(14.5+9.5)x53.16678
 .....\mathon
-.....\vbox(20.5+15.5)x79.61125
-......\hbox(8.39996+3.60004)x79.61125
+.....\vbox(14.5+9.5)x53.16678
+......\hbox(8.39996+3.60004)x53.16678
 .......\glue(\tabskip) 0.0
 .......\hbox(8.39996+3.60004)x27.00005
 ........\rule(8.39996+3.60004)x0.0
 ........\glue 6.0
-........\glue 0.0 plus 1.0fil
 ........\glue 0.00002
 ........\OT1/cmr/m/n/10 A
 ........\OT1/cmr/m/n/10 A
@@ -35,27 +34,18 @@ Completed box being shipped out [1]
 .......\glue(\tabskip) 0.0
 .......\hbox(8.39996+3.60004)x26.16673
 ........\glue 6.0
+........\glue 0.0 plus 1.0fil
 ........\glue 0.00002
 ........\OT1/cmr/m/n/10 B
 ........\OT1/cmr/m/n/10 B
-........\glue 0.0 plus 1.0fil
-........\glue 6.0
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x26.44447
-........\glue 6.0
-........\glue 0.0 plus 1.0fil
-........\glue 0.00002
-........\OT1/cmr/m/n/10 C
-........\OT1/cmr/m/n/10 C
 ........\glue 6.0
 .......\glue(\tabskip) 0.0
 ......\glue(\lineskip) 0.0
-......\hbox(8.39996+3.60004)x79.61125
+......\hbox(8.39996+3.60004)x53.16678
 .......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x27.00005, glue set 4.86111fil
+.......\hbox(8.39996+3.60004)x27.00005, glue set 9.72223fil
 ........\rule(8.39996+3.60004)x0.0
 ........\glue 6.0
-........\glue 0.0 plus 1.0fil
 ........\glue 0.00002
 ........\OT1/cmr/m/n/10 x
 ........\glue 0.0 plus 1.0fil
@@ -63,42 +53,53 @@ Completed box being shipped out [1]
 .......\glue(\tabskip) 0.0
 .......\hbox(8.39996+3.60004)x26.16673, glue set 8.88892fil
 ........\glue 6.0
+........\glue 0.0 plus 1.0fil
 ........\glue 0.00002
 ........\OT1/cmr/m/n/10 y
-........\glue 0.0 plus 1.0fil
 ........\glue 6.0
 .......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x26.44447, glue set 10.00002fil
+.....\mathoff
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\lineskip) 1.0
+...\hbox(14.5+9.5)x345.0, glue set 45.47244fil
+....\hbox(0.0+0.0)x15.0
+....\hbox(14.5+9.5)x284.52756
+.....\mathon
+.....\vbox(14.5+9.5)x284.52756
+......\hbox(8.39996+3.60004)x284.52756, glue set 243.36078fill
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x21.00005
+........\rule(8.39996+3.60004)x0.0
 ........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 A
+........\OT1/cmr/m/n/10 A
+........\glue 0.0 plus 1.0fil
+.......\glue(\tabskip) 0.0 plus 1.0fill
+.......\hbox(8.39996+3.60004)x20.16673
 ........\glue 0.0 plus 1.0fil
 ........\glue 0.00002
-........\OT1/cmr/m/n/10 z
+........\OT1/cmr/m/n/10 B
+........\OT1/cmr/m/n/10 B
 ........\glue 6.0
 .......\glue(\tabskip) 0.0
 ......\glue(\lineskip) 0.0
-......\hbox(8.39996+3.60004)x79.61125
+......\hbox(8.39996+3.60004)x284.52756, glue set 243.36078fill
 .......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x27.00005, glue set 4.86113fil
+.......\hbox(8.39996+3.60004)x21.00005, glue set 9.72223fil
 ........\rule(8.39996+3.60004)x0.0
 ........\glue 6.0
-........\glue 0.0 plus 1.0fil
-........\rule(8.39996+3.60004)x0.0
+........\glue 0.00002
 ........\OT1/cmr/m/n/10 x
 ........\glue 0.0 plus 1.0fil
-........\glue 6.0
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x26.16673, glue set 8.88893fil
-........\glue 6.0
-........\rule(8.39996+3.60004)x0.0
-........\OT1/cmr/m/n/10 y
-........\glue 0.0 plus 1.0fil
-........\glue 6.0
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x26.44447, glue set 10.00003fil
-........\glue 6.0
+.......\glue(\tabskip) 0.0 plus 1.0fill
+.......\hbox(8.39996+3.60004)x20.16673, glue set 8.88892fil
 ........\glue 0.0 plus 1.0fil
-........\rule(8.39996+3.60004)x0.0
-........\OT1/cmr/m/n/10 z
+........\glue 0.00002
+........\OT1/cmr/m/n/10 y
 ........\glue 6.0
 .......\glue(\tabskip) 0.0
 .....\mathoff
@@ -114,4 +115,4 @@ Completed box being shipped out [1]
 ...\glue 0.0 plus 1.0fil
 ...\OT1/cmr/m/n/10 1
 ...\glue 0.0 plus 1.0fil
-(github-0102-tools.aux)
+(github-0192.aux)
diff --git a/base/testfiles/github-robust-0123.luatex.tlg b/base/testfiles/github-robust-0123.luatex.tlg
index f3fcd10c..f3704f6a 100644
--- a/base/testfiles/github-robust-0123.luatex.tlg
+++ b/base/testfiles/github-robust-0123.luatex.tlg
@@ -811,7 +811,7 @@ and I'll forget about whatever was undefined.
 ---------------------------------------
 \exp -> \exp 
 ---------------------------------------
-\extracolsep{foo} -> \extracolsep {foo}
+\extracolsep{foo} -> \tabskip foo\relax 
 ---------------------------------------
 \familydefault -> cmr
 ---------------------------------------
diff --git a/base/testfiles/github-robust-0123.tlg b/base/testfiles/github-robust-0123.tlg
index fda1ffa5..0bec105e 100644
--- a/base/testfiles/github-robust-0123.tlg
+++ b/base/testfiles/github-robust-0123.tlg
@@ -803,7 +803,7 @@ l. ......fter\show\csname Downarrow\space\endcsname
 ---------------------------------------
 \exp -> \exp 
 ---------------------------------------
-\extracolsep{foo} -> \extracolsep {foo}
+\extracolsep{foo} -> \tabskip foo\relax 
 ---------------------------------------
 \familydefault -> cmr
 ---------------------------------------
diff --git a/base/testfiles/github-robust-0123.xetex.tlg b/base/testfiles/github-robust-0123.xetex.tlg
index 67abf4c9..8eda2ecd 100644
--- a/base/testfiles/github-robust-0123.xetex.tlg
+++ b/base/testfiles/github-robust-0123.xetex.tlg
@@ -811,7 +811,7 @@ and I'll forget about whatever was undefined.
 ---------------------------------------
 \exp -> \exp 
 ---------------------------------------
-\extracolsep{foo} -> \extracolsep {foo}
+\extracolsep{foo} -> \tabskip foo\relax 
 ---------------------------------------
 \familydefault -> cmr
 ---------------------------------------





More information about the latex3-commits mailing list